Bug 577558: Adapt to moved ImageDescriptorRegistry
Change-Id: Icaa39547fe083440e9538acc5771d84378b2f5a9
diff --git a/r/org.eclipse.statet.r.debug.ui/src/org/eclipse/statet/internal/r/debug/ui/RDebugModelPresentation.java b/r/org.eclipse.statet.r.debug.ui/src/org/eclipse/statet/internal/r/debug/ui/RDebugModelPresentation.java
index 7701f5b..90772b4 100644
--- a/r/org.eclipse.statet.r.debug.ui/src/org/eclipse/statet/internal/r/debug/ui/RDebugModelPresentation.java
+++ b/r/org.eclipse.statet.r.debug.ui/src/org/eclipse/statet/internal/r/debug/ui/RDebugModelPresentation.java
@@ -52,7 +52,7 @@
import org.eclipse.statet.ecommons.debug.core.model.VariableDim;
import org.eclipse.statet.ecommons.debug.ui.ECommonsDebugUIImageDescriptor;
import org.eclipse.statet.ecommons.debug.ui.ECommonsDebugUIResources;
-import org.eclipse.statet.ecommons.ui.util.ImageDescriptorRegistry;
+import org.eclipse.statet.ecommons.ui.jface.resource.ImageDescriptorRegistry;
import org.eclipse.statet.r.core.data.CombinedRElement;
import org.eclipse.statet.r.debug.core.RDebugModel;
diff --git a/r/org.eclipse.statet.r.debug.ui/src/org/eclipse/statet/internal/r/debug/ui/RDebugUIPlugin.java b/r/org.eclipse.statet.r.debug.ui/src/org/eclipse/statet/internal/r/debug/ui/RDebugUIPlugin.java
index 1baf79c..806e8d2 100644
--- a/r/org.eclipse.statet.r.debug.ui/src/org/eclipse/statet/internal/r/debug/ui/RDebugUIPlugin.java
+++ b/r/org.eclipse.statet.r.debug.ui/src/org/eclipse/statet/internal/r/debug/ui/RDebugUIPlugin.java
@@ -27,7 +27,7 @@
import org.eclipse.statet.jcommons.lang.Disposable;
-import org.eclipse.statet.ecommons.ui.util.ImageDescriptorRegistry;
+import org.eclipse.statet.ecommons.ui.jface.resource.ImageDescriptorRegistry;
import org.eclipse.statet.ecommons.ui.util.ImageRegistryUtil;
import org.eclipse.statet.internal.r.debug.ui.breakpoints.BreakpointsHelper;
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/RUIPlugin.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/RUIPlugin.java
index 86d5a2d..88a1ff9 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/RUIPlugin.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/RUIPlugin.java
@@ -49,7 +49,7 @@
import org.eclipse.statet.ecommons.preferences.core.PreferenceAccess;
import org.eclipse.statet.ecommons.text.ui.settings.JFaceTextStyleManager;
import org.eclipse.statet.ecommons.text.ui.settings.PreferenceStoreTextStyleManager;
-import org.eclipse.statet.ecommons.ui.util.ImageDescriptorRegistry;
+import org.eclipse.statet.ecommons.ui.jface.resource.ImageDescriptorRegistry;
import org.eclipse.statet.ecommons.ui.util.ImageRegistryUtil;
import org.eclipse.statet.internal.r.ui.editors.RDocumentProvider;
@@ -319,7 +319,6 @@
throw new IllegalStateException("Plug-in is not started.");
}
this.imageDescriptorRegistry= new ImageDescriptorRegistry();
- registerPluginDisposable(this.imageDescriptorRegistry);
}
return this.imageDescriptorRegistry;
}
