Attachment 3023 Details for Bug 29696 – Patch that initializes the image in getImage();

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch that initializes the image in getImage();

29696.patch (text/plain), 1.77 KB, created by Dirk Baeumer

on 2003-01-17 04:09:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Baeumer

Created: 2003-01-17 04:09:06 EST

Size: 1.77 KB

patch

obsolete

>Index: JavaMarkerAnnotation.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaMarkerAnnotation.java,v
>retrieving revision 1.23
>diff -u -r1.23 JavaMarkerAnnotation.java
>--- JavaMarkerAnnotation.java	25 Nov 2002 15:24:12 -0000	1.23
>+++ JavaMarkerAnnotation.java	17 Jan 2003 09:07:59 -0000
>@@ -74,7 +74,6 @@
> 				fPresentation= DebugUITools.newDebugModelPresentation();
> 				
> 			setLayer(4);
>-			setImage(fPresentation.getImage(marker));					
> 			
> 			fType= AnnotationType.UNKNOWN;
> 			
>@@ -104,15 +103,7 @@
> 				JavaPlugin.log(e);
> 			}
> 			
>-			super.initialize();
>-			
>-			if (JavaEditorPreferencePage.indicateQuixFixableProblems() && JavaCorrectionProcessor.hasCorrections(marker)) {
>-				if (!fgImageInitialized) {
>-					fgImage= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_FIXABLE_PROBLEM);
>-					fgImageInitialized= true;
>-				}
>-				setImage(fgImage);
>-			}
>+			super.initialize();			
> 		}
> 	}
> 
>@@ -212,7 +203,24 @@
> 			if (image != null)
> 				return image;
> 		}
>-		return super.getImage(display);
>+		Image result= super.getImage(display);
>+		if (result == null) {
>+			IMarker marker= getMarker();
>+			if (MarkerUtilities.isMarkerType(marker, IBreakpoint.BREAKPOINT_MARKER)) {
>+				result= fPresentation.getImage(marker);
>+				setImage(result);					
>+			} else {
>+				if (JavaEditorPreferencePage.indicateQuixFixableProblems() && JavaCorrectionProcessor.hasCorrections(marker)) {
>+					if (!fgImageInitialized) {
>+						fgImage= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_FIXABLE_PROBLEM);
>+						fgImageInitialized= true;
>+					}
>+					result= fgImage;
>+					setImage(result);
>+				}
>+			}
>+		}
>+		return result;
> 	}
> 	
> 	/*

Actions: View | Diff

Attachments on bug 29696: 3023