Attachment #3023 for bug #29696

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

View | Details | Raw Unified | Return to bug 29696
Collapse All | Expand All




				fPresentation= DebugUITools.newDebugModelPresentation();
				
			setLayer(4);
			setImage(fPresentation.getImage(marker));					
			
			fType= AnnotationType.UNKNOWN;
			

				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);
			}
		}
	}


			if (image != null)
				return image;
		}
		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;
	}
	
	/*

Return to bug 29696

Lines 74-80 Link Here

(-)JavaMarkerAnnotation.java (-11 / +19 lines)
74	fPresentation= DebugUITools.newDebugModelPresentation();	74	fPresentation= DebugUITools.newDebugModelPresentation();
75		75
76	setLayer(4);	76	setLayer(4);
77	setImage(fPresentation.getImage(marker));
78		77
79	fType= AnnotationType.UNKNOWN;	78	fType= AnnotationType.UNKNOWN;
80		79
Lines 104-118 Link Here
104	JavaPlugin.log(e);	103	JavaPlugin.log(e);
105	}	104	}
106		105
107	super.initialize();	106	super.initialize();
108
109	if (JavaEditorPreferencePage.indicateQuixFixableProblems() && JavaCorrectionProcessor.hasCorrections(marker)) {
110	if (!fgImageInitialized) {
111	fgImage= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_FIXABLE_PROBLEM);
112	fgImageInitialized= true;
113	}
114	setImage(fgImage);
115	}
116	}	107	}
117	}	108	}
118		109
Lines 212-218 Link Here
212	if (image != null)	203	if (image != null)
213	return image;	204	return image;
214	}	205	}
215	return super.getImage(display);	206	Image result= super.getImage(display);
		207	if (result == null) {
		208	IMarker marker= getMarker();
		209	if (MarkerUtilities.isMarkerType(marker, IBreakpoint.BREAKPOINT_MARKER)) {
		210	result= fPresentation.getImage(marker);
		211	setImage(result);
		212	} else {
		213	if (JavaEditorPreferencePage.indicateQuixFixableProblems() && JavaCorrectionProcessor.hasCorrections(marker)) {
		214	if (!fgImageInitialized) {
		215	fgImage= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_FIXABLE_PROBLEM);
		216	fgImageInitialized= true;
		217	}
		218	result= fgImage;
		219	setImage(result);
		220	}
		221	}
		222	}
		223	return result;
216	}	224	}
217		225
218	/*	226	/*