Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2003-10-27 15:21:14 +0000
committerDani Megert2003-10-27 15:21:14 +0000
commit6c5c25957891a8a8bbf89b830a702ff2663e3f7f (patch)
tree7c6f333afe337f83b5592f49c3ff07cd04a400d4
parent8dc2761938060e84f361021e6c92cd5e65eccd2d (diff)
downloadeclipse.platform.text-6c5c25957891a8a8bbf89b830a702ff2663e3f7f.tar.gz
eclipse.platform.text-6c5c25957891a8a8bbf89b830a702ff2663e3f7f.tar.xz
eclipse.platform.text-6c5c25957891a8a8bbf89b830a702ff2663e3f7f.zip
Bug fixing
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultAnnotation.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultAnnotation.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultAnnotation.java
index 5e2033d9a..e1b8efb75 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultAnnotation.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultAnnotation.java
@@ -239,7 +239,9 @@ public class DefaultAnnotation extends Annotation implements IAnnotationExtensio
if (fImage != null)
return fImage;
- Object descriptor= fgType2Descriptor.get(fAnnotationType);
+ final String key= fAnnotationType + fSeverity;
+
+ Object descriptor= fgType2Descriptor.get(key);
if (descriptor == NO_DESCRIPTOR)
fImage= getImage(fImageName);
else if (descriptor != null)
@@ -255,15 +257,16 @@ public class DefaultAnnotation extends Annotation implements IAnnotationExtensio
*/
public void execute(IProgressMonitor monitor) throws CoreException,InvocationTargetException, InterruptedException {
IMarker tempMarker= ResourcesPlugin.getWorkspace().getRoot().createMarker(fAnnotationType);
+ tempMarker.setAttribute(IMarker.SEVERITY, fSeverity);
if (tempMarker.exists()) {
IWorkbenchAdapter adapter= (IWorkbenchAdapter) tempMarker.getAdapter(IWorkbenchAdapter.class);
if (adapter != null) {
Object imageDescriptor= adapter.getImageDescriptor(tempMarker);
if (imageDescriptor != null) {
fImage= getImage(display, (ImageDescriptor)imageDescriptor);
- fgType2Descriptor.put(fAnnotationType, imageDescriptor);
+ fgType2Descriptor.put(key, imageDescriptor);
} else {
- fgType2Descriptor.put(fAnnotationType, NO_DESCRIPTOR);
+ fgType2Descriptor.put(key, NO_DESCRIPTOR);
}
}
tempMarker.delete();
@@ -273,9 +276,9 @@ public class DefaultAnnotation extends Annotation implements IAnnotationExtensio
try {
r.run(null);
} catch (InvocationTargetException ex) {
- fgType2Descriptor.put(fAnnotationType, NO_DESCRIPTOR);
+ fgType2Descriptor.put(key, NO_DESCRIPTOR);
} catch (InterruptedException ex) {
- fgType2Descriptor.put(fAnnotationType, NO_DESCRIPTOR);
+ fgType2Descriptor.put(key, NO_DESCRIPTOR);
}
if (fImage == null)

Back to the top