diff options
author | Darin Wright | 2005-04-12 16:37:23 +0000 |
---|---|---|
committer | Darin Wright | 2005-04-12 16:37:23 +0000 |
commit | 4d350a0ec57c84c6357ed7d9efa624282637a4b6 (patch) | |
tree | d884ad7cb28ca74622a34e4042f976ab4c5f1150 /org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal | |
parent | fe2df9a12ab10cfdaaaf4c259bda9a0e04a341ff (diff) | |
download | eclipse.platform.debug-4d350a0ec57c84c6357ed7d9efa624282637a4b6.tar.gz eclipse.platform.debug-4d350a0ec57c84c6357ed7d9efa624282637a4b6.tar.xz eclipse.platform.debug-4d350a0ec57c84c6357ed7d9efa624282637a4b6.zip |
Bug 82530 - DebugPluginImages and ImageRegistry
Diffstat (limited to 'org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal')
-rw-r--r-- | org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java index 3dfd3a86b..d8fd19813 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java @@ -12,8 +12,6 @@ package org.eclipse.ui.externaltools.internal.model; import java.net.MalformedURLException; import java.net.URL; -import java.util.HashMap; -import java.util.Map; import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.CompositeImageDescriptor; @@ -35,11 +33,6 @@ public class ExternalToolsImages { * The registry for composite images */ private static ImageDescriptorRegistry imageDescriptorRegistry; - - /** - * A table of all the <code>ImageDescriptor</code>s. - */ - private static Map imageDescriptors; /* Declare Common paths */ private static URL ICON_BASE_URL= null; @@ -73,7 +66,6 @@ public class ExternalToolsImages { } catch (MalformedURLException me) { } imageRegistry.put(key, desc); - imageDescriptors.put(key, desc); } /** @@ -116,7 +108,6 @@ public class ExternalToolsImages { */ public static ImageRegistry initializeImageRegistry() { imageRegistry= new ImageRegistry(ExternalToolsPlugin.getStandardDisplay()); - imageDescriptors = new HashMap(30); declareImages(); return imageRegistry; } @@ -134,10 +125,7 @@ public class ExternalToolsImages { * or <code>null</code> if it does not exist. */ public static ImageDescriptor getImageDescriptor(String key) { - if (imageDescriptors == null) { - initializeImageRegistry(); - } - return (ImageDescriptor)imageDescriptors.get(key); + return getImageRegistry().getDescriptor(key); } private static URL makeIconFileURL(String iconPath) throws MalformedURLException { |