From 28de4d648c71fcc874b96acd25d4200687b66608 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Fri, 18 Nov 2005 16:06:53 +0000 Subject: [PATCH] Changed the interfaces on the CEditor so that it works for both 3.1.x and 3.2. --- .../src/org/eclipse/cdt/internal/ui/editor/CEditor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index 33d399adbbb..6517ec79c87 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -859,14 +859,15 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS * * @param forward true if search direction is forward, false if backward */ - public void gotoAnnotation(boolean forward) { + public Annotation gotoAnnotation(boolean forward) { + Annotation annotation = null; ITextSelection selection= (ITextSelection) getSelectionProvider().getSelection(); Position position= new Position(0, 0); if (false /* delayed - see bug 18316 */) { getNextAnnotation(selection.getOffset(), selection.getLength(), forward, position); selectAndReveal(position.getOffset(), position.getLength()); } else /* no delay - see bug 18316 */ { - Annotation annotation= getNextAnnotation(selection.getOffset(), selection.getLength(), forward, position); + annotation= getNextAnnotation(selection.getOffset(), selection.getLength(), forward, position); setStatusLineErrorMessage(null); setStatusLineMessage(null); if (annotation != null) { @@ -875,6 +876,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS setStatusLineMessage(annotation.getText()); } } + return annotation; } /** @@ -951,7 +953,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS * otherwise * @since 3.0 */ - private boolean isNavigationTarget(Annotation annotation) { + protected boolean isNavigationTarget(Annotation annotation) { Preferences preferences= EditorsUI.getPluginPreferences(); AnnotationPreference preference= getAnnotationPreferenceLookup().getAnnotationPreference(annotation); // See bug 41689