From 10bed6d0078a712bd578ed0c98cdddf28b460e20 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 25 Aug 2006 11:45:38 +0000 Subject: [PATCH] [cleanup] Remove "implements" use of ISystemMessages --- .../UI/org/eclipse/rse/ui/SystemBaseForm.java | 2 +- .../eclipse/rse/ui/SystemConnectionForm.java | 14 ++++++------- .../org/eclipse/rse/ui/SystemProfileForm.java | 2 +- .../eclipse/rse/ui/SystemWidgetHelpers.java | 1 - ...ystemAbstractPopupMenuExtensionAction.java | 1 - .../rse/ui/actions/SystemBaseCopyAction.java | 14 ++++++------- .../ui/actions/SystemClearPasswordAction.java | 2 -- .../rse/ui/actions/SystemConnectAction.java | 2 -- .../SystemConnectAllSubSystemsAction.java | 2 -- .../actions/SystemCopyConnectionAction.java | 11 +++++----- .../actions/SystemCopyToClipboardAction.java | 5 ++--- .../ui/actions/SystemDisconnectAction.java | 2 -- .../SystemDisconnectAllSubSystemsAction.java | 2 -- .../actions/SystemMoveConnectionAction.java | 11 +++++----- .../SystemOpenExplorerPerspectiveAction.java | 1 - .../SystemPasteFromClipboardAction.java | 5 ++--- .../actions/SystemProfileNameCopyAction.java | 8 ++++---- .../SystemRemoteServerStartAction.java | 2 -- .../actions/SystemRemoteServerStopAction.java | 2 -- .../SystemShowPreferencesPageAction.java | 2 -- .../ui/dialogs/SystemCopyProfileDialog.java | 3 +-- .../rse/ui/dialogs/SystemDeleteDialog.java | 3 +-- .../ui/dialogs/SystemDeleteTableProvider.java | 1 - .../rse/ui/dialogs/SystemRenameDialog.java | 10 +++++----- .../ui/dialogs/SystemRenameSingleDialog.java | 20 +++++++++---------- .../ui/dialogs/SystemRenameTableProvider.java | 1 - .../dialogs/SystemSelectConnectionDialog.java | 4 +--- .../dialogs/SystemSimpleContentProvider.java | 2 -- .../ui/dialogs/SystemSimpleCopyDialog.java | 3 +-- .../SystemFilterAbstractFilterPoolAction.java | 1 - .../actions/SystemFilterCopyFilterAction.java | 16 +++++++-------- .../SystemFilterCopyFilterPoolAction.java | 12 +++++------ .../SystemFilterCopyFilterStringAction.java | 16 +++++++-------- .../actions/SystemFilterMoveFilterAction.java | 14 ++++++------- .../SystemFilterMoveFilterPoolAction.java | 12 +++++------ .../SystemFilterMoveFilterStringAction.java | 16 +++++++-------- ...terNewFilterPoolWizardDefaultMainPage.java | 7 +++---- ...SystemFilterWorkWithFilterPoolsDialog.java | 8 ++++---- .../SystemNewFilterWizardInfoPage.java | 2 -- .../SystemNewFilterWizardMainPage.java | 3 +-- .../SystemNewFilterWizardNamePage.java | 7 +++---- .../dialogs/SystemUnNamedFilterDialog.java | 3 +-- .../ui/operations/SystemFetchOperation.java | 2 -- ...ctSystemSubSystemPropertyPageCoreForm.java | 3 +-- .../RemoteSystemsPreferencePage.java | 1 - ...emAbstractPropertyPageExtensionAction.java | 1 - .../propertypages/SystemBasePropertyPage.java | 18 +++++++---------- .../SystemChangeFilterPropertyPage.java | 7 ++----- .../SystemSubSystemPropertyPageCore.java | 3 +-- ...iewSubSystemConfigurationPropertyPage.java | 2 -- .../ui/validators/ValidatorArchiveName.java | 3 ++- .../ValidatorCompileCommandLabel.java | 8 ++++---- .../validators/ValidatorConnectionName.java | 10 +++++----- .../rse/ui/validators/ValidatorFileName.java | 19 +++++++++--------- .../ui/validators/ValidatorFilterName.java | 8 ++++---- .../validators/ValidatorFilterPoolName.java | 8 ++++---- .../ui/validators/ValidatorFilterString.java | 8 ++++---- .../ui/validators/ValidatorFolderName.java | 19 +++++++++--------- .../rse/ui/validators/ValidatorPathName.java | 7 ++++--- .../ui/validators/ValidatorProfileName.java | 10 +++++----- .../ui/validators/ValidatorSourceType.java | 8 ++++---- .../ui/validators/ValidatorSpecialChar.java | 6 +++--- .../ui/validators/ValidatorSystemName.java | 19 +++++++++--------- .../ui/validators/ValidatorUniqueString.java | 10 +++++----- .../ValidatorUserActionCommand.java | 2 +- .../ValidatorUserActionComment.java | 2 +- .../validators/ValidatorUserActionName.java | 8 ++++---- .../rse/ui/validators/ValidatorUserId.java | 4 ++-- .../ui/validators/ValidatorUserTypeName.java | 8 ++++---- .../ui/validators/ValidatorUserTypeTypes.java | 2 +- .../ui/view/AbstractSystemViewAdapter.java | 3 --- .../ui/view/ISystemViewElementAdapter.java | 1 - .../view/SubSystemConfigurationAdapter.java | 8 ++------ .../ui/view/SystemAbstractAPIProvider.java | 8 ++++---- ...stemSelectRemoteObjectAPIProviderImpl.java | 3 +-- ...SystemTestFilterStringAPIProviderImpl.java | 8 ++++---- ...SystemViewAPIProviderForFilterStrings.java | 8 ++++---- .../view/SystemViewAPIProviderForFilters.java | 14 ++++++------- .../ui/view/SystemViewDataDropAdapter.java | 6 ++---- .../rse/ui/view/SystemViewFilterAdapter.java | 4 ++-- .../SystemViewFilterReferenceAdapter.java | 18 ++++++++--------- .../view/SystemViewFilterStringAdapter.java | 3 +-- .../team/SystemTeamViewContentProvider.java | 1 - .../services/ServiceTableContentProvider.java | 2 -- .../ISystemNewConnectionWizardPage.java | 1 - .../ui/wizards/RSENewConnectionWizard.java | 1 - ...nnectionWizardDefaultDelegateMainPage.java | 3 +-- .../wizards/SubSystemServiceWizardPage.java | 11 +++------- ...temNewConnectionWizardDefaultMainPage.java | 3 +-- ...mNewConnectionWizardRenameProfilePage.java | 3 +-- .../SystemNewProfileWizardMainPage.java | 3 +-- .../subsystems/ISubSystemConfiguration.java | 7 ------- 92 files changed, 243 insertions(+), 337 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBaseForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBaseForm.java index 6dd7e691acf..8630392607d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBaseForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBaseForm.java @@ -49,7 +49,7 @@ import org.eclipse.swt.widgets.Shell; */ public abstract class SystemBaseForm - implements Listener, ISystemConnectionWizardErrorUpdater //, ISystemMessages + implements Listener, ISystemConnectionWizardErrorUpdater // { private ISystemMessageLine msgLine; 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 89eba60dc28..00a5cf99886 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 @@ -72,7 +72,7 @@ import org.eclipse.ui.dialogs.PropertyPage; */ public class SystemConnectionForm - implements Listener, ISystemMessages, ISystemUserIdConstants, + implements Listener, ISystemUserIdConstants, SelectionListener, Runnable, IRunnableWithProgress { @@ -411,7 +411,7 @@ public class SystemConnectionForm if (currentHostName.length() > 0) { if (verifyingHostName == null) { - verifyingHostName = RSEUIPlugin.getPluginMessage(MSG_HOSTNAME_VERIFYING); + verifyingHostName = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_HOSTNAME_VERIFYING); } try @@ -427,7 +427,7 @@ public class SystemConnectionForm catch (InvocationTargetException e) { // error found - errorMessage = RSEUIPlugin.getPluginMessage(MSG_HOSTNAME_NOTFOUND); + errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_HOSTNAME_NOTFOUND); errorMessage.makeSubstitution(currentHostName); controlInError = textHostName; } @@ -876,7 +876,7 @@ public class SystemConnectionForm if (!verifyHostNameCB.getSelection()) { // clear host name not valid or not found error message so that wizard next page is enabled - if (errorMessage != null && errorMessage == RSEUIPlugin.getPluginMessage(MSG_HOSTNAME_NOTFOUND)) { + if (errorMessage != null && errorMessage == RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_HOSTNAME_NOTFOUND)) { errorMessage = null; if (msgLine != null) { @@ -1164,7 +1164,7 @@ public class SystemConnectionForm if (hostValidator != null) errorMessage= hostValidator.validate(hostName); else if (getHostName().length() == 0) - errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_HOSTNAME_EMPTY); + errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_HOSTNAME_EMPTY); if (updateMode && !userPickedVerifyHostnameCB) { boolean hostNameChanged = !hostName.equals(defaultHostName); @@ -1189,7 +1189,7 @@ public class SystemConnectionForm if (userIdValidator != null) errorMessage= userIdValidator.validate(textUserId.getText()); else if (getDefaultUserId().length()==0) - errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_USERID_EMPTY); + errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_EMPTY); } showErrorMessage(errorMessage); setPageComplete(); @@ -1297,7 +1297,7 @@ public class SystemConnectionForm pm.beginTask(verifyingHostName.getLevelOneText(),IProgressMonitor.UNKNOWN); try { - InetAddress address = InetAddress.getByName(currentHostName); + InetAddress.getByName(currentHostName); } catch (java.net.UnknownHostException exc) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java index b60be157e09..18efb37dbb4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Text; */ public class SystemProfileForm - implements Listener, ISystemMessages + implements Listener { // GUI widgets 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 f7d2d464967..6050e34ff8c 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 @@ -22,7 +22,6 @@ import org.eclipse.jface.action.IAction; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.internal.model.SystemRegistry; import org.eclipse.rse.model.IHost; import org.eclipse.rse.ui.widgets.InheritableEntryField; import org.eclipse.rse.ui.widgets.SystemHistoryCombo; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java index ca667397a58..c8a60245bb5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java @@ -28,7 +28,6 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.model.IHost; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java index c516e25055c..9cbd3de8e2f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java @@ -49,7 +49,7 @@ import org.eclipse.ui.PlatformUI; * child classes. */ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction - implements ISystemMessages, IRunnableWithProgress, ISystemCopyTargetSelectionCallback + implements IRunnableWithProgress, ISystemCopyTargetSelectionCallback { protected ISystemProfileManager mgr; protected ISystemRegistry sr; @@ -342,9 +342,9 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction protected SystemMessage getCopyingMessage() { if (mode == MODE_COPY) - return RSEUIPlugin.getPluginMessage(MSG_COPYGENERIC_PROGRESS); + return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYGENERIC_PROGRESS); else - return RSEUIPlugin.getPluginMessage(MSG_MOVEGENERIC_PROGRESS); + return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEGENERIC_PROGRESS); } /** * Get the specific "Copying %1..." or "Moving %1..." message @@ -353,9 +353,9 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction { SystemMessage msg = null; if (mode == MODE_COPY) - msg = RSEUIPlugin.getPluginMessage(MSG_COPYTHINGGENERIC_PROGRESS); + msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYTHINGGENERIC_PROGRESS); else - msg = RSEUIPlugin.getPluginMessage(MSG_MOVETHINGGENERIC_PROGRESS); + msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVETHINGGENERIC_PROGRESS); msg.makeSubstitution(oldName); return msg; } @@ -404,7 +404,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction msg = exc.getClass().getName(); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, - RSEUIPlugin.getPluginMessage(MSG_OPERATION_FAILED).makeSubstitution(msg)); + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED).makeSubstitution(msg)); msgDlg.setException(exc); msgDlg.open(); //RSEUIPlugin.logError("Copy/Move operation failed",exc); @@ -431,7 +431,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction */ protected void showOperationCancelledMessage(Shell shell) { - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(MSG_OPERATION_CANCELLED)); + SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED)); msgDlg.open(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearPasswordAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearPasswordAction.java index 88a195fbc72..060b6342ed8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearPasswordAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearPasswordAction.java @@ -21,7 +21,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.swt.widgets.Shell; @@ -32,7 +31,6 @@ import org.eclipse.swt.widgets.Shell; * This is the action for clearing in-memory userId and password cache */ public class SystemClearPasswordAction extends SystemBaseAction - implements ISystemMessages { /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAction.java index c4337c6a937..97992e9f51a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAction.java @@ -19,7 +19,6 @@ package org.eclipse.rse.ui.actions; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.swt.widgets.Shell; @@ -31,7 +30,6 @@ import org.eclipse.swt.widgets.Shell; * This is the action for connecting to the remote subsystem */ public class SystemConnectAction extends SystemBaseAction - implements ISystemMessages { /** * Constructor. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java index 948013201b4..4f582d62470 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java @@ -24,7 +24,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.swt.widgets.Shell; @@ -33,7 +32,6 @@ import org.eclipse.swt.widgets.Shell; * This is the action for connecting all subsystems for a given connection. */ public class SystemConnectAllSubSystemsAction extends SystemBaseAction - implements ISystemMessages { private ISystemRegistry sr = null; 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 65076456f76..6fb1b724e6a 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 @@ -38,7 +38,6 @@ import org.eclipse.swt.widgets.Shell; * Copy a connection action. */ public class SystemCopyConnectionAction extends SystemBaseCopyAction - implements ISystemMessages { private ISystemRegistry sr = null; private SystemSimpleContentElement initialSelectionElement = null; @@ -65,7 +64,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction boolean enable = true; ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemProfile prevProfile = null; - Iterator e= ((IStructuredSelection) selection).iterator(); + Iterator e= selection.iterator(); while (enable && e.hasNext()) { Object selectedObject = e.next(); @@ -119,7 +118,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction throws Exception { IHost oldConnection = (IHost)oldObject; - String oldName = oldConnection.getAliasName(); + //String oldName = oldConnection.getAliasName(); //RSEUIPlugin.logDebugMessage(this.getClass().getName(),"starting to copy "+oldName+" to "+newName); ISystemProfile targetProfile = (ISystemProfile)targetContainer; IHost newConn = sr.copyHost(monitor, oldConnection, targetProfile, newName); @@ -153,14 +152,14 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction */ protected SystemMessage getCopyingMessage() { - return RSEUIPlugin.getPluginMessage(MSG_COPYCONNECTIONS_PROGRESS); + return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYCONNECTIONS_PROGRESS); } /** * @see SystemBaseCopyAction#getCopyingMessage( String) */ protected SystemMessage getCopyingMessage(String oldName) { - return RSEUIPlugin.getPluginMessage(MSG_COPYCONNECTION_PROGRESS).makeSubstitution(oldName); + return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYCONNECTION_PROGRESS).makeSubstitution(oldName); } /** @@ -188,7 +187,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction */ protected IHost[] getSelectedConnections() { - IStructuredSelection selection = (IStructuredSelection)getSelection(); + IStructuredSelection selection = getSelection(); IHost[] conns = new IHost[selection.size()]; Iterator i = selection.iterator(); int idx=0; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java index 119de77d6d1..8c3b2175e61 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java @@ -25,7 +25,6 @@ import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; @@ -47,7 +46,7 @@ import org.eclipse.ui.part.PluginTransferData; /** * Copy selected objects to clipboard action. */ -public class SystemCopyToClipboardAction extends SystemBaseAction implements ISystemMessages, IValidatorRemoteSelection +public class SystemCopyToClipboardAction extends SystemBaseAction implements IValidatorRemoteSelection { @@ -201,7 +200,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IS public boolean updateSelection(IStructuredSelection selection) { boolean enable = true; - Iterator e = ((IStructuredSelection) selection).iterator(); + Iterator e = selection.iterator(); while (enable && e.hasNext()) { Object selectedObject = e.next(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDisconnectAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDisconnectAction.java index a956fffe354..3a2551e190c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDisconnectAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDisconnectAction.java @@ -18,7 +18,6 @@ package org.eclipse.rse.ui.actions; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.swt.widgets.Shell; @@ -29,7 +28,6 @@ import org.eclipse.swt.widgets.Shell; * This is the action for disconnecting from a remote subsystem. */ public class SystemDisconnectAction extends SystemBaseAction - implements ISystemMessages { /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDisconnectAllSubSystemsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDisconnectAllSubSystemsAction.java index 0eebddfa2c8..718cbb47247 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDisconnectAllSubSystemsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDisconnectAllSubSystemsAction.java @@ -19,7 +19,6 @@ package org.eclipse.rse.ui.actions; import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.swt.widgets.Shell; @@ -29,7 +28,6 @@ import org.eclipse.swt.widgets.Shell; * This is the action forconnecting all subsystems for a given connection. */ public class SystemDisconnectAllSubSystemsAction extends SystemBaseAction - implements ISystemMessages { private ISystemRegistry sr = null; 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 08b4537ade4..28f3ec5a5ce 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 @@ -38,7 +38,6 @@ import org.eclipse.swt.widgets.Shell; * Move a connection action. */ public class SystemMoveConnectionAction extends SystemBaseCopyAction - implements ISystemMessages { private ISystemRegistry sr = null; @@ -69,7 +68,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction return false; boolean enable = true; ISystemProfile prevProfile = null; - Iterator e= ((IStructuredSelection) selection).iterator(); + Iterator e= selection.iterator(); while (enable && e.hasNext()) { Object selectedObject = e.next(); @@ -123,7 +122,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction throws Exception { IHost oldConnection = (IHost)oldObject; - String oldName = oldConnection.getAliasName(); + //String oldName = oldConnection.getAliasName(); //RSEUIPlugin.logDebugMessage(this.getClass().getName(),"starting to copy "+oldName+" to "+newName); ISystemProfile targetProfile = (ISystemProfile)targetContainer; IHost newConn = sr.moveHost(monitor, oldConnection, targetProfile, newName); @@ -157,14 +156,14 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction */ protected SystemMessage getCopyingMessage() { - return RSEUIPlugin.getPluginMessage(MSG_MOVECONNECTIONS_PROGRESS); + return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVECONNECTIONS_PROGRESS); } /** * @see SystemBaseCopyAction#getCopyingMessage( String) */ protected SystemMessage getCopyingMessage(String oldName) { - return RSEUIPlugin.getPluginMessage(MSG_MOVECONNECTION_PROGRESS).makeSubstitution(oldName); + return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVECONNECTION_PROGRESS).makeSubstitution(oldName); } /** @@ -192,7 +191,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction */ protected IHost[] getSelectedConnections() { - IStructuredSelection selection = (IStructuredSelection)getSelection(); + IStructuredSelection selection = getSelection(); IHost[] conns = new IHost[selection.size()]; Iterator i = selection.iterator(); int idx=0; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemOpenExplorerPerspectiveAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemOpenExplorerPerspectiveAction.java index 01f5a282bd4..89b402e6347 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemOpenExplorerPerspectiveAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemOpenExplorerPerspectiveAction.java @@ -16,7 +16,6 @@ package org.eclipse.rse.ui.actions; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.filters.ISystemFilterReference; import org.eclipse.rse.model.ISystemPromptableObject; 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 200480fbbcb..505c9821edf 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 @@ -30,7 +30,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.model.IHost; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; @@ -51,7 +50,7 @@ import org.eclipse.ui.part.ResourceTransfer; /** * Paste resources in system clipboard to the selected resource action. */ -public class SystemPasteFromClipboardAction extends SystemBaseAction implements ISystemMessages, IValidatorRemoteSelection +public class SystemPasteFromClipboardAction extends SystemBaseAction implements IValidatorRemoteSelection { @@ -241,7 +240,7 @@ public class SystemPasteFromClipboardAction extends SystemBaseAction implements if (hasSource()) { boolean enable = true; - Iterator e = ((IStructuredSelection) selection).iterator(); + Iterator e = selection.iterator(); while (enable && e.hasNext()) { Object selectedObject = e.next(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java index 8ae7b82bd7b..99dcb3bf30f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java @@ -46,7 +46,7 @@ import org.eclipse.ui.PlatformUI; * We must first prompt user for a new name for the copied profile. */ public class SystemProfileNameCopyAction extends SystemBaseDialogAction - implements ISystemMessages, IRunnableWithProgress + implements IRunnableWithProgress { private ISystemProfile profile, newProfile; private ISystemProfileManager mgr; @@ -180,7 +180,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction */ public static String getCopyingMessage(String oldName, String newName) { - SystemMessage msg = RSEUIPlugin.getPluginMessage(MSG_COPY_PROGRESS); + SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS); msg.makeSubstitution(oldName,newName); return msg.getLevelOneText(); } @@ -205,7 +205,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction */ protected void showOperationErrorMessage(Shell shell, Throwable exc) { - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(MSG_OPERATION_FAILED).makeSubstitution(exc.getMessage())); + SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED).makeSubstitution(exc.getMessage())); msgDlg.open(); SystemBasePlugin.logError("Copy profile operation failed",exc); } @@ -216,7 +216,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction */ protected void showOperationCancelledMessage(Shell shell) { - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(MSG_OPERATION_CANCELLED)); + SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED)); msgDlg.open(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRemoteServerStartAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRemoteServerStartAction.java index 15a98c49a29..6accc607fa4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRemoteServerStartAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRemoteServerStartAction.java @@ -16,7 +16,6 @@ package org.eclipse.rse.ui.actions; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.swt.widgets.Shell; @@ -28,7 +27,6 @@ import org.eclipse.swt.widgets.Shell; * within the Remote Servers cascading menu. */ public class SystemRemoteServerStartAction extends SystemBaseAction - implements ISystemMessages { private SystemCascadingRemoteServerBaseAction parentAction; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRemoteServerStopAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRemoteServerStopAction.java index ff54bec7c53..7fc98446f8c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRemoteServerStopAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRemoteServerStopAction.java @@ -16,7 +16,6 @@ package org.eclipse.rse.ui.actions; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.swt.widgets.Shell; @@ -28,7 +27,6 @@ import org.eclipse.swt.widgets.Shell; * within the Remote Servers cascading menu. */ public class SystemRemoteServerStopAction extends SystemBaseAction - implements ISystemMessages { private SystemCascadingRemoteServerBaseAction parentAction; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowPreferencesPageAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowPreferencesPageAction.java index 6842440c156..0dc04c47972 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowPreferencesPageAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowPreferencesPageAction.java @@ -24,8 +24,6 @@ import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.preference.PreferenceManager; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java index 716b7e50ddb..c8eb5850780 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java @@ -19,7 +19,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.model.ISystemProfile; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; @@ -39,7 +38,7 @@ import org.eclipse.swt.widgets.Text; * Dialog for copying a system profile. */ public class SystemCopyProfileDialog extends SystemPromptDialog - implements ISystemMessages, ISystemPropertyConstants + implements ISystemPropertyConstants { private Text newName; private Button makeActiveCB; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java index c57f295d1f0..5bdf9600829 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java @@ -25,7 +25,6 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.rse.core.SystemAdapterHelpers; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; @@ -55,7 +54,7 @@ import org.eclipse.swt.widgets.TableColumn; * @see org.eclipse.rse.ui.actions.SystemCommonDeleteAction */ public class SystemDeleteDialog extends SystemPromptDialog - implements ISystemMessages, ISystemPropertyConstants, + implements ISystemPropertyConstants, ISelectionChangedListener { private String warningMessage, warningTip; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableProvider.java index 26c7948548c..94c00e6ffb9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableProvider.java @@ -21,7 +21,6 @@ import java.util.Iterator; import java.util.Map; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.IBaseLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; 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 5075b83cdc7..e842d127edf 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 @@ -86,7 +86,7 @@ import org.eclipse.swt.widgets.Text; * @see org.eclipse.rse.ui.actions.SystemCommonRenameAction */ public class SystemRenameDialog extends SystemPromptDialog - implements ISystemMessages, ISystemPropertyConstants, + implements ISystemPropertyConstants, ISelectionChangedListener, TraverseListener, ICellEditorListener, Runnable, FocusListener @@ -390,11 +390,11 @@ public class SystemRenameDialog extends SystemPromptDialog String canonicalNewName = rows[idx].getCanonicalNewName(); // defect 42145 //if (oldName.equalsIgnoreCase(newName)) // does not consider case for linux or unix or quoted names on iseries if (rows[idx].newNameEqualsOldName()) - errMsg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(oldName); + errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(oldName); //errMsg = SystemMessage.sub(RSEUIPlugin.getString(MSG_VALIDATE_RENAME_OLDEQUALSNEW),SystemMessage.MSG_SUB1,newName); //else if (newNames.contains(newName)) defect 42145 else if (newNames.contains(canonicalNewName)) - errMsg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_RENAME_NOTUNIQUE).makeSubstitution(newName); + errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_NOTUNIQUE).makeSubstitution(newName); //errMsg = SystemMessage.sub(RSEUIPlugin.getString(MSG_VALIDATE_RENAME_NOTUNIQUE),SystemMessage.MSG_SUB1,newName); else { @@ -630,8 +630,8 @@ public class SystemRenameDialog extends SystemPromptDialog if ((names != null) && (names.length>0)) { uniqueNameValidator = new ValidatorUniqueString(names,caseSensitive); - uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE)); + uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE)); uniqueNameValidatorPerParent.put(parentName, uniqueNameValidator); if (debug) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java index a6205fa9e3b..2abbc12e784 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java @@ -73,7 +73,7 @@ import org.eclipse.swt.widgets.Widget; * @see org.eclipse.rse.ui.actions.SystemCommonRenameAction */ public class SystemRenameSingleDialog extends SystemPromptDialog - implements ISystemMessages, ISystemPropertyConstants, + implements ISystemPropertyConstants, Runnable { @@ -230,13 +230,13 @@ public class SystemRenameSingleDialog extends SystemPromptDialog { // VERBAGE verbageLabel = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); - Label filler = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); + SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler } else if (description != null) { // VERBAGE verbageLabel = SystemWidgetHelpers.createLabel(composite, description, nbrColumns); - Label filler = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); + SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler } if (copyCollisionMode) @@ -344,9 +344,9 @@ public class SystemRenameSingleDialog extends SystemPromptDialog if ((nameValidator == null) && (adapter != null)) nameValidator = adapter.getNameValidator(inputElement); - if ((nameValidator != null) && (nameValidator instanceof ISystemValidator)) + if (nameValidator != null) { - int maxLen = ((ISystemValidator)nameValidator).getMaximumNameLength(); + int maxLen = nameValidator.getMaximumNameLength(); if (maxLen != -1) newName.setTextLimit(maxLen); } @@ -424,8 +424,8 @@ public class SystemRenameSingleDialog extends SystemPromptDialog if ((names != null) && (names.length>0)) { uniqueNameValidator = new ValidatorUniqueString(names,caseSensitive); - uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE)); + uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE)); if (debug) { System.out.println("Name validator set. Names = "); @@ -595,18 +595,18 @@ public class SystemRenameSingleDialog extends SystemPromptDialog if (theNewName == null) { - errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY); + errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY); } else { if (nameValidator != null) errorMessage= nameValidator.validate(theNewName); else if (theNewName.length() == 0) - errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY); + errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY); if (errorMessage == null) { if (adapter != null && adapter.namesAreEqual(inputElement, theNewName)) - errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(inputName); + errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(inputName); } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableProvider.java index 99770b1af6c..a379312805b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableProvider.java @@ -22,7 +22,6 @@ import java.util.Map; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.viewers.IBaseLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectConnectionDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectConnectionDialog.java index defc8bfa13f..d191726caac 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectConnectionDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectConnectionDialog.java @@ -19,10 +19,8 @@ package org.eclipse.rse.ui.dialogs; import org.eclipse.rse.model.IHost; import org.eclipse.rse.ui.ISystemPageCompleteListener; -import org.eclipse.rse.ui.SystemBaseForm; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.messages.ISystemMessageLine; -import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; import org.eclipse.rse.ui.widgets.SystemSelectConnectionForm; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -213,7 +211,7 @@ public class SystemSelectConnectionDialog { if (getOutputObject() instanceof Object[]) return (Object[])getOutputObject(); - else if (getOutputObject() instanceof Object) + else if (getOutputObject() != null) return new Object[] {getOutputObject()}; else return null; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleContentProvider.java index 3fe1630b1d1..d06f307a1ba 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleContentProvider.java @@ -19,9 +19,7 @@ import java.util.Hashtable; import java.util.Map; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; 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 099ecfeaaf4..b6d52fef382 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 @@ -21,7 +21,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.ISystemCopyTargetSelectionCallback; @@ -39,7 +38,7 @@ import org.eclipse.swt.widgets.Tree; */ public class SystemSimpleCopyDialog extends SystemPromptDialog - implements ISystemMessages, //ISystemPropertyConstants, + implements //ISystemPropertyConstants, ISelectionChangedListener { private String promptString; 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 6d2aef0ae33..d1221f8f403 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 @@ -18,7 +18,6 @@ package org.eclipse.rse.ui.filters.actions; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java index 25ec6d6fb97..7ec6b2d421c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java @@ -32,7 +32,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; -import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseCopyAction; import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; @@ -44,7 +43,6 @@ import org.eclipse.swt.widgets.Shell; * Copy a filter action. */ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction - implements ISystemMessages { private String promptString = null; private SystemSimpleContentElement initialSelectionElement = null; @@ -90,7 +88,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction { boolean enable = true; /* */ - Iterator e= ((IStructuredSelection) selection).iterator(); + Iterator e = selection.iterator(); while (enable && e.hasNext()) { Object selectedObject = e.next(); @@ -144,7 +142,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction Object targetContainer, Object oldObject, String oldName) { ISystemFilterPool newPool = (ISystemFilterPool)targetContainer; - ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager(); + //ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager(); String newName = oldName; ISystemFilter match = newPool.getSystemFilter(oldName); if (match != null) @@ -171,7 +169,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction ISystemFilterPool oldFilterPool = oldFilter.getParentFilterPool(); ISystemFilterPoolManager oldMgr = oldFilterPool.getSystemFilterPoolManager(); ISystemFilterPool newPool = (ISystemFilterPool)targetContainer; - ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager(); + //ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager(); ISystemFilter newFilter = oldMgr.copySystemFilter(newPool, oldFilter, newName); @@ -220,14 +218,14 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction */ protected SystemMessage getCopyingMessage() { - return RSEUIPlugin.getPluginMessage(MSG_COPYFILTERS_PROGRESS); + return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERS_PROGRESS); } /** * @see SystemBaseCopyAction#getCopyingMessage(String) */ protected SystemMessage getCopyingMessage(String oldName) { - return RSEUIPlugin.getPluginMessage(MSG_COPYFILTER_PROGRESS).makeSubstitution(oldName); + return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTER_PROGRESS).makeSubstitution(oldName); } /** @@ -255,7 +253,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction */ protected ISystemFilter[] getSelectedFilters() { - IStructuredSelection selection = (IStructuredSelection)getSelection(); + IStructuredSelection selection = getSelection(); ISystemFilter[] filters = new ISystemFilter[selection.size()]; Iterator i = selection.iterator(); int idx=0; @@ -348,7 +346,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction Vector elements, SystemSimpleContentElement parentElement) { - String mgrName = mgr.getName(); + //String mgrName = mgr.getName(); ISystemFilterPool[] pools = mgr.getSystemFilterPools(); for (int idx=0; idx|"); nbrSpecialChars = specialChars.length(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java index c8f8a0f0c3d..3239ce8f19e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java @@ -30,7 +30,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * InputDialog class and numerous other platform and system classes. */ public class ValidatorProfileName - extends ValidatorFolderName implements ISystemMessages, ISystemValidator + extends ValidatorFolderName implements ISystemValidator { public static final int MAX_PROFILENAME_LENGTH = 100; // arbitrary restriction! Defect 41816 private SystemMessage reservedNameMsg; @@ -41,9 +41,9 @@ public class ValidatorProfileName public ValidatorProfileName(Vector existingNameList) { super(existingNameList); - super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PROFILENAME_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PROFILENAME_NOTUNIQUE), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PROFILENAME_NOTVALID)); + super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_NOTUNIQUE), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_NOTVALID)); } /** @@ -60,7 +60,7 @@ public class ValidatorProfileName private SystemMessage getReservedNameMessage() { if (reservedNameMsg == null) - reservedNameMsg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PROFILENAME_RESERVED); + reservedNameMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_RESERVED); return reservedNameMsg; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSourceType.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSourceType.java index 8d97c5fb933..a69aebc7aa8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSourceType.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSourceType.java @@ -26,7 +26,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * However, this class is defined to be easily subclassed. */ public class ValidatorSourceType extends ValidatorUniqueString - implements ISystemMessages, ISystemValidator + implements ISystemValidator { public static final int MAX_SRCTYPE_LENGTH = 50; // max name for a src type @@ -45,9 +45,9 @@ public class ValidatorSourceType extends ValidatorUniqueString private void init() { - super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_SRCTYPE_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_SRCTYPE_NOTUNIQUE)); - msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_SRCTYPE_NOTVALID); + super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_SRCTYPE_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_SRCTYPE_NOTUNIQUE)); + msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_SRCTYPE_NOTVALID); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSpecialChar.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSpecialChar.java index 53597d6ea57..e6b2848db18 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSpecialChar.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSpecialChar.java @@ -28,7 +28,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * InputDialog class and numerous other platform and system classes. */ public class ValidatorSpecialChar - implements ISystemMessages, ISystemValidator // IInputValidator, ICellEditorValidator + implements ISystemValidator // IInputValidator, ICellEditorValidator { public static final boolean EMPTY_ALLOWED_NO = false; @@ -47,7 +47,7 @@ public class ValidatorSpecialChar */ public ValidatorSpecialChar(String specialChars, boolean isEmptyAllowed) { - this(specialChars, isEmptyAllowed, RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_NOTVALID), RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_EMPTY)); + this(specialChars, isEmptyAllowed, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_NOTVALID), RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_EMPTY)); } /** * Constructor @@ -57,7 +57,7 @@ public class ValidatorSpecialChar */ public ValidatorSpecialChar(String specialChars, boolean isEmptyAllowed, SystemMessage msg_Invalid) { - this(specialChars, isEmptyAllowed, msg_Invalid, RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_EMPTY)); + this(specialChars, isEmptyAllowed, msg_Invalid, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_EMPTY)); } /** * Constructor diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java index 1f13de9ef0a..7b24624aaa6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java @@ -18,6 +18,7 @@ package org.eclipse.rse.ui.validators; import java.util.Vector; import org.eclipse.rse.services.clientserver.messages.SystemMessage; +import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; @@ -46,10 +47,10 @@ public class ValidatorSystemName public ValidatorSystemName(Vector existingNameList) { super(existingNameList, true); // case sensitive uniqueness - super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE)); + super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE)); fUnique = true; - msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTVALID); + msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTVALID); } /** * Use this constructor when the name must be unique. Give the @@ -58,10 +59,10 @@ public class ValidatorSystemName public ValidatorSystemName(String existingNameList[]) { super(existingNameList, true); // case sensitive uniqueness - super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE)); + super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE)); fUnique = true; - msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTVALID); + msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTVALID); } /** @@ -71,10 +72,10 @@ public class ValidatorSystemName public ValidatorSystemName() { super(new String[0], true); - super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE)); + super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE)); fUnique = false; - msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTVALID); + msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTVALID); } /** * Supply your own error message text. By default, messages from RSEUIPlugin resource bundle are used. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java index 2dfdbad5b59..ccde7543d34 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java @@ -33,7 +33,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * is used by jface's InputDialog class and property sheet window. */ public class ValidatorUniqueString - implements ISystemMessages, ISystemValidator, ISystemValidatorUniqueString + implements ISystemValidator, ISystemValidatorUniqueString //,IInputValidator, ICellEditorValidator ... ISystemValidator extends these { @@ -59,8 +59,8 @@ public class ValidatorUniqueString this.caseSensitive = caseSensitive; setExistingNamesList(existingList); // initialize error messages - setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_NOTUNIQUE)); + setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_NOTUNIQUE)); } /** * Constructor accepting an Array. @@ -72,8 +72,8 @@ public class ValidatorUniqueString this.caseSensitive = caseSensitive; init(existingList, caseSensitive); // initialize error messages - setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_NOTUNIQUE)); + setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_NOTUNIQUE)); } /** * Constructor accepting a Vector and another validator to use for the syntax checking. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionCommand.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionCommand.java index c443562ed11..787e88ed4dc 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionCommand.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionCommand.java @@ -24,7 +24,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * This class is used to verify a user defined action's command */ public class ValidatorUserActionCommand - implements ISystemMessages, ISystemValidator + implements ISystemValidator { public static final int MAX_UDACMD_LENGTH = 512; // max command for an action diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionComment.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionComment.java index 6b87af3a4bc..aaf335aeb2e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionComment.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionComment.java @@ -24,7 +24,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * This class is used to verify a user defined action's comment */ public class ValidatorUserActionComment - implements ISystemMessages, ISystemValidator + implements ISystemValidator { public static final int MAX_UDACMT_LENGTH = 256; // max comment for an action diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java index bcfa018835b..1b0ac1578dd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java @@ -28,7 +28,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * This class is used to verify a user defined action's name. */ public class ValidatorUserActionName extends ValidatorUniqueString - implements ISystemMessages, ISystemValidator + implements ISystemValidator { public static final int MAX_UDANAME_LENGTH = 256; // max name for an action @@ -67,10 +67,10 @@ public class ValidatorUserActionName extends ValidatorUniqueString private void init() { - super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDANAME_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDANAME_NOTUNIQUE)); + super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDANAME_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDANAME_NOTUNIQUE)); fUnique = true; - msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDANAME_NOTVALID); + msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDANAME_NOTVALID); } /** * Supply your own error message text. By default, messages from RSEUIPlugin resource bundle are used. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserId.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserId.java index 44872613b5a..d6dbd1b1aa3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserId.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserId.java @@ -30,14 +30,14 @@ import org.eclipse.rse.ui.RSEUIPlugin; * InputDialog class and numerous other platform and system classes. */ public class ValidatorUserId - extends ValidatorSpecialChar implements ISystemMessages + extends ValidatorSpecialChar { /** * Constructor */ public ValidatorUserId(boolean isEmptyAllowed) { - super("=;", isEmptyAllowed, RSEUIPlugin.getPluginMessage(MSG_VALIDATE_USERID_NOTVALID), RSEUIPlugin.getPluginMessage(MSG_VALIDATE_USERID_EMPTY)); + super("=;", isEmptyAllowed, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_NOTVALID), RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_EMPTY)); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeName.java index 642a94504ba..342907ddf15 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeName.java @@ -24,7 +24,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * This class is used to verify a user defined type's name. */ public class ValidatorUserTypeName extends ValidatorUniqueString - implements ISystemMessages, ISystemValidator + implements ISystemValidator { public static final int MAX_UDTNAME_LENGTH = 50; // max name for a file type @@ -41,9 +41,9 @@ public class ValidatorUserTypeName extends ValidatorUniqueString private void init() { - super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDTNAME_EMPTY), - RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDTNAME_NOTUNIQUE)); - msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDTNAME_NOTVALID); + super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDTNAME_EMPTY), + RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDTNAME_NOTUNIQUE)); + msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDTNAME_NOTVALID); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeTypes.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeTypes.java index 57cd59ac0b6..89873b932b5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeTypes.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeTypes.java @@ -24,7 +24,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * This class is used to verify a user defined action's comment */ public class ValidatorUserTypeTypes - implements ISystemMessages, ISystemValidator + implements ISystemValidator { public static final int MAX_UDTTYPES_LENGTH = 512; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java index 347b9f31586..f98d20ab3f7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java @@ -18,14 +18,12 @@ package org.eclipse.rse.ui.view; import java.lang.reflect.InvocationTargetException; import java.util.List; -import java.util.ResourceBundle; import java.util.StringTokenizer; import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; @@ -43,7 +41,6 @@ import org.eclipse.rse.model.ISystemResourceSet; import org.eclipse.rse.model.SystemMessageObject; import org.eclipse.rse.model.SystemRemoteResourceSet; import org.eclipse.rse.model.SystemWorkspaceResourceSet; -import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java index 32b50bba543..db45b469b33 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java @@ -24,7 +24,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.swt.widgets.Shell; 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 c03c43ec4bd..92fcbe49228 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 @@ -43,9 +43,7 @@ import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.filters.ISystemFilterReference; import org.eclipse.rse.filters.ISystemFilterString; import org.eclipse.rse.filters.SystemFilterPoolWrapperInformation; -import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemProfile; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; @@ -55,7 +53,6 @@ import org.eclipse.rse.ui.actions.SystemClearPasswordAction; import org.eclipse.rse.ui.actions.SystemConnectAction; import org.eclipse.rse.ui.actions.SystemDisconnectAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; -import org.eclipse.rse.ui.filters.SystemFilterStringEditPane; import org.eclipse.rse.ui.filters.actions.ISystemNewFilterActionConfigurator; import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction; import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; @@ -79,9 +76,8 @@ import org.eclipse.rse.ui.propertypages.ISystemSubSystemPropertyPageCoreForm; import org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage; import org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage; import org.eclipse.rse.ui.propertypages.SystemSubSystemPropertyPageCoreForm; -import org.eclipse.rse.ui.validators.ISystemValidator; -import org.eclipse.rse.ui.widgets.RemoteServerLauncherForm; import org.eclipse.rse.ui.widgets.IServerLauncherForm; +import org.eclipse.rse.ui.widgets.RemoteServerLauncherForm; import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; import org.eclipse.rse.ui.wizards.SubSystemServiceWizardPage; import org.eclipse.rse.ui.wizards.SystemSubSystemsPropertiesWizardPage; @@ -629,7 +625,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda ISystemProfile activeProfile = selectedSubSystem.getHost().getSystemProfile(); for (int idx = 0; idx < activeProfiles.length; idx++) { - ISystemFilterPool defaultPool = getDefaultSystemFilterPool(factory, (ISystemProfile)activeProfiles[idx]); + ISystemFilterPool defaultPool = getDefaultSystemFilterPool(factory, activeProfiles[idx]); if (defaultPool != null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java index 9a9de5f2495..c9422e7de7c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java @@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Shell; * use as a parent class. */ public abstract class SystemAbstractAPIProvider - implements ISystemViewInputProvider, ISystemMessages + implements ISystemViewInputProvider { @@ -132,9 +132,9 @@ public abstract class SystemAbstractAPIProvider private void initMsgObjects() { - nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); - canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null); - errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null); + nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); + canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null); + errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java index 872229c27a5..3a08caea834 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java @@ -25,7 +25,6 @@ import org.eclipse.rse.filters.ISystemFilterStringReference; import org.eclipse.rse.filters.SystemFilterSimple; import org.eclipse.rse.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.swt.widgets.Shell; @@ -41,7 +40,7 @@ import org.eclipse.swt.widgets.Shell; */ public class SystemSelectRemoteObjectAPIProviderImpl extends SystemAbstractAPIProvider - implements ISystemViewInputProvider, ISystemMessages + implements ISystemViewInputProvider { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java index 3f86aef0568..b791ae6d99d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java @@ -30,7 +30,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; */ public class SystemTestFilterStringAPIProviderImpl extends SystemAbstractAPIProvider - implements ISystemViewInputProvider, ISystemMessages + implements ISystemViewInputProvider { @@ -55,9 +55,9 @@ public class SystemTestFilterStringAPIProviderImpl private void initMsgObjects() { - nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); - canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null); - errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null); + nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); + canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null); + errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterStrings.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterStrings.java index d7ff49c6614..b1f6a841f4f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterStrings.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterStrings.java @@ -35,7 +35,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * Used when user right clicks on a filter string and selects Open In New Perspective. */ public class SystemViewAPIProviderForFilterStrings - extends SystemAbstractAPIProvider implements ISystemMessages + extends SystemAbstractAPIProvider { @@ -140,21 +140,21 @@ public class SystemViewAPIProviderForFilterStrings if ((children == null) || (children.length==0)) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY), ISystemMessageObject.MSGTYPE_EMPTY, element); } } catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); System.out.println("Canceled."); } catch (Exception exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); System.out.println("Exception resolving filter strings: " + exc.getClass().getName() + ", " + exc.getMessage()); exc.printStackTrace(); 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 f6fc3145dbf..b94cfdb6d2a 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 @@ -43,7 +43,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * Used when user right clicks on a filter and selects Open In New Perspective. */ public class SystemViewAPIProviderForFilters - extends SystemAbstractAPIProvider implements ISystemMessages + extends SystemAbstractAPIProvider { @@ -138,13 +138,13 @@ public class SystemViewAPIProviderForFilters ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); if (newFilter == null) { - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL,element); } else // filter successfully created! { // return "filter created successfully" message object for this node - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FILTERCREATED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FILTERCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED,element); // select the new filter reference... ISubSystem ss = fRef.getSubSystem(); @@ -163,7 +163,7 @@ public class SystemViewAPIProviderForFilters } } } catch (Exception exc) { - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); SystemBasePlugin.logError("Exception prompting for filter ",exc); } @@ -194,14 +194,14 @@ public class SystemViewAPIProviderForFilters catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL,element); SystemBasePlugin.logDebugMessage(this.getClass().getName(),"Filter resolving canceled by user."); } catch (Exception exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); SystemBasePlugin.logError("Exception resolving filters' strings ",exc); } // message already issued @@ -209,7 +209,7 @@ public class SystemViewAPIProviderForFilters if ((children == null) || (children.length==0)) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY), ISystemMessageObject.MSGTYPE_EMPTY, element); } return children; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDropAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDropAdapter.java index de47ea2de21..f0a296e745a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDropAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDropAdapter.java @@ -47,10 +47,8 @@ import org.eclipse.ui.part.PluginTransferData; * Drop adapter for dropping objects in the Systems views. * */ -public class SystemViewDataDropAdapter extends ViewerDropAdapter implements ISystemMessages +public class SystemViewDataDropAdapter extends ViewerDropAdapter { - - protected Shell shell; protected long hoverStart = 0; @@ -141,7 +139,7 @@ public class SystemViewDataDropAdapter extends ViewerDropAdapter implements ISy String[] resources = (String[]) data; for (int i = 0; i < resources.length; i++) { - String resource = (String)resources[i]; + String resource = resources[i]; srcObjects.add(resource); } _sourceType = SystemDNDTransferRunnable.SRC_TYPE_OS_RESOURCE; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java index 114fe2638ec..a3b1cece4a7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java @@ -58,7 +58,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor; * behaviour. If this is done, you must register your subclass with the * platform's adapter manager in your plugin class's startup method. */ -public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter, ISystemMessages +public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter { //private static String translatedFilterString = null; // ------------------- @@ -299,7 +299,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement //SubSystem ss = (SubSystem)simpleFilter.getParent(); // return "filter created successfully" message object for this node - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FILTERCREATED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FILTERCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED,filter); // select the new filter and expand it diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java index 11c5aff2e8e..4b8c7603a41 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java @@ -64,7 +64,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor; */ public class SystemViewFilterReferenceAdapter extends AbstractSystemViewAdapter - implements ISystemViewElementAdapter, ISystemMessages + implements ISystemViewElementAdapter { //private static String translatedFilterString = null; // ------------------- @@ -87,7 +87,7 @@ public class SystemViewFilterReferenceAdapter // return; // does not make sense adding unique actions per multi-selection ISystemFilter filter = getFilter(selection.getFirstElement()); ISubSystemConfiguration ssFactory = getSubSystemConfiguration(filter); - ISubSystem currentSubSystem = (ISubSystem) getFilterReference(selection.getFirstElement()).getSubSystem(); + ISubSystem currentSubSystem = getFilterReference(selection.getFirstElement()).getSubSystem(); IHost currentConnection = currentSubSystem.getHost(); ssFactory.setConnection(currentConnection); ssFactory.setCurrentSelection(selection.toArray()); @@ -208,7 +208,7 @@ public class SystemViewFilterReferenceAdapter if (showFPs) return parentContainer; else - return (ISubSystem) fr.getProvider(); + return fr.getProvider(); //return fr.getParent(); } @@ -266,12 +266,12 @@ public class SystemViewFilterReferenceAdapter ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); if (newFilter == null) { - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); } else // filter successfully created! { // return "filter created successfully" message object for this node - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FILTERCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FILTERCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED, element); // select the new filter reference... ISystemFilterReference sfr = fRef.getParentSystemFilterReferencePool().getExistingSystemFilterReference(ss, newFilter); ISystemViewInputProvider inputProvider = getInput(); @@ -290,7 +290,7 @@ public class SystemViewFilterReferenceAdapter } catch (Exception exc) { - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); SystemBasePlugin.logError("Exception prompting for filter ", exc); } //RSEUIPlugin.logDebugMessage(this.getClass().getName(),"returning children"); @@ -393,20 +393,20 @@ public class SystemViewFilterReferenceAdapter catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); SystemBasePlugin.logDebugMessage(this.getClass().getName(), "Filter resolving canceled by user."); } catch (Exception exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); SystemBasePlugin.logError("Exception resolving filters' strings ", exc); } // message already issued if ((children == null) || (children.length == 0)) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY), ISystemMessageObject.MSGTYPE_EMPTY, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY), ISystemMessageObject.MSGTYPE_EMPTY, element); } return children; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java index e6fbe60a002..8acaabbcdb4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java @@ -26,7 +26,6 @@ import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterString; import org.eclipse.rse.ui.ISystemIconConstants; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemResources; @@ -38,7 +37,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor; /** * Default Adapter for displaying filter string objects in tree views. */ -public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter, ISystemMessages +public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter { //private static String translatedFilterString = null; // ------------------- diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewContentProvider.java index 2de6c52f2f2..458c13c0190 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewContentProvider.java @@ -20,7 +20,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemResourceManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java index ec4f3ecb8fd..9ce9d79b76c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java @@ -17,8 +17,6 @@ package org.eclipse.rse.ui.widgets.services; import java.util.ArrayList; -import org.eclipse.jface.viewers.IContentProvider; -import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java index 1d8d6881abb..503e291d3b2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java @@ -15,7 +15,6 @@ ********************************************************************************/ package org.eclipse.rse.ui.wizards; -import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java index f4db19d7aa9..0d125577d7e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.model.IHost; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java index c8c4e333cab..c57a9c8f585 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java @@ -20,7 +20,6 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.model.IHost; import org.eclipse.rse.ui.ISystemConnectionFormCaller; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemConnectionForm; import org.eclipse.rse.ui.messages.ISystemMessageLine; @@ -44,7 +43,7 @@ import org.eclipse.swt.widgets.Control; public class RSENewConnectionWizardDefaultDelegateMainPage //extends WizardPage extends AbstractSystemWizardPage - implements ISystemMessages, ISystemNewConnectionWizardMainPage, + implements ISystemNewConnectionWizardMainPage, ISystemMessageLine, ISystemConnectionFormCaller { protected String[] restrictSystemTypesTo; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java index 92393b837cf..3f15bb6db3e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java @@ -20,22 +20,17 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.wizard.IWizard; -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.servicesubsystem.IServiceSubSystem; import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.model.DummyHost; import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.widgets.services.ConnectorServiceElement; import org.eclipse.rse.ui.widgets.services.FactoryServiceElement; -import org.eclipse.rse.ui.widgets.services.PropertyElement; import org.eclipse.rse.ui.widgets.services.RootServiceElement; import org.eclipse.rse.ui.widgets.services.ServerLauncherPropertiesServiceElement; import org.eclipse.rse.ui.widgets.services.ServiceElement; @@ -87,7 +82,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar IServiceSubSystemConfiguration currentFactory = (IServiceSubSystemConfiguration)getSubSystemConfiguration(); String systemTypeStr = getMainPage().getSystemType(); - IRSESystemType systemType = RSECorePlugin.getDefault().getRegistry().getSystemType(systemTypeStr); + //IRSESystemType systemType = RSECorePlugin.getDefault().getRegistry().getSystemType(systemTypeStr); IServiceSubSystemConfiguration[] factories = getServiceSubSystemFactories(systemTypeStr, currentFactory.getServiceType()); @@ -193,7 +188,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar { ((IServiceSubSystem)ss).switchServiceFactory(_selectedFactory); } - IHost realHost = ss.getHost(); + //IHost realHost = ss.getHost(); if (_root != null) { { @@ -229,7 +224,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar ServiceElement[] children = _root.getChildren(); for (int i = 0; i < children.length; i++) { - ServiceElement child = (ServiceElement)children[i]; + ServiceElement child = children[i]; if (child instanceof FactoryServiceElement) { FactoryServiceElement fchild = (FactoryServiceElement)child; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java index 4b5db45e369..4dc9e4bc075 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java @@ -20,7 +20,6 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.model.IHost; import org.eclipse.rse.ui.ISystemConnectionFormCaller; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemConnectionForm; import org.eclipse.rse.ui.messages.ISystemMessageLine; @@ -44,7 +43,7 @@ import org.eclipse.swt.widgets.Control; public class SystemNewConnectionWizardDefaultMainPage //extends WizardPage extends AbstractSystemWizardPage - implements ISystemMessages, ISystemNewConnectionWizardMainPage, + implements ISystemNewConnectionWizardMainPage, ISystemMessageLine, ISystemConnectionFormCaller { protected String[] restrictSystemTypesTo; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardRenameProfilePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardRenameProfilePage.java index 3242968dfd4..f423a463cf5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardRenameProfilePage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardRenameProfilePage.java @@ -17,7 +17,6 @@ package org.eclipse.rse.ui.wizards; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.internal.model.SystemProfileManager; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemProfileForm; import org.eclipse.rse.ui.SystemResources; @@ -35,7 +34,7 @@ import org.eclipse.swt.widgets.Control; public class SystemNewConnectionWizardRenameProfilePage extends AbstractSystemWizardPage - implements ISystemMessages, + implements ISystemMessageLine { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java index 5dbd4e6088d..760e11a3169 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java @@ -17,7 +17,6 @@ package org.eclipse.rse.ui.wizards; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; @@ -42,7 +41,7 @@ import org.eclipse.swt.widgets.Text; public class SystemNewProfileWizardMainPage extends AbstractSystemWizardPage - implements ISystemMessages, + implements ISystemMessageLine { diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java index 0c13dfe9cb7..07dac3af3ee 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java @@ -16,11 +16,8 @@ package org.eclipse.rse.core.subsystems; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.IWizard; import org.eclipse.rse.core.persistance.IRSEPersistableContainer; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPool; @@ -28,16 +25,12 @@ import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemProfile; -import org.eclipse.rse.ui.SystemMenuManager; -import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; - - public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvider, IRSEPersistableContainer { // ---------------------------------