[jbosstools-commits] JBoss Tools SVN: r42494 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-07-10 17:16:59 -0400 (Tue, 10 Jul 2012)
New Revision: 42494

Modified:
   trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java
Log:
JBIDE-12309
https://issues.jboss.org/browse/JBIDE-12309
Images used in AbstractTemporaryAnnotation are registered.

Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java	2012-07-10 20:42:47 UTC (rev 42493)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java	2012-07-10 21:16:59 UTC (rev 42494)
@@ -14,6 +14,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.text.source.Annotation;
@@ -25,11 +28,11 @@
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.internal.WorkbenchImages;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.ui.internal.util.BundleUtility;
 import org.eclipse.ui.texteditor.AnnotationPreference;
 import org.eclipse.ui.texteditor.AnnotationPreferenceLookup;
-import org.eclipse.ui.texteditor.ImageUtilities;
+import org.eclipse.jface.text.source.ImageUtilities;
 
 /**
  * @author Alexey Kazakov
@@ -80,9 +83,15 @@
 	@Override
 	public void paint(GC gc, Canvas canvas, Rectangle bounds) {
 		String path = seveirty==WARNING_LAYER? getWarningIconPath() : getErrorIconPath();
-        URL url = BundleUtility.find(IDEWorkbenchPlugin.IDE_WORKBENCH, path);
-        ImageDescriptor descriptor = ImageDescriptor.createFromURL(url);
-		Image image = descriptor.createImage(false);
+		
+		Image image = CommonValidationPlugin.getDefault().getWorkbench().getSharedImages().getImage(path);
+		if(image == null || image.isDisposed()) {
+	        URL url = FileLocator.find(Platform.getBundle(IDEWorkbenchPlugin.IDE_WORKBENCH), new Path(path), null);
+	        ImageDescriptor descriptor = ImageDescriptor.createFromURL(url);
+	        WorkbenchImages.declareImage(path, descriptor, true);
+			image = CommonValidationPlugin.getDefault().getWorkbench().getSharedImages().getImage(path);
+		}
+        
 		ImageUtilities.drawImage(image, gc, canvas, bounds, SWT.CENTER, SWT.TOP);
 	}