From 90fe1b916d06ad7311e65e5b50091cf818c9b96e Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 11 May 2007 17:29:16 +0000 Subject: [PATCH] [174945] Remove obsolete icons from rse.shells.ui --- .../META-INF/MANIFEST.MF | 2 +- .../icons/full/cview16/errorlist_view.gif | Bin 604 -> 0 bytes .../icons/full/elcl16/exportshellhistory.gif | Bin .../icons/full/elcl16/exportshelloutput.gif | Bin .../icons/full/eview16/errorlist_view.gif | Bin 604 -> 0 bytes .../icons/full/obj16/exportshellhistory.gif | Bin 592 -> 0 bytes .../icons/full/obj16/exportshelloutput.gif | Bin 613 -> 0 bytes .../icons/full/view16/errorlist_view.gif | Bin 604 -> 0 bytes .../rse/internal/shells/ui/Activator.java | 72 ------------- .../internal/shells/ui/ShellsUIPlugin.java | 101 ++++++++++++++++++ .../SystemExportShellHistoryAction.java | 9 +- .../SystemExportShellOutputAction.java | 11 +- .../eclipse/rse/ui/ISystemIconConstants.java | 9 +- .../UI/org/eclipse/rse/ui/RSEUIPlugin.java | 6 +- .../icons/full/dlcl16/exportshellhistory.gif | Bin 242 -> 0 bytes .../icons/full/dlcl16/exportshelloutput.gif | Bin 377 -> 0 bytes .../icons/full/obj16/exportshellhistory.gif | Bin 592 -> 0 bytes .../icons/full/obj16/exportshelloutput.gif | Bin 613 -> 0 bytes 18 files changed, 112 insertions(+), 98 deletions(-) delete mode 100644 rse/plugins/org.eclipse.rse.shells.ui/icons/full/cview16/errorlist_view.gif rename rse/plugins/{org.eclipse.rse.ui => org.eclipse.rse.shells.ui}/icons/full/elcl16/exportshellhistory.gif (100%) rename rse/plugins/{org.eclipse.rse.ui => org.eclipse.rse.shells.ui}/icons/full/elcl16/exportshelloutput.gif (100%) delete mode 100644 rse/plugins/org.eclipse.rse.shells.ui/icons/full/eview16/errorlist_view.gif delete mode 100644 rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/exportshellhistory.gif delete mode 100644 rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/exportshelloutput.gif delete mode 100644 rse/plugins/org.eclipse.rse.shells.ui/icons/full/view16/errorlist_view.gif delete mode 100644 rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/Activator.java create mode 100644 rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellsUIPlugin.java delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/exportshellhistory.gif delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/exportshelloutput.gif delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/obj16/exportshellhistory.gif delete mode 100644 rse/plugins/org.eclipse.rse.ui/icons/full/obj16/exportshelloutput.gif diff --git a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF index f33b1292f88..70ea58cba46 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.shells.ui;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.rse.internal.shells.ui.Activator +Bundle-Activator: org.eclipse.rse.internal.shells.ui.ShellsUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/cview16/errorlist_view.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/cview16/errorlist_view.gif deleted file mode 100644 index cc87d38aa0a1b26e02c85a621d6ce447e9dbf97c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmZ?wbhEHb6krfwc*ekRP*ifisKkH&p#KTU|H~_`ib-D)lfEOR@ZUfDe{j@C|Iq)T zQ6GcDKZQpAk4^laSNzh{?tg6B|E$8lfB)q*uPf=?bn4QhZ$JM0{`2qWuRlM2{;ulZ z);i}%$D9N2KmTf&w!3TLi3!V3Pg{GjZ_$y7OOMapbZzO*+h?vmxpeFK(>Fh!zx%o7 z;KR+wpY_gI`Rc>Z2d{oSdj0*)r(a*b|9<@D`}6ldKYsiD{ny{0zyHpfIbrVX-UV~J zmoDg>J+uGz&GY*Yt0?n7Kj(jL?*FAr|F2l_9}E}<2T=UU!pOi7#GnIm4k%6-*mpJrH3fNj`gnOb zcXc~A`}q5M`}+t>PMg*n)F0^YKWEBxNtYl2UcY&B{Fns9L`9@rgBS%lI06H=3NlKF z@3jkJ=jL4D&&kccR>a6{3D>;2bGQV|O|RNFvGE58@dfa+s!Okvb7*GeVP@fBH8Xto z&b@gFJA;6Rto$PpJ;zVBCR!OBG8zT#Hj0`a6C^GwwmP?4J$c$-$lT^Cq3BT1FwuG5 e6fu3LeFBCY?EL*f5o-(rnUm1RU=08!bm#>D diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/exportshellhistory.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/elcl16/exportshellhistory.gif similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/exportshellhistory.gif rename to rse/plugins/org.eclipse.rse.shells.ui/icons/full/elcl16/exportshellhistory.gif diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/exportshelloutput.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/elcl16/exportshelloutput.gif similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/icons/full/elcl16/exportshelloutput.gif rename to rse/plugins/org.eclipse.rse.shells.ui/icons/full/elcl16/exportshelloutput.gif diff --git a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/eview16/errorlist_view.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/eview16/errorlist_view.gif deleted file mode 100644 index cc87d38aa0a1b26e02c85a621d6ce447e9dbf97c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmZ?wbhEHb6krfwc*ekRP*ifisKkH&p#KTU|H~_`ib-D)lfEOR@ZUfDe{j@C|Iq)T zQ6GcDKZQpAk4^laSNzh{?tg6B|E$8lfB)q*uPf=?bn4QhZ$JM0{`2qWuRlM2{;ulZ z);i}%$D9N2KmTf&w!3TLi3!V3Pg{GjZ_$y7OOMapbZzO*+h?vmxpeFK(>Fh!zx%o7 z;KR+wpY_gI`Rc>Z2d{oSdj0*)r(a*b|9<@D`}6ldKYsiD{ny{0zyHpfIbrVX-UV~J zmoDg>J+uGz&GY*Yt0?n7Kj(jL?*FAr|F2l_9}E}<2T=UU!pOi7#GnIm4k%6-*mpJrH3fNj`gnOb zcXc~A`}q5M`}+t>PMg*n)F0^YKWEBxNtYl2UcY&B{Fns9L`9@rgBS%lI06H=3NlKF z@3jkJ=jL4D&&kccR>a6{3D>;2bGQV|O|RNFvGE58@dfa+s!Okvb7*GeVP@fBH8Xto z&b@gFJA;6Rto$PpJ;zVBCR!OBG8zT#Hj0`a6C^GwwmP?4J$c$-$lT^Cq3BT1FwuG5 e6fu3LeFBCY?EL*f5o-(rnUm1RU=08!bm#>D diff --git a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/exportshellhistory.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/exportshellhistory.gif deleted file mode 100644 index f4ec50b5d9ed1bf0f8fb3bf15e14bd5c2adf4429..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmZ?wbhEHb6krfwc*el+{rjJmzC{tmi(2{@we&6AapdOXmtR`?7e<#Yh$&x?R5fqa zo@)orKRtfs`L1I(p1uG3;Mx1c>UsOmKizfw=83D%FWi3h_QRL-`Z*i-ojVTVzP$P9 z?SmJe((30tc>X@8d3H|otdr+1KY#P_){CzN?XwEoXWoAKwSVfYcVB+qdinMC%P*x} zGy0~^di&+)yDvXJ{`z0pJN?4P|5bg{o_zoR?(2{G3De$w{qgb3*ZK)lKmPf@e$W1l z%9_SWQ&(==aqaHyIddn@nLA@{xhU-acJS9h~h=RxpI^BB>g|Uw8~2?%4r0H&`RHw0{hXZU*(c9k ze*Wg;truSl+h^W>`SsnGpQT+h-hTP{;oGlwUw$0FaHXnm+Pkkm>L*Nl`}N1iFJJ2? zOkKZce@10ZGF>sc|U#>{PG_X^#o@u6Ir?0E8Z*1(qWIEGO#x8tEP*CWey`k}X8e%PW4#8e0 zPDaOTsVl3i%Ld2AdS1I060fPGrpC)F73{&rDJbA^nqN|pmx1wetox@=QSp2{61*a! z(!p+ALUt7fLF*5+vhuF;XmoG!nAjG%Z;C=g!+{27_GLUX86F*;q!wXh*`)5mFFh!zx%o7 z;KR+wpY_gI`Rc>Z2d{oSdj0*)r(a*b|9<@D`}6ldKYsiD{ny{0zyHpfIbrVX-UV~J zmoDg>J+uGz&GY*Yt0?n7Kj(jL?*FAr|F2l_9}E}<2T=UU!pOi7#GnIm4k%6-*mpJrH3fNj`gnOb zcXc~A`}q5M`}+t>PMg*n)F0^YKWEBxNtYl2UcY&B{Fns9L`9@rgBS%lI06H=3NlKF z@3jkJ=jL4D&&kccR>a6{3D>;2bGQV|O|RNFvGE58@dfa+s!Okvb7*GeVP@fBH8Xto z&b@gFJA;6Rto$PpJ;zVBCR!OBG8zT#Hj0`a6C^GwwmP?4J$c$-$lT^Cq3BT1FwuG5 e6fu3LeFBCY?EL*f5o-(rnUm1RU=08!bm#>D diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/Activator.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/Activator.java deleted file mode 100644 index 3dd9feb54d2..00000000000 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/Activator.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************** - * 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight, Kushal Munir, - * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, - * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. - * - * Contributors: - * Martin Oberhuber (Wind River) - [180519] declaratively register rse.shells.ui. adapter factories - ********************************************************************************/ - -package org.eclipse.rse.internal.shells.ui; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - - -/** - * The main plugin class to be used in the desktop. - */ -public class Activator extends AbstractUIPlugin { - - //The shared instance. - private static Activator plugin; - - /** - * The constructor. - */ - public Activator() { - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception - { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - } - - /** - * Returns the shared instance. - */ - public static Activator getDefault() { - return plugin; - } - - /** - * Returns an image descriptor for the image file at the given - * plug-in relative path. - * - * @param path the path - * @return the image descriptor - */ - public static ImageDescriptor getImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.shells.ui", path); //$NON-NLS-1$ - } -} \ No newline at end of file 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 new file mode 100644 index 00000000000..6bb13eba9e6 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellsUIPlugin.java @@ -0,0 +1,101 @@ +/******************************************************************************** + * 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 + * + * Initial Contributors: + * The following IBM employees contributed to the Remote System Explorer + * component that contains this file: David McKnight, Kushal Munir, + * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, + * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. + * + * Contributors: + * Martin Oberhuber (Wind River) - [180519] declaratively register rse.shells.ui. adapter factories + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui + ********************************************************************************/ + +package org.eclipse.rse.internal.shells.ui; + +import org.eclipse.rse.core.SystemBasePlugin; +import org.osgi.framework.BundleContext; + + +/** + * The main plugin class to be used in the desktop. + */ +public class ShellsUIPlugin extends SystemBasePlugin { + + public static final String PLUGIN_ID ="org.eclipse.rse.shells.ui"; //$NON-NLS-1$ + public static final String HELPPREFIX = "org.eclipse.rse.shells.ui."; //$NON-NLS-1$ + + // Icons + public static final String PREFIX = PLUGIN_ID + "."; //$NON-NLS-1$ + public static final String ICON_SUFFIX = "Icon"; //$NON-NLS-1$ + public static final String ICON_EXT = ".gif"; //$NON-NLS-1$ + + // Action Icons + public static final String ICON_ACTIONS_DIR = "full/elcl16/"; //$NON-NLS-1$ + + public static final String ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ROOT = "exportshelloutput"; //$NON-NLS-1$ + public static final String ICON_SYSTEM_EXPORT_SHELL_OUTPUT = ICON_ACTIONS_DIR + ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ROOT + ICON_EXT; + public static final String ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ID = PREFIX + ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ROOT + ICON_SUFFIX; + + public static final String ICON_SYSTEM_EXPORT_SHELL_HISTORY_ROOT = "exportshellhistory"; //$NON-NLS-1$ + 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; + + + //The shared instance. + private static ShellsUIPlugin plugin; + + /** + * The constructor. + */ + public ShellsUIPlugin() { + plugin = this; + } + + /** + * This method is called upon plug-in activation + */ + public void start(BundleContext context) throws Exception + { + super.start(context); + } + + /** + * This method is called when the plug-in is stopped + */ + public void stop(BundleContext context) throws Exception { + super.stop(context); + plugin = null; + } + + /** + * Returns the shared instance. + */ + public static ShellsUIPlugin getDefault() { + return plugin; + } + + /* (non-Javadoc) + * @see org.eclipse.rse.core.SystemBasePlugin#initializeImageRegistry() + */ + protected void initializeImageRegistry() + { + //SystemElapsedTimer timer = new SystemElapsedTimer(); + //timer.setStartTime(); + + String path = getIconPath(); + // 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); + + //timer.setEndTime(); + //System.out.println("Time to load images: "+timer); + } + +} \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellHistoryAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellHistoryAction.java index e94cca0e1ad..e261f1bc4ac 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellHistoryAction.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellHistoryAction.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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.actions; @@ -19,11 +19,10 @@ package org.eclipse.rse.internal.shells.ui.actions; import java.io.FileWriter; 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.subsystems.files.core.SystemFileResources; 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.SWT; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Shell; @@ -39,7 +38,7 @@ public class SystemExportShellHistoryAction extends SystemBaseShellAction { super(ShellResources.ACTION_EXPORT_SHELL_HISTORY_LABEL, ShellResources.ACTION_EXPORT_SHELL_HISTORY_TOOLTIP, - RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXPORT_SHELL_HISTORY_ID), + ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_EXPORT_SHELL_HISTORY_ID), parent); allowOnMultipleSelection(false); } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellOutputAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellOutputAction.java index 5b6fe025744..b5d22322932 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellOutputAction.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellOutputAction.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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.actions; @@ -20,18 +20,15 @@ import java.io.FileWriter; import org.eclipse.core.runtime.IAdaptable; 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.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; -import org.eclipse.rse.ui.ISystemIconConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Shell; - - /** * @author dmcknigh */ @@ -41,7 +38,7 @@ public class SystemExportShellOutputAction extends SystemBaseShellAction { super(ShellResources.ACTION_EXPORT_SHELL_OUTPUT_LABEL, ShellResources.ACTION_EXPORT_SHELL_OUTPUT_TOOLTIP, - RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ID), + ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ID), parent); allowOnMultipleSelection(false); } 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 915aa4a845d..dd715bd96b6 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 @@ -13,6 +13,7 @@ * Contributors: * Michael Berger (IBM) - 146339 Added refresh action graphic. * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.ui; @@ -284,14 +285,6 @@ public interface ISystemIconConstants public static final String ICON_SYSTEM_SHOW_SHELL = ICON_ACTIONS_DIR + ICON_SYSTEM_SHOW_SHELL_ROOT + ICON_EXT; public static final String ICON_SYSTEM_SHOW_SHELL_ID = PREFIX + ICON_SYSTEM_SHOW_SHELL_ROOT + ICON_SUFFIX; - public static final String ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ROOT = "exportshelloutput"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_EXPORT_SHELL_OUTPUT = ICON_ACTIONS_DIR + ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ROOT + ICON_EXT; - public static final String ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ID = PREFIX + ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ROOT + ICON_SUFFIX; - - public static final String ICON_SYSTEM_EXPORT_SHELL_HISTORY_ROOT = "exportshellhistory"; //$NON-NLS-1$ - 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_REFRESH_ROOT = "refresh_nav"; //$NON-NLS-1$ public static final String ICON_SYSTEM_REFRESH = ICON_ACTIONS_DIR + ICON_SYSTEM_REFRESH_ROOT + ICON_EXT; public static final String ICON_SYSTEM_REFRESH_ID = PREFIX + ICON_SYSTEM_REFRESH_ROOT + ICON_SUFFIX; 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 a471b31497d..f67a19003e0 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 @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [185554] Remove dynamicPopupMenuExtensions extension point + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.ui; @@ -405,11 +406,6 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_REMOVE_SHELL_ID, path+ISystemIconConstants.ICON_SYSTEM_REMOVE_SHELL); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_EXPORT_SHELL_OUTPUT_ID, - path+ISystemIconConstants.ICON_SYSTEM_EXPORT_SHELL_OUTPUT); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_EXPORT_SHELL_HISTORY_ID, - path+ISystemIconConstants.ICON_SYSTEM_EXPORT_SHELL_HISTORY); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_BLANK_ID, path+ISystemIconConstants.ICON_SYSTEM_BLANK); diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/exportshellhistory.gif b/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/exportshellhistory.gif deleted file mode 100644 index 9013ca14005bb5151c6140ba2803ad0f4d6a20ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmV%@5`1$kn z_44!d@9^>V`1$ek^ziic*V);=z`*+8tK#LUaZ-rLo}!NL9g{rvp= z`T6<(|Nj6000000A^8LW0012TEC2ui01yBW000GVU?+}bDQ0M@qGZNFS}a3c)&|iu z0TTs80oy1eh&YbOh(LH+L@>~3WWnrY7>9^%-n3;|%oEaeiJBRmz*#H0l diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/exportshelloutput.gif b/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/exportshelloutput.gif deleted file mode 100644 index b6df7b27c52687e8892e8eb8b7a1f4e3b3356d43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmV-<0fzoZNk%w1VGsZi0M!5h`T6?z`1$wu`1bbq^z`-M;pD2Uu%)M~$jZ*g$<4dH z!MeP_>g@3A?C$94>)_$zvbDOYtFEM`smIC8xx2pN%@5`1$hl^zZQT z@$>Z8+1b9p!1($3_xSkb=H}eo%-r0~-`~;V;??5f*5>Bi>+9q0?&$IH?Dh5X+S$p? z%eK?ezQw|-z`UxwxT&R}l(n#?-rLpj@b0Camcqfo|NsB}{r&v>{QLX+`T6<(|Nj60 z00000A^8LW002DzEC2ui01yBW000J-z@BhOEDCSPq!LNI@jAJvw8OhK2cFL-@Bsxp z1MBcc@Nmu?03fszA2lADyjGjpXUX1ebMg2?GAn|ERyPfY4FWPaHY$#eg$|Ms5Dzjb z2nq%VDTNpq5IQ-FHYld1g%uSL3=A1ECkYD?5+{Wg77#Qwq$MRLzJ*H#G9(ie5iBll XO^hQWEif_6O(NDW(?(57LO}pKcXicg diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/exportshellhistory.gif b/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/exportshellhistory.gif deleted file mode 100644 index f4ec50b5d9ed1bf0f8fb3bf15e14bd5c2adf4429..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmZ?wbhEHb6krfwc*el+{rjJmzC{tmi(2{@we&6AapdOXmtR`?7e<#Yh$&x?R5fqa zo@)orKRtfs`L1I(p1uG3;Mx1c>UsOmKizfw=83D%FWi3h_QRL-`Z*i-ojVTVzP$P9 z?SmJe((30tc>X@8d3H|otdr+1KY#P_){CzN?XwEoXWoAKwSVfYcVB+qdinMC%P*x} zGy0~^di&+)yDvXJ{`z0pJN?4P|5bg{o_zoR?(2{G3De$w{qgb3*ZK)lKmPf@e$W1l z%9_SWQ&(==aqaHyIddn@nLA@{xhU-acJS9h~h=RxpI^BB>g|Uw8~2?%4r0H&`RHw0{hXZU*(c9k ze*Wg;truSl+h^W>`SsnGpQT+h-hTP{;oGlwUw$0FaHXnm+Pkkm>L*Nl`}N1iFJJ2? zOkKZce@10ZGF>sc|U#>{PG_X^#o@u6Ir?0E8Z*1(qWIEGO#x8tEP*CWey`k}X8e%PW4#8e0 zPDaOTsVl3i%Ld2AdS1I060fPGrpC)F73{&rDJbA^nqN|pmx1wetox@=QSp2{61*a! z(!p+ALUt7fLF*5+vhuF;XmoG!nAjG%Z;C=g!+{27_GLUX86F*;q!wXh*`)5mF