From 076735e8f801c49f999f72055cfd6747ce179cd0 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 3 Apr 2007 16:28:48 +0000 Subject: [PATCH] [180562] not implementing ISystemIconConstants --- .../ui/widgets/SystemSelectRemoteFileOrFolderForm.java | 3 +-- .../processes/ui/actions/SystemNewProcessFilterAction.java | 6 +++--- .../rse/internal/ui/actions/SystemCommonDeleteAction.java | 2 -- .../internal/ui/dialogs/SystemWorkWithHistoryDialog.java | 3 +-- .../filters/dialogs/SystemNewFilterWizardConfigurator.java | 3 +-- .../rse/useractions/files/uda/UDTypesEditorFiles.java | 3 +-- .../eclipse/rse/useractions/ui/SystemCommandTextField.java | 3 +-- .../rse/useractions/ui/uda/SystemUDACascadeAction.java | 3 +-- .../rse/useractions/ui/uda/SystemWorkWithUDAsDialog.java | 3 +-- 9 files changed, 10 insertions(+), 19 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java index 3829b2db923..629ff07d904 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java @@ -46,7 +46,6 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.util.SystemRemoteFileMatcher; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; @@ -98,7 +97,7 @@ import org.eclipse.swt.widgets.Text; * */ public class SystemSelectRemoteFileOrFolderForm - implements ISelectionChangedListener, ISystemIconConstants + implements ISelectionChangedListener { protected static final int PROMPT_WIDTH = 400; // The maximum width of the dialog's prompt, in pixels. diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemNewProcessFilterAction.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemNewProcessFilterAction.java index f6289f2ed80..65b1a6dc4d0 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemNewProcessFilterAction.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemNewProcessFilterAction.java @@ -26,7 +26,7 @@ import org.eclipse.rse.ui.filters.dialogs.SystemNewFilterWizard; import org.eclipse.swt.widgets.Shell; -public class SystemNewProcessFilterAction extends SystemNewFilterAction implements ISystemIconConstants +public class SystemNewProcessFilterAction extends SystemNewFilterAction { /** @@ -36,7 +36,7 @@ public class SystemNewProcessFilterAction extends SystemNewFilterAction implemen { super(shell, parentPool, SystemProcessesResources.ACTION_NEWPROCESSFILTER_LABEL, - SystemProcessesResources.ACTION_NEWPROCESSFILTER_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ICON_SYSTEM_NEWFILTER_ID)); + SystemProcessesResources.ACTION_NEWPROCESSFILTER_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTER_ID)); setHelp(RSEUIPlugin.HELPPREFIX+"actn0042"); //$NON-NLS-1$ setDialogHelp(RSEUIPlugin.HELPPREFIX+"wnfr0000"); //$NON-NLS-1$ } @@ -64,7 +64,7 @@ public class SystemNewProcessFilterAction extends SystemNewFilterAction implemen { // configuration that used to only be possible via subclasses... wizard.setWizardPageTitle(SystemProcessesResources.RESID_NEWPROCESSFILTER_PAGE1_TITLE); - wizard.setWizardImage(RSEUIPlugin.getDefault().getImageDescriptor(ICON_SYSTEM_NEWFILTERWIZARD_ID)); + wizard.setWizardImage(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTERWIZARD_ID)); wizard.setPage1Description(SystemProcessesResources.RESID_NEWPROCESSFILTER_PAGE1_DESCRIPTION); wizard.setFilterStringEditPane(new SystemProcessFilterStringEditPane(wizard.getShell())); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java index c22743bc57b..0d51a2bf284 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java @@ -25,7 +25,6 @@ import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemDeleteTarget; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseDialogAction; import org.eclipse.rse.ui.dialogs.SystemDeleteDialog; @@ -55,7 +54,6 @@ import org.eclipse.ui.PlatformUI; */ public class SystemCommonDeleteAction extends SystemBaseDialogAction - implements ISystemIconConstants { private String promptLabel; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemWorkWithHistoryDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemWorkWithHistoryDialog.java index 22df10ddcb7..084a52b1073 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemWorkWithHistoryDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemWorkWithHistoryDialog.java @@ -17,7 +17,6 @@ package org.eclipse.rse.internal.ui.dialogs; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; @@ -48,7 +47,7 @@ import org.eclipse.swt.widgets.Widget; * The history strings are shown in a simple list, and the user can delete * items from the list or re-order items in the list. */ -public class SystemWorkWithHistoryDialog extends SystemPromptDialog implements ISystemIconConstants, Listener, ArmListener +public class SystemWorkWithHistoryDialog extends SystemPromptDialog implements Listener, ArmListener { private String[] historyInput; private String[] historyOutput; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardConfigurator.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardConfigurator.java index 3c1b16d8bf5..79fbc53fbf0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardConfigurator.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardConfigurator.java @@ -17,7 +17,6 @@ package org.eclipse.rse.ui.filters.dialogs; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; /** @@ -31,7 +30,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; * Your best option is to subclass this and override just those things you want to change. */ public class SystemNewFilterWizardConfigurator - implements ISystemNewFilterWizardConfigurator, ISystemIconConstants + implements ISystemNewFilterWizardConfigurator { // cached attrs private String pageTitle; diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/files/uda/UDTypesEditorFiles.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/files/uda/UDTypesEditorFiles.java index ca501439d8d..5b88c72ed03 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/files/uda/UDTypesEditorFiles.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/files/uda/UDTypesEditorFiles.java @@ -21,7 +21,6 @@ import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; @@ -49,7 +48,7 @@ import org.eclipse.ui.dialogs.FileEditorMappingLabelProvider; * custom widgets allowing the user to specify the file types * for a named file type, in the Work With File Types dialog */ -public class UDTypesEditorFiles implements ISystemUDTypeEditPaneTypesSelector, ISystemIconConstants, ICheckStateListener { +public class UDTypesEditorFiles implements ISystemUDTypeEditPaneTypesSelector, ICheckStateListener { public static final String NO_EXTENSION_PLACEHOLDER = UDActionSubsystemFiles.NO_EXTENSION_PLACEHOLDER; // gui widgets private CheckboxTableViewer typesSelectionList; diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/SystemCommandTextField.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/SystemCommandTextField.java index 9156c684a3a..d1114170541 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/SystemCommandTextField.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/SystemCommandTextField.java @@ -16,7 +16,6 @@ import org.eclipse.jface.window.Window; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.shells.ui.view.ISystemCommandTextModifyListener; import org.eclipse.rse.shells.ui.view.SystemCommandEditor; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMassager; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.validators.ISystemValidator; @@ -34,7 +33,7 @@ import org.eclipse.swt.widgets.Label; * This class encapsulates a prompt for a remote command that supports * substitution variables. It is used in both compile and user action dialogs. */ -public class SystemCommandTextField implements ISystemIconConstants, SelectionListener { +public class SystemCommandTextField implements SelectionListener { protected SystemCommandEditor textCommand; protected ISystemMassager cmdMassager; protected Button insertVariableButton; diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemUDACascadeAction.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemUDACascadeAction.java index 7890a0906b8..484aa9714f4 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemUDACascadeAction.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemUDACascadeAction.java @@ -18,7 +18,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.actions.SystemBaseDummyAction; @@ -29,7 +28,7 @@ import org.eclipse.swt.widgets.Shell; /** * A cascading menu action for "User actions->" */ -public class SystemUDACascadeAction extends SystemBaseSubMenuAction implements ISystemIconConstants, IMenuListener { +public class SystemUDACascadeAction extends SystemBaseSubMenuAction implements IMenuListener { private SystemUDActionSubsystem udsubsystem; //private IStructuredSelection selection; private SystemWorkWithUDAsAction wwAction; diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemWorkWithUDAsDialog.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemWorkWithUDAsDialog.java index 0947e15911b..cd6b84f0f61 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemWorkWithUDAsDialog.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemWorkWithUDAsDialog.java @@ -15,7 +15,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.model.SystemStartHere; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; @@ -42,7 +41,7 @@ import org.eclipse.swt.widgets.Widget; * A dialog that allows the user to manipulate their user defined actions for a * given subsystem factory. */ -public class SystemWorkWithUDAsDialog extends SystemPromptDialog implements ISystemUDWorkWithDialog, ISystemIconConstants, ISystemMessages, ISystemUDAEditPaneHoster, Listener, SelectionListener, +public class SystemWorkWithUDAsDialog extends SystemPromptDialog implements ISystemUDWorkWithDialog,ISystemMessages, ISystemUDAEditPaneHoster, Listener, SelectionListener, Runnable { // Changes: // June 2002, Phil Coulthard: Added prompt for parent profile, similar to New Connection and New Filter Pool wizards.