Bug 577558: [Ltk-Buildpaths] Adapt to shared ImageDescriptorRegistry
Change-Id: Icaa39547fe083440e9538acc5771d84378b2f5a9
diff --git a/ltk/org.eclipse.statet.ltk.buildpath.ui/src/org/eclipse/statet/internal/ltk/buildpath/ui/BuildpathsUIPlugin.java b/ltk/org.eclipse.statet.ltk.buildpath.ui/src/org/eclipse/statet/internal/ltk/buildpath/ui/BuildpathsUIPlugin.java
index 74eb328..8a6eb1d 100644
--- a/ltk/org.eclipse.statet.ltk.buildpath.ui/src/org/eclipse/statet/internal/ltk/buildpath/ui/BuildpathsUIPlugin.java
+++ b/ltk/org.eclipse.statet.ltk.buildpath.ui/src/org/eclipse/statet/internal/ltk/buildpath/ui/BuildpathsUIPlugin.java
@@ -21,7 +21,6 @@
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.statet.ecommons.ui.util.ImageDescriptorRegistry;
import org.eclipse.statet.ecommons.ui.util.ImageRegistryUtil;
import org.eclipse.statet.ltk.buildpath.ui.BuildpathsUIResources;
@@ -57,8 +56,6 @@
private boolean started;
- private ImageDescriptorRegistry imageDescriptorRegistry;
-
@Override
public void start(final BundleContext context) throws Exception {
@@ -77,10 +74,6 @@
this.started= false;
}
- if (this.imageDescriptorRegistry != null) {
- this.imageDescriptorRegistry.dispose();
- this.imageDescriptorRegistry= null;
- }
}
finally {
instance= null;
@@ -114,13 +107,4 @@
ImageRegistryUtil.T_OVR, "ignore_optional_problems.png" ); //$NON-NLS-1$
}
- public ImageDescriptorRegistry getImageDescriptorRegistry() {
- checkStarted();
-
- if (this.imageDescriptorRegistry == null) {
- this.imageDescriptorRegistry= new ImageDescriptorRegistry();
- }
- return this.imageDescriptorRegistry;
- }
-
}
diff --git a/ltk/org.eclipse.statet.ltk.buildpath.ui/src/org/eclipse/statet/ltk/buildpath/ui/BuildpathListLabelProvider.java b/ltk/org.eclipse.statet.ltk.buildpath.ui/src/org/eclipse/statet/ltk/buildpath/ui/BuildpathListLabelProvider.java
index 2d66869..9dcb3f3 100644
--- a/ltk/org.eclipse.statet.ltk.buildpath.ui/src/org/eclipse/statet/ltk/buildpath/ui/BuildpathListLabelProvider.java
+++ b/ltk/org.eclipse.statet.ltk.buildpath.ui/src/org/eclipse/statet/ltk/buildpath/ui/BuildpathListLabelProvider.java
@@ -26,11 +26,11 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
-import org.eclipse.statet.ecommons.ui.util.ImageDescriptorRegistry;
+import org.eclipse.statet.ecommons.ui.SharedUIResources;
+import org.eclipse.statet.ecommons.ui.jface.resource.ImageDescriptorRegistry;
import org.eclipse.statet.ecommons.ui.util.MessageUtils;
import org.eclipse.statet.internal.ltk.buildpath.ui.BuildpathElementImageDescriptor;
-import org.eclipse.statet.internal.ltk.buildpath.ui.BuildpathsUIPlugin;
import org.eclipse.statet.internal.ltk.buildpath.ui.Messages;
import org.eclipse.statet.ltk.buildpath.core.BuildpathAttribute;
import org.eclipse.statet.ltk.buildpath.core.BuildpathElement;
@@ -43,14 +43,14 @@
private final BuildpathsUIResources uiResources;
private final ISharedImages workbenchImages;
- private final ImageDescriptorRegistry registry;
+ private final ImageDescriptorRegistry imageDescriptorRegistry;
public BuildpathListLabelProvider() {
this.uiResources= BuildpathsUIResources.INSTANCE;
this.workbenchImages= PlatformUI.getWorkbench().getSharedImages();
- this.registry= BuildpathsUIPlugin.getInstance().getImageDescriptorRegistry();
+ this.imageDescriptorRegistry= SharedUIResources.getInstance().getImageDescriptorRegistry();
}
@@ -64,7 +64,7 @@
imageDescriptor= new BuildpathElementImageDescriptor(imageDescriptor,
BuildpathElementImageDescriptor.ERROR );
}
- return this.registry.get(imageDescriptor);
+ return this.imageDescriptorRegistry.get(imageDescriptor);
}
}
else if (element instanceof BuildpathListElementAttribute) {
