From 97acafc9eba30897f37e407033bd9dfe378ed067 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 11 May 2007 17:53:36 +0000 Subject: [PATCH] [174945] Remove obsolete icons from rse.shells.ui --- .../icons/full/elcl16/removeshell.gif | Bin .../icons/full/obj16/systemenvvar.gif | Bin .../icons/full/obj16/systemenvvarlibpath.gif | Bin .../icons/full/obj16/systemenvvarpath.gif | Bin .../internal/shells/ui/ShellsUIPlugin.java | 45 ++++++++++++++++++ .../ui/actions/SystemCommandAction.java | 4 +- .../SystemTerminateRemoveShellAction.java | 10 ++-- ...lServiceSubSystemConfigurationAdapter.java | 11 ++--- .../CommandEntryContentAssistProcessor.java | 4 +- .../view/SystemViewRemoteOutputAdapter.java | 15 +++--- .../eclipse/rse/ui/ISystemIconConstants.java | 28 ----------- .../UI/org/eclipse/rse/ui/RSEUIPlugin.java | 13 ----- .../icons/full/dlcl16/cancelshell.gif | Bin 151 -> 0 bytes .../icons/full/dlcl16/removeshell.gif | Bin 342 -> 0 bytes .../icons/full/elcl16/cancelshell.gif | Bin 219 -> 0 bytes .../icons/full/obj16/systemshell.gif | Bin 357 -> 0 bytes .../icons/full/obj16/systemshelllive.gif | Bin 366 -> 0 bytes 17 files changed, 68 insertions(+), 62 deletions(-) rename rse/plugins/{org.eclipse.rse.ui => org.eclipse.rse.shells.ui}/icons/full/elcl16/removeshell.gif (100%) rename rse/plugins/{org.eclipse.rse.ui => org.eclipse.rse.shells.ui}/icons/full/obj16/systemenvvar.gif (100%) rename rse/plugins/{org.eclipse.rse.ui => org.eclipse.rse.shells.ui}/icons/full/obj16/systemenvvarlibpath.gif (100%) rename rse/plugins/{org.eclipse.rse.ui => org.eclipse.rse.shells.ui}/icons/full/obj16/systemenvvarpath.gif (100%) delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/cancelshell.gif delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/removeshell.gif delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/cancelshell.gif delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemshell.gif delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemshelllive.gif diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/removeshell.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/elcl16/removeshell.gif similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/removeshell.gif rename to rse/plugins/org.eclipse.rse.shells.ui/icons/full/elcl16/removeshell.gif diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemenvvar.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/systemenvvar.gif similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemenvvar.gif rename to rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/systemenvvar.gif diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemenvvarlibpath.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/systemenvvarlibpath.gif similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemenvvarlibpath.gif rename to rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/systemenvvarlibpath.gif diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemenvvarpath.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/systemenvvarpath.gif similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemenvvarpath.gif rename to rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/systemenvvarpath.gif diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellsUIPlugin.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellsUIPlugin.java index 6bb13eba9e6..86fe020dbbf 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellsUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellsUIPlugin.java @@ -34,6 +34,33 @@ public class ShellsUIPlugin extends SystemBasePlugin { public static final String ICON_SUFFIX = "Icon"; //$NON-NLS-1$ public static final String ICON_EXT = ".gif"; //$NON-NLS-1$ + // Special Model Object Icons + public static final String ICON_OBJS_DIR = "full/obj16/"; //$NON-NLS-1$ + + public static final String ICON_SYSTEM_SHELL_ROOT = "systemshell"; // not used yet //$NON-NLS-1$ + public static final String ICON_SYSTEM_SHELL_ID = PREFIX + ICON_SYSTEM_SHELL_ROOT + ICON_SUFFIX; + public static final String ICON_SYSTEM_SHELL = ICON_OBJS_DIR + ICON_SYSTEM_SHELL_ROOT + ICON_EXT; + + public static final String ICON_SYSTEM_SHELLLIVE_ROOT = "systemshelllive"; // not used yet //$NON-NLS-1$ + public static final String ICON_SYSTEM_SHELLLIVE_ID = PREFIX + ICON_SYSTEM_SHELLLIVE_ROOT + ICON_SUFFIX; + public static final String ICON_SYSTEM_SHELLLIVE = ICON_OBJS_DIR + ICON_SYSTEM_SHELLLIVE_ROOT + ICON_EXT; + + // THING ICONS... + public static final String ICON_MODEL_DIR = "full/obj16/"; //$NON-NLS-1$ + + public static final String ICON_SYSTEM_ENVVAR_ROOT = "systemenvvar"; //$NON-NLS-1$ + public static final String ICON_SYSTEM_ENVVAR = ICON_MODEL_DIR + ICON_SYSTEM_ENVVAR_ROOT+ICON_EXT; + public static final String ICON_SYSTEM_ENVVAR_ID = PREFIX+ICON_SYSTEM_ENVVAR+ICON_SUFFIX; + + public static final String ICON_SYSTEM_ENVVAR_LIBPATH_ROOT = "systemenvvarlibpath"; //$NON-NLS-1$ + public static final String ICON_SYSTEM_ENVVAR_LIBPATH = ICON_MODEL_DIR + ICON_SYSTEM_ENVVAR_LIBPATH_ROOT+ICON_EXT; + public static final String ICON_SYSTEM_ENVVAR_LIBPATH_ID = PREFIX+ICON_SYSTEM_ENVVAR_LIBPATH+ICON_SUFFIX; + + public static final String ICON_SYSTEM_ENVVAR_PATH_ROOT = "systemenvvarpath"; //$NON-NLS-1$ + public static final String ICON_SYSTEM_ENVVAR_PATH = ICON_MODEL_DIR + ICON_SYSTEM_ENVVAR_PATH_ROOT+ICON_EXT; + public static final String ICON_SYSTEM_ENVVAR_PATH_ID = PREFIX+ICON_SYSTEM_ENVVAR_PATH+ICON_SUFFIX; + + // Action Icons public static final String ICON_ACTIONS_DIR = "full/elcl16/"; //$NON-NLS-1$ @@ -45,6 +72,9 @@ public class ShellsUIPlugin extends SystemBasePlugin { public static final String ICON_SYSTEM_EXPORT_SHELL_HISTORY = ICON_ACTIONS_DIR + ICON_SYSTEM_EXPORT_SHELL_HISTORY_ROOT + ICON_EXT; public static final String ICON_SYSTEM_EXPORT_SHELL_HISTORY_ID = PREFIX + ICON_SYSTEM_EXPORT_SHELL_HISTORY_ROOT + ICON_SUFFIX; + public static final String ICON_SYSTEM_REMOVE_SHELL_ROOT = "removeshell"; //$NON-NLS-1$ + public static final String ICON_SYSTEM_REMOVE_SHELL_ID = PREFIX + ICON_SYSTEM_REMOVE_SHELL_ROOT + ICON_SUFFIX; + public static final String ICON_SYSTEM_REMOVE_SHELL = ICON_ACTIONS_DIR + ICON_SYSTEM_REMOVE_SHELL_ROOT + ICON_EXT; //The shared instance. private static ShellsUIPlugin plugin; @@ -88,11 +118,26 @@ public class ShellsUIPlugin extends SystemBasePlugin { //timer.setStartTime(); String path = getIconPath(); + + // Model Objects and Things + putImageInRegistry(ICON_SYSTEM_SHELL_ID, + path+ICON_SYSTEM_SHELL); + putImageInRegistry(ICON_SYSTEM_SHELLLIVE_ID, + path+ICON_SYSTEM_SHELLLIVE); + putImageInRegistry(ICON_SYSTEM_ENVVAR_ID, + path+ICON_SYSTEM_ENVVAR); + putImageInRegistry(ICON_SYSTEM_ENVVAR_LIBPATH_ID, + path+ICON_SYSTEM_ENVVAR_LIBPATH); + putImageInRegistry(ICON_SYSTEM_ENVVAR_PATH_ID, + path+ICON_SYSTEM_ENVVAR_PATH); + // Actions... putImageInRegistry(ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ID, path+ICON_SYSTEM_EXPORT_SHELL_OUTPUT); putImageInRegistry(ICON_SYSTEM_EXPORT_SHELL_HISTORY_ID, path+ICON_SYSTEM_EXPORT_SHELL_HISTORY); + putImageInRegistry(ICON_SYSTEM_REMOVE_SHELL_ID, + path+ICON_SYSTEM_REMOVE_SHELL); //timer.setEndTime(); //System.out.println("Time to load images: "+timer); diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java index 254c6cf999b..402d5bbdc74 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - Fix 154874 - handle files with space or $ in the name * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.actions; @@ -35,6 +36,7 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.internal.shells.ui.ShellResources; +import org.eclipse.rse.internal.shells.ui.ShellsUIPlugin; import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI; import org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewPart; import org.eclipse.rse.services.clientserver.PathUtility; @@ -361,7 +363,7 @@ public class SystemCommandAction extends SystemBaseAction this( title, tooltip, - isShell ? RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHELL_ID) : RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_RUN_ID), + isShell ? ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELL_ID) : RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_RUN_ID), parent, isShell, cmdSubSystem); diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateRemoveShellAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateRemoveShellAction.java index b504a9eb0bd..8b3176a3d98 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateRemoveShellAction.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateRemoveShellAction.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,17 +11,15 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ - package org.eclipse.rse.internal.shells.ui.actions; import org.eclipse.rse.internal.shells.ui.ShellResources; +import org.eclipse.rse.internal.shells.ui.ShellsUIPlugin; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; -import org.eclipse.rse.ui.ISystemIconConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.swt.widgets.Shell; @@ -32,7 +30,7 @@ public class SystemTerminateRemoveShellAction extends SystemTerminateShellAction { super(ShellResources.ACTION_CANCEL_REMOVE_SHELL_LABEL, ShellResources.ACTION_CANCEL_REMOVE_SHELL_TOOLTIP, - RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_REMOVE_SHELL_ID), + ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_REMOVE_SHELL_ID), parent); } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java index a5247075317..4243443cbe9 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.view; @@ -24,13 +24,13 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.shells.ui.ShellsUIPlugin; import org.eclipse.rse.internal.shells.ui.actions.SystemCommandAction; import org.eclipse.rse.internal.shells.ui.actions.SystemExportShellHistoryAction; import org.eclipse.rse.internal.shells.ui.actions.SystemExportShellOutputAction; import org.eclipse.rse.shells.ui.RemoteCommandHelpers; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; -import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; @@ -119,8 +119,7 @@ public class ShellServiceSubSystemConfigurationAdapter extends SubSystemConfigur { if (_activeShellImageDescriptor == null) { - _activeShellImageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHELLLIVE_ID); - + _activeShellImageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELLLIVE_ID); } return _activeShellImageDescriptor; } @@ -132,7 +131,7 @@ public class ShellServiceSubSystemConfigurationAdapter extends SubSystemConfigur { if (_inactiveShellImageDescriptor == null) { - _inactiveShellImageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHELL_ID); + _inactiveShellImageDescriptor = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELL_ID); } return _inactiveShellImageDescriptor; } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java index 7f6bdb0c11d..80d100d0b10 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - fix 158766: content assist works 1st time only * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.shells.ui.view; @@ -33,6 +34,7 @@ import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformationValidator; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; +import org.eclipse.rse.internal.shells.ui.ShellsUIPlugin; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -320,7 +322,7 @@ public class CommandEntryContentAssistProcessor implements IContentAssistProcess { if (_envImage == null) { - _envImage = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_ENVVAR_ID).createImage(); + _envImage = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_ENVVAR_ID).createImage(); } return _envImage; } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java index 44b207e04e4..d4c00925a01 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.shells.ui.view; @@ -41,6 +42,7 @@ import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; import org.eclipse.rse.internal.files.ui.actions.SystemRemoteFileLineOpenWithMenu; import org.eclipse.rse.internal.shells.ui.ShellResources; +import org.eclipse.rse.internal.shells.ui.ShellsUIPlugin; import org.eclipse.rse.internal.shells.ui.actions.SystemShowInShellViewAction; import org.eclipse.rse.internal.shells.ui.actions.SystemTerminateRemoveShellAction; import org.eclipse.rse.internal.shells.ui.actions.SystemTerminateShellAction; @@ -79,7 +81,6 @@ import org.eclipse.ui.ISharedImages; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.internal.Workbench; import org.eclipse.ui.views.properties.IPropertyDescriptor; @@ -593,7 +594,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter public IStatus run(IProgressMonitor monitor) { - Workbench.getInstance().getDisplay().asyncExec(_gotoLine); + PlatformUI.getWorkbench().getDisplay().asyncExec(_gotoLine); return Status.OK_STATUS; } } @@ -871,11 +872,11 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter } else if (type.equals(ISystemOutputRemoteTypes.TYPE_COMMAND)) { - imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHELL_ID); + imageDescriptor = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELL_ID); } else if (type.equals(ISystemOutputRemoteTypes.TYPE_PROMPT)) { - imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHELL_ID); + imageDescriptor = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELL_ID); } else if (type.equals(ISystemOutputRemoteTypes.TYPE_PROCESS)) { @@ -883,15 +884,15 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter } else if (type.equals(ISystemOutputRemoteTypes.TYPE_ENVVAR)) { - imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_ENVVAR_ID); + imageDescriptor = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_ENVVAR_ID); } else if (type.equals(ISystemOutputRemoteTypes.TYPE_ENVVAR_LIBPATH)) { - imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_ENVVAR_LIBPATH_ID); + imageDescriptor = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_ENVVAR_LIBPATH_ID); } else if (type.equals(ISystemOutputRemoteTypes.TYPE_ENVVAR_PATH)) { - imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_ENVVAR_PATH_ID); + imageDescriptor = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_ENVVAR_PATH_ID); } else { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java index dd715bd96b6..0211aa26c78 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java @@ -101,18 +101,6 @@ public interface ISystemIconConstants public static final String ICON_SYSTEM_FOLDER = ICON_MODEL_DIR + ICON_SYSTEM_FOLDER_ROOT+ICON_EXT; public static final String ICON_SYSTEM_FOLDER_ID = PREFIX+ICON_SYSTEM_FOLDER_ROOT+ICON_SUFFIX; - public static final String ICON_SYSTEM_ENVVAR_ROOT = "systemenvvar"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_ENVVAR = ICON_MODEL_DIR + ICON_SYSTEM_ENVVAR_ROOT+ICON_EXT; - public static final String ICON_SYSTEM_ENVVAR_ID = PREFIX+ICON_SYSTEM_ENVVAR+ICON_SUFFIX; - - public static final String ICON_SYSTEM_ENVVAR_LIBPATH_ROOT = "systemenvvarlibpath"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_ENVVAR_LIBPATH = ICON_MODEL_DIR + ICON_SYSTEM_ENVVAR_LIBPATH_ROOT+ICON_EXT; - public static final String ICON_SYSTEM_ENVVAR_LIBPATH_ID = PREFIX+ICON_SYSTEM_ENVVAR_LIBPATH+ICON_SUFFIX; - - public static final String ICON_SYSTEM_ENVVAR_PATH_ROOT = "systemenvvarpath"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_ENVVAR_PATH = ICON_MODEL_DIR + ICON_SYSTEM_ENVVAR_PATH_ROOT+ICON_EXT; - public static final String ICON_SYSTEM_ENVVAR_PATH_ID = PREFIX+ICON_SYSTEM_ENVVAR_PATH+ICON_SUFFIX; - public static final String ICON_SYSTEM_PROCESS_ROOT = "systemprocess"; //$NON-NLS-1$ public static final String ICON_SYSTEM_PROCESS = ICON_MODEL_DIR + ICON_SYSTEM_PROCESS_ROOT+ICON_EXT; public static final String ICON_SYSTEM_PROCESS_ID = PREFIX+ICON_SYSTEM_PROCESS+ICON_SUFFIX; @@ -249,14 +237,6 @@ public interface ISystemIconConstants public static final String ICON_SYSTEM_WORKWITHCOMPILECMDS = ICON_ACTIONS_DIR + ICON_SYSTEM_WORKWITHCOMPILECMDS_ROOT+ICON_EXT; public static final String ICON_SYSTEM_WORKWITHCOMPILECMDS_ID = PREFIX+ICON_SYSTEM_WORKWITHCOMPILECMDS_ROOT+ICON_SUFFIX; - public static final String ICON_SYSTEM_REMOVE_SHELL_ROOT = "removeshell"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_REMOVE_SHELL_ID = PREFIX + ICON_SYSTEM_REMOVE_SHELL_ROOT + ICON_SUFFIX; - public static final String ICON_SYSTEM_REMOVE_SHELL = ICON_ACTIONS_DIR + ICON_SYSTEM_REMOVE_SHELL_ROOT + ICON_EXT; - - public static final String ICON_SYSTEM_CANCEL_SHELL_ROOT = "cancelshell"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_CANCEL_SHELL_ID = PREFIX + ICON_SYSTEM_CANCEL_SHELL_ROOT + ICON_SUFFIX; - public static final String ICON_SYSTEM_CANCEL_SHELL = ICON_ACTIONS_DIR + ICON_SYSTEM_CANCEL_SHELL_ROOT + ICON_EXT; - public static final String ICON_SYSTEM_EXTRACT_ROOT = "xtrctarchv_tsk"; //$NON-NLS-1$ public static final String ICON_SYSTEM_EXTRACT = ICON_ACTIONS_DIR + ICON_SYSTEM_EXTRACT_ROOT+ICON_EXT; public static final String ICON_SYSTEM_EXTRACT_ID = PREFIX+ICON_SYSTEM_EXTRACT_ROOT+ICON_SUFFIX; @@ -337,14 +317,6 @@ public interface ISystemIconConstants public static final String ICON_SYSTEM_SEARCH_RESULT_ID = PREFIX + ICON_SYSTEM_SEARCH_RESULT_ROOT + ICON_SUFFIX; public static final String ICON_SYSTEM_SEARCH_RESULT = ICON_OBJS_DIR + ICON_SYSTEM_SEARCH_RESULT_ROOT + ICON_EXT; - public static final String ICON_SYSTEM_SHELL_ROOT = "systemshell"; // not used yet //$NON-NLS-1$ - public static final String ICON_SYSTEM_SHELL_ID = PREFIX + ICON_SYSTEM_SHELL_ROOT + ICON_SUFFIX; - public static final String ICON_SYSTEM_SHELL = ICON_OBJS_DIR + ICON_SYSTEM_SHELL_ROOT + ICON_EXT; - - public static final String ICON_SYSTEM_SHELLLIVE_ROOT = "systemshelllive"; // not used yet //$NON-NLS-1$ - public static final String ICON_SYSTEM_SHELLLIVE_ID = PREFIX + ICON_SYSTEM_SHELLLIVE_ROOT + ICON_SUFFIX; - public static final String ICON_SYSTEM_SHELLLIVE = ICON_OBJS_DIR + ICON_SYSTEM_SHELLLIVE_ROOT + ICON_EXT; - public static final String ICON_SYSTEM_PERSPECTIVE_ROOT ="system_persp"; //$NON-NLS-1$ public static final String ICON_SYSTEM_PERSPECTIVE_ID = PREFIX + ICON_SYSTEM_PERSPECTIVE_ROOT + ICON_SUFFIX; public static final String ICON_SYSTEM_PERSPECTIVE = ICON_OBJS_DIR + ICON_SYSTEM_PERSPECTIVE_ROOT + ICON_EXT; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java index f67a19003e0..6025197749f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java @@ -255,12 +255,6 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_ROOTDRIVEOPEN_ID, path+ISystemIconConstants.ICON_SYSTEM_ROOTDRIVEOPEN); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_ENVVAR_ID, - path+ISystemIconConstants.ICON_SYSTEM_ENVVAR); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_ENVVAR_LIBPATH_ID, - path+ISystemIconConstants.ICON_SYSTEM_ENVVAR_LIBPATH); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_ENVVAR_PATH_ID, - path+ISystemIconConstants.ICON_SYSTEM_ENVVAR_PATH); putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID, path+ISystemIconConstants.ICON_SYSTEM_PROCESS); @@ -399,13 +393,6 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_WARNING_ID, path+ISystemIconConstants.ICON_SYSTEM_WARNING); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_SHELL_ID, - path+ISystemIconConstants.ICON_SYSTEM_SHELL); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_SHELLLIVE_ID, - path+ISystemIconConstants.ICON_SYSTEM_SHELLLIVE); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_REMOVE_SHELL_ID, - path+ISystemIconConstants.ICON_SYSTEM_REMOVE_SHELL); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_BLANK_ID, path+ISystemIconConstants.ICON_SYSTEM_BLANK); diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/cancelshell.gif b/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/cancelshell.gif deleted file mode 100644 index 7667d04db83f26f5310023344eabc436b8a3628b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmZ?wbhEHb6krfw*v!CiX!V-on>L@^vh~#V9s8HBymRjSi~IM^?Amqz^5qxz?j1UK z@c;k+3`junCkrD312=;XNDO2K1B*++Nzc`LEy9oP4xg>qr|hA5Y~i~0M86jb=bNRu wD)ersGyQR3c%&LA!f`@np+k&D&B6NyA}gYpZ6cCRKQ*&Y=&jJ{WMHrc0F%c(HUIzs diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/removeshell.gif b/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/removeshell.gif deleted file mode 100644 index 91d5e8af40185797d1d2a991e0da17c8d7f08e9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmZ?wbhEHb6krfwxXQqAaOJAQYt|lJxBmF1%_lZ*Ik|P)#eMs)96oYj`N~79)?7Jp z^6Bk6uO2?QfBDjbt5+@`Ir8B0<(p^EKEHSG?bD~9-o8C_@ZhCOmyRDlzIX55J$v@- z-o1P0&Ye4U?AW|{^QKLkHf-3ie*OA&>(;GVvu5?`)k~Ky{r~?z166_IPZmZ722} diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/cancelshell.gif b/rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/cancelshell.gif deleted file mode 100644 index 355ab40f0e010ce17e59d643dc9701c7f5abf70e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmZ?wbhEHb6krfwIKseiL|gBOj^1Hqt*2T>hmFtw?F*}|1O)a}#kf=a@&d#23am{T`P(J@cgyVO3a zA$QU~|JwCI4I9InHb=E?iEZB&+p#UNduL+Tj+EY=slB_>`}bt@@6MjMH+S+rm$FrE z<*VH)R(n*g@vdGQ)Ue^)qtBP0emQpkQ`DR@D=)s;eC_?-+aL0_Ju2P#xNh&$_CwDn zAAdRb%J z_l@@zzkM=-1vt#Pnwp!;oJ_b`SYXAU*m?QuI diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemshelllive.gif b/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/systemshelllive.gif deleted file mode 100644 index a3f79194a8aa9ec22f14c3fe44e6f30d8000a370..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmZ?wbhEHb6krfwxXQo~ozYU>Ftw?F*}|1O)a}#kf=a@&d#23am{T`P(J@cgyVO3a z;qIfC{bLz-~MN9XO|`!4+4($tvO z)0(w#V#2K6l*ygx+vkR@n-RTyO6=xY5&yw}0WVPe$->CMV9KBaQU&r816%ijSp^;< zle#>VUd~XNHcjiTu