mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-20 22:55:51 +02:00
Code Issues Wiki Activity

Update comment headers

Browse source
This commit is contained in:
Martin Oberhuber 2008-11-06 17:49:45 +00:00
parent d8fb964e06
commit e306b4aad9
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
View file

@ -18,6 +18,9 @@
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* Uwe Stieber (Wind River) - [189426] System File/Folder Dialogs - New Connection Not Added to Drop Down
* Martin Oberhuber (Wind River) - [235197][api] Unusable wizard after cancelling on first page
* Uwe Stieber (Wind River) - [237816][api] restrictToSystemType does not work for RSEMainNewConnectionWizard
* Uwe Stieber (Wind River) - [235084] New connection wizard can create connections of disabled type
* Uwe Stieber (Wind River) - [248685] new connection wizard does not check the default selection against the restricted system type list
*******************************************************************************/
package org.eclipse.rse.ui.wizards.newconnection;
@ -148,14 +151,14 @@ public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, IS
restrictedSystemTypes = systemTypes;
onlySystemType = restrictedSystemTypes.length == 1;
mainPage.restrictToSystemTypes(restrictedSystemTypes);
if (onlySystemType && !restrictedSystemTypes[0].equals(selectedSystemType))
selectedSystemType = restrictedSystemTypes[0];
else if (restrictedSystemTypes.length > 0 && !Arrays.asList(restrictedSystemTypes).contains(selectedSystemType))
selectedSystemType = null;
else if (restrictedSystemTypes.length == 0)
selectedSystemType = null;
onSelectedSystemTypeChanged();
}
@ -240,9 +243,9 @@ public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, IS
// Accept only system types as selection which are enabled or if
// the wizard has a restricted list of system types, is within the list
// of restricted system types
if (candidate.isEnabled() &&
(restrictedSystemTypes == null ||
restrictedSystemTypes.length == 0 ||
if (candidate.isEnabled() &&
(restrictedSystemTypes == null ||
restrictedSystemTypes.length == 0 ||
Arrays.asList(restrictedSystemTypes).contains(candidate))) {
selectedSystemType = candidate;
}
@ -310,7 +313,7 @@ public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, IS
if (selectedWizard instanceof ISelectionChangedListener) removeSelectionChangedListener((ISelectionChangedListener)selectedWizard);
// Check if a wizard is registered for the selected system type
IRSENewConnectionWizardDescriptor descriptor = getSelection() != null ?
IRSENewConnectionWizardDescriptor descriptor = getSelection() != null ?
wizardRegistry.getWizardForSelection((IStructuredSelection) getSelection())
: null;
if (descriptor != null) {

11
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java
View file

@ -10,6 +10,7 @@
* Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter()
* Uwe Stieber (Wind River) - [209193] RSE new connection wizard shows empty categories if typing something into the filter
* Martin Oberhuber (Wind River) - [235197][api] Unusable wizard after cancelling on first page
* Uwe Stieber (Wind River) - [237816][api] restrictToSystemType does not work for RSEMainNewConnectionWizard
*******************************************************************************/
package org.eclipse.rse.ui.wizards.newconnection;
@ -275,14 +276,14 @@ public class RSENewConnectionWizardSelectionPage extends WizardPage {
/**
* Set the initial tree selection for the given tree viewer instance.
*
*
* @param treeViewer The tree viewer instance.
*
*
* @since 3.1
*/
protected void initializeSelection(TreeViewer treeViewer) {
if (treeViewer == null) return;
if (getWizard() instanceof ISelectionProvider) {
ISelectionProvider selectionProvider = (ISelectionProvider)getWizard();
if (selectionProvider.getSelection() instanceof IStructuredSelection) {
@ -294,9 +295,9 @@ public class RSENewConnectionWizardSelectionPage extends WizardPage {
}
}
}
}
/**
* Called from the selection listener to propage the current
* system type selection to the underlaying wizard.