diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index e2717a36823..55a5f287cf6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -1403,9 +1403,6 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour Item[] newResult = new Item[oldResult.length]; Item[] children = null; if (parentItem instanceof Item) { - if (oldResult == null) - children = getItems((Item) parentItem); - else children = oldResult; } else children = getChildren(parentItem); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java index 75cceb1182c..fd98282de25 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java @@ -28,7 +28,6 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSEUserIdConstants; -import org.eclipse.rse.core.ISystemUserIdConstants; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemPreferencesManager; @@ -73,7 +72,7 @@ import org.eclipse.ui.dialogs.PropertyPage; */ public class SystemConnectionForm - implements Listener, ISystemUserIdConstants, + implements Listener, IRSEUserIdConstants, SelectionListener, Runnable, IRunnableWithProgress { @@ -451,7 +450,7 @@ public class SystemConnectionForm if (!ok || (errorMessage != null)) { ok = false; - if (okPressed) + if (okPressed && controlInError != null) controlInError.setFocus(); showErrorMessage(errorMessage); } @@ -1245,8 +1244,7 @@ public class SystemConnectionForm { ISystemProfile profile = conn.getSystemProfile(); Vector v = RSEUIPlugin.getTheSystemRegistry().getHostAliasNames(profile); - if (conn != null) // hmm, line 1 of this method will crash if this is the case! - v.removeElement(conn.getAliasName()); + v.removeElement(conn.getAliasName()); ValidatorConnectionName connNameValidator = new ValidatorConnectionName(v); return connNameValidator; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java index 51ac631848e..633eef2b7f6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java @@ -1089,9 +1089,12 @@ public class SystemWidgetHelpers { combo = new SystemHostCombo(parent, SWT.NULL, defaultConnection, factoryId, newButton); else if (factoryCategory != null) combo = new SystemHostCombo(parent, SWT.NULL, defaultConnection, newButton, factoryCategory); - if (listener != null) + if (listener != null && combo != null) combo.addSelectionListener(listener); - boolean hasGridData = (combo.getLayoutData() != null) && (combo.getLayoutData() instanceof GridData); + + boolean hasGridData = false; + if (combo != null) + hasGridData = (combo.getLayoutData() != null) && (combo.getLayoutData() instanceof GridData); //System.out.println("history directory griddata non-null? " + hasGridData); int minwidth = 250; // todo: tweak this? if (!hasGridData) { @@ -1102,12 +1105,16 @@ public class SystemWidgetHelpers { data.verticalAlignment = GridData.CENTER; data.grabExcessVerticalSpace = false; data.horizontalSpan = horizontalSpan; - combo.setLayoutData(data); + if (combo != null) + combo.setLayoutData(data); } else { - ((GridData) combo.getLayoutData()).horizontalSpan = horizontalSpan; - ((GridData) combo.getLayoutData()).horizontalAlignment = GridData.FILL; - ((GridData) combo.getLayoutData()).grabExcessHorizontalSpace = true; - ((GridData) combo.getLayoutData()).widthHint = minwidth; + if (combo != null) + { + ((GridData) combo.getLayoutData()).horizontalSpan = horizontalSpan; + ((GridData) combo.getLayoutData()).horizontalAlignment = GridData.FILL; + ((GridData) combo.getLayoutData()).grabExcessHorizontalSpace = true; + ((GridData) combo.getLayoutData()).widthHint = minwidth; + } } return combo; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java index d1f47a39d9e..3d3305aa796 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java @@ -425,7 +425,7 @@ public class SystemBaseAction extends Action implements ISystemAction //this.previousSelections.add(this.sSelection); } sSelection = (IStructuredSelection)selection; - if (!selectionSensitive || (selection == null)) + if (!selectionSensitive) { if (traceSelections) System.out.println(this.getClass().getName() + ". Returning. selectionSensitive = " + selectionSensitive); //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java index 911fea6588f..03ed5d8db8b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java @@ -84,12 +84,15 @@ public class SystemCascadingRemoteServersAction extends SystemBaseSubMenuAction { if (actions[idx] instanceof SystemCascadingRemoteServerBaseAction) { + if (conn != null) + { SystemCascadingRemoteServerBaseAction action = (SystemCascadingRemoteServerBaseAction)actions[idx]; action.setHost(conn); if (conn.isOffline()) action.setEnabled(false); else action.setEnabled(action.shouldEnable(conn)); + } } } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java index f7dd38bc970..dc338b0b2d4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java @@ -39,7 +39,6 @@ import org.eclipse.swt.widgets.Shell; */ public class SystemCopyConnectionAction extends SystemBaseCopyAction { - private ISystemRegistry sr = null; private SystemSimpleContentElement initialSelectionElement = null; /** * Constructor for SystemCopyConnectionAction diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDynamicPopupMenuExtensionManager.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDynamicPopupMenuExtensionManager.java index 8ac97dbf2e6..4425a300a22 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDynamicPopupMenuExtensionManager.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDynamicPopupMenuExtensionManager.java @@ -54,9 +54,8 @@ public class SystemDynamicPopupMenuExtensionManager implements * Actions are added to a contribution menu. * @param shell the shell * @param menu the menu to contribute to - * @param selection(s) are processed to determine the resource source file + * @param selection are processed to determine the resource source file * @param menuGroup the default menu group to add actions to - * @return the menu is populated with actions */ public void populateMenu(Shell shell, SystemMenuManager menu,IStructuredSelection selection, String menuGroup) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java index d1aafdf75a5..dd2e9432ed9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java @@ -40,7 +40,6 @@ import org.eclipse.swt.widgets.Shell; public class SystemMoveConnectionAction extends SystemBaseCopyAction { - private ISystemRegistry sr = null; private SystemSimpleContentElement initialSelectionElement = null; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java index a651b5e2c42..93e2713e1f7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java @@ -27,7 +27,6 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java index 4a7c4bdf099..b8d552f106d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java @@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java index a9f6c6bf3d1..012b6deccaf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java @@ -766,8 +766,8 @@ public abstract class SystemPromptDialog /** * Explicitly specify if Details Button to be shown. * There is support to automatically toggle the text. - * @param true if the Details button is to be shown - * @param true if the button should initially be in "hide mode" versus "hide mode" + * @param show if the Details button is to be shown + * @param hideMode if the button should initially be in "hide mode" versus "hide mode" */ public void setShowDetailsButton(boolean show, boolean hideMode) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java index be46cf32017..11e3a8d4737 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java @@ -420,7 +420,7 @@ public class SystemRenameDialog extends SystemPromptDialog //newNames.addElement(newName); newNames.addElement(canonicalNewName); // defect 42145 } - if ((errMsg != null) && (firstErrMsg == null)) + if (errMsg != null) { firstErrMsg = errMsg; firstErrRow = rows[idx]; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java index 69708f7c836..c91cfd7a14a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java @@ -212,10 +212,12 @@ public class SystemSimpleCopyDialog String errMsg = null; Control controlInError = null; clearErrorMessage(); - +/* if (errMsg != null) controlInError.setFocus(); return (errMsg == null); + */ + return true; } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java index a9c16596905..83739df5f56 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java @@ -461,10 +461,12 @@ public class SystemSimpleSelectDialog extends SystemPromptDialog String errMsg = null; Control controlInError = null; clearErrorMessage(); - +/* if (errMsg != null) controlInError.setFocus(); return (errMsg == null); + */ + return true; } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java index 3c978d0cf2e..a6eeb7fa5ee 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java @@ -198,8 +198,7 @@ public abstract class SystemFilterAbstractFilterPoolAction { ISystemFilterPoolManager[] mgrs = null; ISystemFilterPoolManagerProvider provider = getFilterPoolManagerProvider(); - if (mgrs == null) - mgrs = dlgInputs.poolManagers; + mgrs = dlgInputs.poolManagers; if ((mgrs==null) && (provider != null)) mgrs = provider.getSystemFilterPoolManagers(); // get it in real time. if (mgrs == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java index c612b048836..a1cdab7e9bc 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java @@ -282,7 +282,7 @@ public class SystemFilterNewFilterPoolWizardDefaultMainPage errMsg = validateNameInput(); if (errMsg != null) controlInError = textName; - if (errMsg != null) + if (errMsg != null && controlInError != null) controlInError.setFocus(); return (errMsg == null); } @@ -328,8 +328,8 @@ public class SystemFilterNewFilterPoolWizardDefaultMainPage if (iiv != null) { int limit = -1; - if (iiv != null) - limit = iiv.getMaximumNameLength(); + + limit = iiv.getMaximumNameLength(); if (limit == -1) limit = ValidatorFilterPoolName.MAX_FILTERPOOLNAME_LENGTH; // default is 50 textName.setTextLimit(limit); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java index 27c5bc7ee81..a05b51e652e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java @@ -356,10 +356,12 @@ public class SystemFilterWorkWithFilterPoolsDialog String errMsg = null; Control controlInError = null; clearErrorMessage(); - +/* if (errMsg != null) controlInError.setFocus(); return (errMsg == null); + */ + return true; } /** @@ -558,7 +560,8 @@ public class SystemFilterWorkWithFilterPoolsDialog SystemSimpleContentElement cElement = new SystemSimpleContentElement(pool.getName(), pool, mgrElement, (Vector)null); cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterPoolImage(pool.getProvider(),pool)); - mgrElement.addChild(cElement, 0); + if (mgrElement != null) + mgrElement.addChild(cElement, 0); tree.refresh(mgrElement); // rebuild whole thing tree.setSelection(new StructuredSelection(cElement),true); // defect 42503 diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemDialogPageMessageLine.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemDialogPageMessageLine.java index a1a3e0e3eb5..264416ccd48 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemDialogPageMessageLine.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemDialogPageMessageLine.java @@ -41,7 +41,6 @@ import org.eclipse.ui.dialogs.PropertyPage; * It fails to do this properly and is extremely fragile since it depends on knowledge * of the internal structure of eclipse provided windows. *

Use SystemMessageLine instead. - * @link org.eclipse.rse.core.ui.messages.SystemMessageLine * */ public class SystemDialogPageMessageLine implements ISystemMessageLine, MouseListener { @@ -65,6 +64,8 @@ public class SystemDialogPageMessageLine implements ISystemMessageLine, MouseLis SystemDialogPageMessageLine msgLine = null; Composite pageContainer = wizardPage.getControl().getParent(); Object pageContainerData = null; + + // FIXME why does this need to be commented out? //Object pageContainerData = pageContainer.getData(); //System.out.println("pageContainerData = " + pageContainerData); if (pageContainerData == null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java index 43acd85d77c..bf227bb1a27 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java @@ -78,7 +78,7 @@ public class ServerLauncherPropertyPage extends SystemBasePropertyPage implement // Create property page UI _form.createContents(parent); - if (sl != null) + if (sl != null && connectorService != null) { _form.setHostname(connectorService.getHost().getHostName()); _form.initValues(sl); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServicesPropertyPage.java index 5674bf1a57a..513d1537a8e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServicesPropertyPage.java @@ -36,7 +36,7 @@ public abstract class ServicesPropertyPage extends SystemBasePropertyPage protected Control createContentArea(Composite parent) { - _form = new ServicesForm(getMessageLine()); + _form = new ServicesForm(parent.getShell(), getMessageLine()); _form.createContents(parent); // init services diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java index e2c9aa6908e..d7a3fcbad0c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java @@ -18,7 +18,6 @@ package org.eclipse.rse.ui.propertypages; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolReference; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolReferencePropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolReferencePropertyPage.java index 494e19215fc..63c6c52e4f0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolReferencePropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolReferencePropertyPage.java @@ -18,8 +18,6 @@ package org.eclipse.rse.ui.propertypages; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolReference; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.swt.widgets.Composite; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java index 19b9ebe9965..6d1675d7bb5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java @@ -19,7 +19,6 @@ import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.swt.widgets.Composite; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java index f3a4dc054ab..d571f9fd629 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java @@ -29,7 +29,6 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java index c3b51d01d12..229f01264cd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java @@ -322,7 +322,8 @@ public class SystemSubSystemPropertyPageCoreForm extends AbstractSystemSubSystem if (errMsg != null) { ok = false; - controlInError.setFocus(); + if (controlInError != null) + controlInError.setFocus(); setErrorMessage(errMsg); } return ok; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java index 4a9f15847c6..329a9a84040 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java @@ -528,7 +528,6 @@ public class SystemTypeFieldEditor extends FieldEditor RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(matchingType.getAdapter(IRSESystemType.class)); // update this system type's attributes as per preferences... - if (matchingType!=null) { adapter.setIsEnabled(matchingType, attr1.equals("true")); //$NON-NLS-1$ if (!attr2.equals("null")) //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterName.java index 5158529388e..832673418e8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterName.java @@ -40,7 +40,7 @@ public class ValidatorFilterName * Constructor accepting a Vector. * @param A vector containing list of existing filter names to compare against. * Note that toString() is used to get the string from each item. - * @param true if comparisons are to be case sensitive, false if case insensitive. + * @param existingList if comparisons are to be case sensitive, false if case insensitive. */ public ValidatorFilterName(Vector existingList) { @@ -50,7 +50,7 @@ public class ValidatorFilterName /** * Constructor accepting an Array. * @param An array containing list of existing strings to compare against. - * @param true if comparisons are to be case sensitive, false if case insensitive. + * @param existingList if comparisons are to be case sensitive, false if case insensitive. */ public ValidatorFilterName(String[] existingList) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.java index 05460d64301..fda1ac74abf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.java @@ -37,7 +37,7 @@ public class ValidatorFilterPoolName * Constructor accepting a Vector. * @param A vector containing list of existing filter names to compare against. * Note that toString() is used to get the string from each item. - * @param true if comparisons are to be case sensitive, false if case insensitive. + * @param existingList if comparisons are to be case sensitive, false if case insensitive. */ public ValidatorFilterPoolName(Vector existingList) { @@ -47,7 +47,7 @@ public class ValidatorFilterPoolName /** * Constructor accepting an Array. * @param An array containing list of existing strings to compare against. - * @param true if comparisons are to be case sensitive, false if case insensitive. + * @param existingList if comparisons are to be case sensitive, false if case insensitive. */ public ValidatorFilterPoolName(String[] existingList) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java index 642b3c5f789..6e925e6e34e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java @@ -1151,7 +1151,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda // we want to make sure the order is kept consistent at // Copy, Paste, Move, Delete Rename - if (pasteIndex > -1) + if (pasteIndex > -1 && ourChildActions != null) { filterActions[fsIdx++] = (IAction) ourChildActions.elementAt(pasteIndex); } @@ -1188,7 +1188,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda */ IAction[] allFilterActions = new IAction[childActions.size() + filterActions.length]; int allIdx = 0; - if (childActions != null) + for (int idx = 0; idx < childActions.size(); idx++) allFilterActions[allIdx++] = (IAction) childActions.elementAt(idx); for (int idx = 0; idx < filterActions.length; idx++) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java index 08fc7f0b1d7..135c70b7d17 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java @@ -234,7 +234,7 @@ public class SystemDNDTransferRunnable extends Job else { // special case for filters - if (target instanceof ISystemFilterReference) + if (target instanceof ISystemFilterReference && targetSubSystem != null) { ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); if (factory.supportsDropInFilters()) @@ -334,7 +334,7 @@ public class SystemDNDTransferRunnable extends Job // special case for filters - if (target instanceof ISystemFilterReference) + if (target instanceof ISystemFilterReference && targetSubSystem != null) { ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); @@ -441,7 +441,7 @@ public class SystemDNDTransferRunnable extends Job if (targetAdapter.validateDrop(tempObject, target, (targetSubSystem == srcSubSystem))) { // special case for filters - if (target instanceof ISystemFilterReference) + if (target instanceof ISystemFilterReference && targetSubSystem != null) { ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); if (factory.supportsDropInFilters() && factory.providesCustomDropInFilters()) @@ -477,7 +477,7 @@ public class SystemDNDTransferRunnable extends Job { // special case for filters - if (target instanceof ISystemFilterReference) + if (target instanceof ISystemFilterReference && targetSubSystem != null) { ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); if (factory.supportsDropInFilters() && factory.providesCustomDropInFilters()) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextCellEditor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextCellEditor.java index 757148a7ab0..09f77f75ed8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextCellEditor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextCellEditor.java @@ -17,7 +17,7 @@ package org.eclipse.rse.ui.view; import java.text.MessageFormat; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.rse.ui.widgets.InheritableEntryField; import org.eclipse.swt.SWT; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPropertySheetForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPropertySheetForm.java index 65a07cef37c..64ba8907997 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPropertySheetForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPropertySheetForm.java @@ -23,8 +23,6 @@ import org.eclipse.swt.events.KeyListener; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java index 222edd1ac59..5ec2217d495 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java @@ -624,9 +624,12 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec { // this is the first column -- treat it special name = SystemPropertyResources.RESID_PROPERTY_NAME_LABEL; - propertyId = (String) nameDescriptor.getId(); - editor = getCellEditor(tree, nameDescriptor); - weight = 200; + if (nameDescriptor != null) + { + propertyId = (String) nameDescriptor.getId(); + editor = getCellEditor(tree, nameDescriptor); + weight = 200; + } } else { // these columns come from the regular descriptors diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java index 0b0ca264ba4..69dd2e719f7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java @@ -25,7 +25,6 @@ import java.util.Map; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.ILabelProvider; @@ -36,8 +35,6 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.ui.ISystemPreferencesConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java index 91f07633ebd..33a0a8a72d7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java @@ -645,9 +645,12 @@ public class SystemTableView { // this is the first column -- treat it special name = SystemPropertyResources.RESID_PROPERTY_NAME_LABEL; - propertyId = (String) nameDescriptor.getId(); - editor = getCellEditor(table, nameDescriptor); - weight = 200; + if (nameDescriptor != null) + { + propertyId = (String) nameDescriptor.getId(); + editor = getCellEditor(table, nameDescriptor); + weight = 200; + } } else { // these columns come from the regular descriptors diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewColumnManager.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewColumnManager.java index f7851fa0c7e..35c9714b0a2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewColumnManager.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewColumnManager.java @@ -68,7 +68,7 @@ public class SystemTableViewColumnManager * Gets the property descriptors to display as columns in the table * The set of descriptors and their order may change depending on user customizations * @param adapter - * @return + * @return the visible descriptors */ public IPropertyDescriptor[] getVisibleDescriptors(ISystemViewElementAdapter adapter) { @@ -112,6 +112,8 @@ public class SystemTableViewColumnManager len = uniqueDescriptors.length; } IPropertyDescriptor[] customDescriptors = new IPropertyDescriptor[len]; + if (uniqueDescriptors != null) + { for (int i = 0; i < len; i++) { String propertyName = history[i]; @@ -134,6 +136,7 @@ public class SystemTableViewColumnManager return uniqueDescriptors; } } + } return customDescriptors; } else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java index 0ddcee10566..fbb8e085cb7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java @@ -24,8 +24,8 @@ import java.util.Hashtable; import java.util.Map; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.ListenerList; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.util.ListenerList; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java index e2717a36823..55a5f287cf6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java @@ -1403,9 +1403,6 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour Item[] newResult = new Item[oldResult.length]; Item[] children = null; if (parentItem instanceof Item) { - if (oldResult == null) - children = getItems((Item) parentItem); - else children = oldResult; } else children = getChildren(parentItem); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java index 8c7e1bfc49c..a3cf061a9e3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java @@ -150,7 +150,7 @@ public class SystemViewAPIProviderForFilters ISubSystem ss = fRef.getSubSystem(); ISystemFilterReference sfr = fRef.getParentSystemFilterReferencePool().getExistingSystemFilterReference(ss, newFilter); ISystemViewInputProvider inputProvider = this; - if ((sfr != null) && (inputProvider != null) && (inputProvider.getViewer()!=null)) + if ((sfr != null) && (inputProvider.getViewer()!=null)) { SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); @@ -182,14 +182,17 @@ public class SystemViewAPIProviderForFilters String[] filterStrings = referencedFilter.getFilterStrings(); try { + if (nestedFilterReferences != null) + { Object[] allChildren = ss.resolveFilterStrings(filterStrings); - int nbrNestedFilters = (nestedFilterReferences==null) ? 0: nestedFilterReferences.length; + int nbrNestedFilters = nestedFilterReferences.length; children = new Object[nbrNestedFilters + allChildren.length]; int idx = 0; for (idx=0; idx 0)) + if ((subsystems != null) && (subsystems.length > 0) && newConns != null) { for (int jdx = 0; jdx < subsystems.length; jdx++) { @@ -1073,7 +1073,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven // last step... physically blow away the profile... getSystemProfileManager().deleteSystemProfile(profile, true); SystemPreferencesManager.getPreferencesManager().setConnectionNamesOrder(); // update preferences order list - if ((connections != null) && (connections.length > 0)) // defect 42112 + if (connections.length > 0) // defect 42112 fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(connections, ISystemResourceChangeEvents.EVENT_DELETE_MANY, this)); fireModelChangeEvent(SYSTEM_RESOURCE_REMOVED, SYSTEM_RESOURCETYPE_PROFILE, profile, null); @@ -2058,7 +2058,6 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven if (object != null) { String[] fileData = (String[]) object; - if (fileData != null) { for (int i = 0; i < fileData.length; i++) { @@ -2074,10 +2073,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven if (object != null) { String textData = (String) object; - if (textData != null) - { - srcObjects.add(textData); - } + srcObjects.add(textData); } } return srcObjects; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java index 2c4addea0fb..87913634ef4 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java @@ -18,10 +18,8 @@ package org.eclipse.rse.core.servicesubsystem; import java.util.Vector; -import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; -import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage; import org.eclipse.rse.core.subsystems.AbstractConnectorService; import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java index 5ceac8af599..525ee2e3cc2 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java @@ -21,7 +21,6 @@ import java.util.Vector; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.core.IRSEUserIdConstants; -import org.eclipse.rse.core.ISystemUserIdConstants; import org.eclipse.rse.core.PasswordPersistenceManager; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; @@ -76,7 +75,7 @@ import org.eclipse.ui.PlatformUI; * * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager */ -public abstract class AbstractConnectorService extends RSEModelObject implements IConnectorService, ISystemUserIdConstants +public abstract class AbstractConnectorService extends RSEModelObject implements IConnectorService, IRSEUserIdConstants { private ISubSystem _primarySubSystem; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java index 298b18d275a..3c7d10510d0 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java @@ -1263,11 +1263,13 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration } // server launcher - IServerLauncherProperties sl = oldConnectorService.getRemoteServerLauncherProperties(); + IServerLauncherProperties sl = null; + if (oldConnectorService != null) + sl = oldConnectorService.getRemoteServerLauncherProperties(); if ((sl != null) && supportsServerLaunchProperties(newConnection)) { IServerLauncherProperties newSL = createServerLauncher(newConnectorService); - if (newSL != null) + if (newSL != null && newConnectorService != null) { newConnectorService.setRemoteServerLauncherProperties(sl.cloneServerLauncher(newSL)); } diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemBasePlugin.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemBasePlugin.java index da3bcdb9e05..aa67d60afb6 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemBasePlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemBasePlugin.java @@ -779,7 +779,6 @@ public abstract class SystemBasePlugin extends AbstractUIPlugin * @param id - an arbitrary ID to assign to this image. Used later when retrieving it. * @param fileName - the name of the icon file, with extension, relative to this plugin's folder. * @return the image descriptor for this particular id. - * @see SystemBasePlugin#getImage(String); */ protected ImageDescriptor putImageInRegistry(String id, String fileName) { diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java index 4621646db6e..f0659a46537 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java @@ -26,7 +26,6 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.rse.core.model.ISystemModelChangeEvents; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.model.SystemModelChangeEvent; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.view.SystemPerspectiveLayout; import org.eclipse.rse.ui.view.SystemView; @@ -53,7 +52,6 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable private static SystemResourceListener inst = null; private IProject remoteSystemsProject = null; private boolean ignoreEvents = true; - ; private boolean ensureEventsOnMode = false; private boolean sawSyncEvent = false; private boolean changesPending = false; @@ -671,7 +669,7 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable } else if (runAction == FIRE_EVENT) { - ((SystemRegistry)RSEUIPlugin.getTheSystemRegistry()).fireEvent( + RSEUIPlugin.getTheSystemRegistry().fireEvent( new SystemModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ALL_RELOADED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_ALL, "dummy")); //$NON-NLS-1$ }