1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-09 10:05:24 +02:00

merge from 7.1 rse fix

This commit is contained in:
David McKnight 2006-10-10 18:34:00 +00:00
parent a8b41f73cb
commit ca38d431a1

View file

@ -44,7 +44,7 @@ public class SystemSubSystemsPropertiesWizardPage
extends AbstractSystemNewConnectionWizardPage extends AbstractSystemNewConnectionWizardPage
implements ISystemVerifyListener, ISubSystemPropertiesWizardPage implements ISystemVerifyListener, ISubSystemPropertiesWizardPage
{ {
private ISystemConnectionWizardPropertyPage _thePage; // only if there's one page
private CTabFolder _folder; private CTabFolder _folder;
private List _propertyPages; private List _propertyPages;
private String _lastHostName; private String _lastHostName;
@ -112,7 +112,7 @@ public class SystemSubSystemsPropertiesWizardPage
ISystemConnectionWizardPropertyPage cpage = (ISystemConnectionWizardPropertyPage)page; ISystemConnectionWizardPropertyPage cpage = (ISystemConnectionWizardPropertyPage)page;
cpage.setSubSystemConfiguration(parentFactory); cpage.setSubSystemConfiguration(parentFactory);
page.createControl(composite_prompts); page.createControl(composite_prompts);
_thePage = cpage;
//set the hostname for the page in case it's required //set the hostname for the page in case it's required
cpage.setHostname(getMainPage().getHostName()); cpage.setHostname(getMainPage().getHostName());
@ -134,6 +134,7 @@ public class SystemSubSystemsPropertiesWizardPage
ISystemConnectionWizardPropertyPage cpage = (ISystemConnectionWizardPropertyPage)page; ISystemConnectionWizardPropertyPage cpage = (ISystemConnectionWizardPropertyPage)page;
cpage.setSubSystemConfiguration(parentFactory); cpage.setSubSystemConfiguration(parentFactory);
CTabItem titem = new CTabItem(_folder, SWT.NULL, numAdded); CTabItem titem = new CTabItem(_folder, SWT.NULL, numAdded);
titem.setData(page); titem.setData(page);
page.createControl(_folder); page.createControl(_folder);
@ -185,6 +186,10 @@ public class SystemSubSystemsPropertiesWizardPage
result = page.applyValues(ss.getConnectorService()); result = page.applyValues(ss.getConnectorService());
} }
} }
else if (_thePage != null)
{
_thePage.applyValues(ss.getConnectorService());
}
return result; return result;
} }
@ -213,6 +218,13 @@ public class SystemSubSystemsPropertiesWizardPage
} }
} }
} }
else if (_thePage != null)
{
if (_thePage instanceof ISystemConnectionWizardErrorUpdater)
{
result = ((ISystemConnectionWizardErrorUpdater)_thePage).isPageComplete();
}
}
return result; return result;
} }
@ -231,6 +243,13 @@ public class SystemSubSystemsPropertiesWizardPage
} }
} }
} }
else if (_thePage != null)
{
if (_thePage instanceof ISystemConnectionWizardErrorUpdater)
{
((ISystemConnectionWizardErrorUpdater)_thePage).addVerifyListener(this);
}
}
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -257,6 +276,13 @@ public class SystemSubSystemsPropertiesWizardPage
} }
} }
} }
else if (_thePage != null)
{
if (_thePage instanceof ISystemConnectionWizardErrorUpdater)
{
((ISystemConnectionWizardErrorUpdater)_thePage).getTheErrorMessage();
}
}
} }
else else
{ {