From e306b4aad9109a0460ed028551a70728eedede45 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 6 Nov 2008 17:49:45 +0000 Subject: [PATCH] Update comment headers --- .../newconnection/RSEMainNewConnectionWizard.java | 15 +++++++++------ .../RSENewConnectionWizardSelectionPage.java | 11 ++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java index 5e5ce82571b..1482df86f64 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java @@ -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) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java index 3957bf76549..d20cf3b4eea 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java @@ -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.