mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-04 23:55:26 +02:00
merge from 7.1 rse fix
This commit is contained in:
parent
a8b41f73cb
commit
ca38d431a1
1 changed files with 28 additions and 2 deletions
|
@ -44,7 +44,7 @@ public class SystemSubSystemsPropertiesWizardPage
|
|||
extends AbstractSystemNewConnectionWizardPage
|
||||
implements ISystemVerifyListener, ISubSystemPropertiesWizardPage
|
||||
{
|
||||
|
||||
private ISystemConnectionWizardPropertyPage _thePage; // only if there's one page
|
||||
private CTabFolder _folder;
|
||||
private List _propertyPages;
|
||||
private String _lastHostName;
|
||||
|
@ -112,7 +112,7 @@ public class SystemSubSystemsPropertiesWizardPage
|
|||
ISystemConnectionWizardPropertyPage cpage = (ISystemConnectionWizardPropertyPage)page;
|
||||
cpage.setSubSystemConfiguration(parentFactory);
|
||||
page.createControl(composite_prompts);
|
||||
|
||||
_thePage = cpage;
|
||||
|
||||
//set the hostname for the page in case it's required
|
||||
cpage.setHostname(getMainPage().getHostName());
|
||||
|
@ -134,6 +134,7 @@ public class SystemSubSystemsPropertiesWizardPage
|
|||
ISystemConnectionWizardPropertyPage cpage = (ISystemConnectionWizardPropertyPage)page;
|
||||
cpage.setSubSystemConfiguration(parentFactory);
|
||||
|
||||
|
||||
CTabItem titem = new CTabItem(_folder, SWT.NULL, numAdded);
|
||||
titem.setData(page);
|
||||
page.createControl(_folder);
|
||||
|
@ -185,6 +186,10 @@ public class SystemSubSystemsPropertiesWizardPage
|
|||
result = page.applyValues(ss.getConnectorService());
|
||||
}
|
||||
}
|
||||
else if (_thePage != null)
|
||||
{
|
||||
_thePage.applyValues(ss.getConnectorService());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -213,6 +218,13 @@ public class SystemSubSystemsPropertiesWizardPage
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (_thePage != null)
|
||||
{
|
||||
if (_thePage instanceof ISystemConnectionWizardErrorUpdater)
|
||||
{
|
||||
result = ((ISystemConnectionWizardErrorUpdater)_thePage).isPageComplete();
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
||||
}
|
||||
|
@ -231,6 +243,13 @@ public class SystemSubSystemsPropertiesWizardPage
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (_thePage != null)
|
||||
{
|
||||
if (_thePage instanceof ISystemConnectionWizardErrorUpdater)
|
||||
{
|
||||
((ISystemConnectionWizardErrorUpdater)_thePage).addVerifyListener(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
|
@ -257,6 +276,13 @@ public class SystemSubSystemsPropertiesWizardPage
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (_thePage != null)
|
||||
{
|
||||
if (_thePage instanceof ISystemConnectionWizardErrorUpdater)
|
||||
{
|
||||
((ISystemConnectionWizardErrorUpdater)_thePage).getTheErrorMessage();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue