diff options
19 files changed, 34 insertions, 171 deletions
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/backward_nav.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/backward_nav.gif Binary files differdeleted file mode 100644 index 4fb4150103..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/backward_nav.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/bin_obj.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/bin_obj.gif Binary files differdeleted file mode 100644 index ada4bb9f48..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/bin_obj.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/exec_obj.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/exec_obj.gif Binary files differdeleted file mode 100644 index 8174dade2b..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/exec_obj.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/flexperf.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/flexperf.gif Binary files differdeleted file mode 100644 index 80b4c7cdc4..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/flexperf.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/forward_nav.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/forward_nav.gif Binary files differdeleted file mode 100644 index 1d3bafb31a..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/forward_nav.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/function_obj.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/function_obj.gif Binary files differdeleted file mode 100644 index 18103b11fc..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/function_obj.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/info_obj.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/info_obj.gif Binary files differdeleted file mode 100644 index 2da001e3e9..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/info_obj.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/pie.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/pie.gif Binary files differdeleted file mode 100644 index d7d93dbf5d..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/pie.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/sample.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/sample.gif Binary files differdeleted file mode 100644 index 34fb3c9d8c..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/sample.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/st.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/st.gif Binary files differdeleted file mode 100644 index fa6dbeabcb..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/st.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/icons/variable_obj.gif b/profiling/org.eclipse.linuxtools.dataviewers/icons/variable_obj.gif Binary files differdeleted file mode 100644 index 9fa6383efc..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/icons/variable_obj.gif +++ /dev/null diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/abstractviewers/STDataViewersImages.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/abstractviewers/STDataViewersImages.java deleted file mode 100644 index db8b345268..0000000000 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/abstractviewers/STDataViewersImages.java +++ /dev/null @@ -1,150 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 STMicroelectronics. - * 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 - * - * Contributors: - * Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation - *******************************************************************************/ -package org.eclipse.linuxtools.dataviewers.abstractviewers; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashMap; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; - -/* - * This class handle the registration of all images used into org.eclipse.linuxtools.dataviewers - */ -public class STDataViewersImages { - private static ImageRegistry imageRegistry; - - /** - * A table of all the <code>ImageDescriptor</code>s. - */ - private static HashMap<String, ImageDescriptor> imageDescriptors; - - /* Declare Common paths */ - private static URL ICON_BASE_URL = null; - - static { - String pathSuffix = "icons/"; //$NON-NLS-1$ - - STDataViewersActivator activator = STDataViewersActivator.getDefault(); - ICON_BASE_URL = activator.getBundle().getEntry(pathSuffix); - imageRegistry = activator.getImageRegistry(); - if (imageRegistry == null) { - imageRegistry = new ImageRegistry(PlatformUI.getWorkbench().getDisplay()); - } - } - - public static final String IMG_EXPORT = "export.gif"; - public static final String IMG_EDIT_PROPERTIES = "prop_edt.gif"; - - public static final String IMG_EXPANDALL = "expand_all.gif"; - public static final String IMG_COLLAPSEALL = "collapse_all.gif"; - - public static final String IMG_SORT = "sort.gif"; - - /** - * Declare all images - */ - private static void declareImages() { - declareRegistryImage(IMG_EXPORT, "export.gif"); - declareRegistryImage(IMG_EDIT_PROPERTIES, "prop_edt.gif"); - - declareRegistryImage(ISharedImages.IMG_OBJS_INFO_TSK, "info_obj.gif"); - declareRegistryImage(ISharedImages.IMG_TOOL_FORWARD, "forward_nav.gif"); - declareRegistryImage(ISharedImages.IMG_TOOL_BACK, "backward_nav.gif"); - - declareRegistryImage(IMG_EXPANDALL, "expand_all.gif"); - declareRegistryImage(IMG_COLLAPSEALL, "collapse_all.gif"); - - declareRegistryImage(IMG_SORT, "sort.gif"); - } - - /** - * Declare an Image in the registry table. - * - * @param key - * The key to use when registering the image - * @param path - * The path where the image can be found. This path is relative to where this plugin class is found (i.e. - * typically the packages directory) - */ - private static void declareRegistryImage(String key, URL path) { - ImageDescriptor desc = ImageDescriptor.getMissingImageDescriptor(); - desc = ImageDescriptor.createFromURL(path); - imageRegistry.put(key, desc); - imageDescriptors.put(key, desc); - } - - /** - * Declare an Image in the registry table. - * - * @param key - * The key to use when registering the image - * @param path - * The path where the image can be found. This path is relative to where this plugin class is found (i.e. - * typically the packages directory) - */ - private static void declareRegistryImage(String key, String path) { - try { - URL url = makeIconFileURL(path); - declareRegistryImage(key, url); - } catch (MalformedURLException me) { - } - - } - - /** - * Initialize the image registry by declaring all of the required graphics. This involves creating JFace image - * descriptors describing how to create/find the image should it be needed. The image is not actually allocated - * until requested. - * - * Prefix conventions Wizard Banners WIZBAN_ Preference Banners PREF_BAN_ Property Page Banners PROPBAN_ Color - * toolbar CTOOL_ Enable toolbar ETOOL_ Disable toolbar DTOOL_ Local enabled toolbar ELCL_ Local Disable toolbar - * DLCL_ Object large OBJL_ Object small OBJS_ View VIEW_ Product images PROD_ Misc images MISC_ - * - * Where are the images? The images (typically gifs) are found in the same location as this plugin class. This may - * mean the same package directory as the package holding this class. The images are declared using this.getClass() - * to ensure they are looked up via this plugin class. - * - * @return The newly initialized ImageRegistry. - * - * @see org.eclipse.jface.resource.ImageRegistry - */ - public static ImageRegistry initializeImageRegistry() { - imageDescriptors = new HashMap<>(30); - declareImages(); - return imageRegistry; - } - - /** - * Returns the <code>ImageDescriptor</code> identified by the given key, or <code>null</code> if it does not exist. - * - * @param key The name of the image looked. - * @return The ImageDescriptor if found, null otherwise. - */ - public static ImageDescriptor getImageDescriptor(String key) { - if (imageDescriptors == null) { - initializeImageRegistry(); - } - return imageDescriptors.get(key); - } - - private static URL makeIconFileURL(String iconPath) throws MalformedURLException { - if (ICON_BASE_URL == null) { - throw new MalformedURLException(); - } - - return new URL(ICON_BASE_URL, iconPath); - } -} diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java index 19c372f6f0..76f12647b7 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java @@ -11,9 +11,10 @@ package org.eclipse.linuxtools.dataviewers.actions; import org.eclipse.jface.action.Action; +import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer; -import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersImages; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; +import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action collapse all the tree @@ -30,8 +31,9 @@ public class STCollapseAllTreeAction extends Action { * the stViewer to collapse */ public STCollapseAllTreeAction(AbstractSTTreeViewer stViewer) { - super(STDataViewersMessages.collapseAllAction_title, STDataViewersImages - .getImageDescriptor(STDataViewersImages.IMG_COLLAPSEALL)); + super(STDataViewersMessages.collapseAllAction_title, + AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, + "icons/collapse_all.gif")); //$NON-NLS-1$ this.stViewer = stViewer; } diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java index 0c9d2aafef..ce4ce700a1 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java @@ -15,9 +15,10 @@ import java.util.Iterator; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.TreeSelection; +import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer; -import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersImages; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; +import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action collapse the selected items of the tree @@ -34,8 +35,9 @@ public class STCollapseSelectionAction extends Action { * the stViewer to collapse */ public STCollapseSelectionAction(AbstractSTTreeViewer stViewer) { - super(STDataViewersMessages.collapseSelectionAction_title, STDataViewersImages - .getImageDescriptor(STDataViewersImages.IMG_COLLAPSEALL)); + super(STDataViewersMessages.collapseSelectionAction_title, + AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, + "icons/collapse_all.gif")); //$NON-NLS-1$ this.stViewer = stViewer; } diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java index 4dcce1cfb2..6cbd279de4 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java @@ -12,11 +12,12 @@ package org.eclipse.linuxtools.dataviewers.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.window.Window; +import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer; -import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersImages; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersSortDialog; import org.eclipse.swt.custom.BusyIndicator; +import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action allows the user to sort the data in the viewer @@ -33,8 +34,9 @@ public class STDataViewersSortAction extends Action { * @param stViewer The AbstractSTViewer to create the action for. */ public STDataViewersSortAction(AbstractSTViewer stViewer) { - super(STDataViewersMessages.sortAction_title, STDataViewersImages - .getImageDescriptor(STDataViewersImages.IMG_SORT)); + super(STDataViewersMessages.sortAction_title, + AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, + "icons/sort.gif")); //$NON-NLS-1$ super.setToolTipText(STDataViewersMessages.sortAction_tooltip); this.stViewer = stViewer; diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java index e5080118c7..e1bad8dca9 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java @@ -11,9 +11,10 @@ package org.eclipse.linuxtools.dataviewers.actions; import org.eclipse.jface.action.Action; +import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer; -import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersImages; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; +import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action expands all the tree @@ -30,8 +31,9 @@ public class STExpandAllTreeAction extends Action { * the stViewer to expand */ public STExpandAllTreeAction(AbstractSTTreeViewer stViewer) { - super(STDataViewersMessages.expandAllAction_title, STDataViewersImages - .getImageDescriptor(STDataViewersImages.IMG_EXPANDALL)); + super(STDataViewersMessages.expandAllAction_title, + AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, + "icons/expand_all.gif")); //$NON-NLS-1$ this.stViewer = stViewer; } diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java index acee188ced..3499237d19 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java @@ -15,9 +15,10 @@ import java.util.Iterator; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.TreeSelection; +import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer; -import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersImages; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; +import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action expands the selected items of the tree @@ -34,8 +35,9 @@ public class STExpandSelectionAction extends Action { * the stViewer to expand */ public STExpandSelectionAction(AbstractSTTreeViewer stViewer) { - super(STDataViewersMessages.expandSelectionAction_title, STDataViewersImages - .getImageDescriptor(STDataViewersImages.IMG_EXPANDALL)); + super(STDataViewersMessages.expandSelectionAction_title, + AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, + "icons/expand_all.gif")); //$NON-NLS-1$ this.stViewer = stViewer; } diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java index 331ea02cf9..7c69a2926e 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java @@ -16,11 +16,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; import org.eclipse.jface.window.Window; +import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersCSVExporter; -import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersImages; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersExportToCSVDialog; +import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action export the STViewers data to CSV format file @@ -45,8 +46,8 @@ public class STExportToCSVAction extends Action { */ public STExportToCSVAction(AbstractSTViewer stViewer) { super(STDataViewersMessages.exportToCSVAction_title, - STDataViewersImages - .getImageDescriptor(STDataViewersImages.IMG_EXPORT)); + AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, + "icons/export.gif")); //$NON-NLS-1$ this.stViewer = stViewer; this.exporter = new STDataViewersCSVExporter(stViewer); diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java index c62223eb4c..85b7f2101d 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java +++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java @@ -12,10 +12,11 @@ package org.eclipse.linuxtools.dataviewers.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.window.Window; +import org.eclipse.linuxtools.dataviewers.STDataViewersActivator; import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer; -import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersImages; import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages; import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersHideShowColumnsDialog; +import org.eclipse.ui.plugin.AbstractUIPlugin; /** * This action allows the user to hide/show some columns. @@ -30,8 +31,9 @@ public class STHideShowColAction extends Action { * @param stViewer The AbstractSTViewer to create the action for. */ public STHideShowColAction(AbstractSTViewer stViewer) { - super(STDataViewersMessages.hideshowAction_title, STDataViewersImages - .getImageDescriptor(STDataViewersImages.IMG_EDIT_PROPERTIES)); + super(STDataViewersMessages.hideshowAction_title, + AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID, + "icons/prop_edt.gif")); //$NON-NLS-1$ this.stViewer = stViewer; setEnabled(true); } |
