diff options
| author | Dani Megert | 2005-06-01 16:28:00 +0000 |
|---|---|---|
| committer | Dani Megert | 2005-06-01 16:28:00 +0000 |
| commit | 6e13b7aacbca92b01a4da8b791cf1afbbecb1087 (patch) | |
| tree | f992be363c5d72e904b3c7dbaa9f2fc8b0c215be /org.eclipse.ui.editors | |
| parent | e26570201380b21b6c3f69cfff68586314687c85 (diff) | |
| download | eclipse.platform.text-6e13b7aacbca92b01a4da8b791cf1afbbecb1087.tar.gz eclipse.platform.text-6e13b7aacbca92b01a4da8b791cf1afbbecb1087.tar.xz eclipse.platform.text-6e13b7aacbca92b01a4da8b791cf1afbbecb1087.zip | |
Fixed bug 97299: [rulers] Error icon covered by warning icon
Diffstat (limited to 'org.eclipse.ui.editors')
| -rw-r--r-- | org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java index 54c0a28caa7..63ed9d5d7c6 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java @@ -189,15 +189,15 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota * @since 3.0 */ public int getLayer(Annotation annotation) { - AnnotationPreference preference= getAnnotationPreference(annotation); - if (preference != null) - return preference.getPresentationLayer(); - if (annotation instanceof IAnnotationPresentation) { IAnnotationPresentation presentation= (IAnnotationPresentation) annotation; return presentation.getLayer(); } - + + AnnotationPreference preference= getAnnotationPreference(annotation); + if (preference != null) + return preference.getPresentationLayer(); + // backward compatibility, ignore exceptions, just return default layer try { |