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 cc87d38aa0a..00000000000 Binary files a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/cview16/errorlist_view.gif and /dev/null differ 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 cc87d38aa0a..00000000000 Binary files a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/eview16/errorlist_view.gif and /dev/null differ 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 f4ec50b5d9e..00000000000 Binary files a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/exportshellhistory.gif and /dev/null differ diff --git a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/exportshelloutput.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/exportshelloutput.gif deleted file mode 100644 index 0270198bd44..00000000000 Binary files a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/obj16/exportshelloutput.gif and /dev/null differ diff --git a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/view16/errorlist_view.gif b/rse/plugins/org.eclipse.rse.shells.ui/icons/full/view16/errorlist_view.gif deleted file mode 100644 index cc87d38aa0a..00000000000 Binary files a/rse/plugins/org.eclipse.rse.shells.ui/icons/full/view16/errorlist_view.gif and /dev/null differ 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 9013ca14005..00000000000 Binary files a/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/exportshellhistory.gif and /dev/null differ 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 b6df7b27c52..00000000000 Binary files a/rse/plugins/org.eclipse.rse.ui/icons/full/dlcl16/exportshelloutput.gif and /dev/null differ 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 f4ec50b5d9e..00000000000 Binary files a/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/exportshellhistory.gif and /dev/null differ diff --git a/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/exportshelloutput.gif b/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/exportshelloutput.gif deleted file mode 100644 index 0270198bd44..00000000000 Binary files a/rse/plugins/org.eclipse.rse.ui/icons/full/obj16/exportshelloutput.gif and /dev/null differ