[174945] Remove obsolete icons from rse.shells.ui

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);

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);

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);
 	}
     

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;
     }

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;
 	}

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
 			{

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;

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);