diff options
-rw-r--r-- | org.eclipse.jface.text/src/org/eclipse/jface/text/source/ISourceViewer.java | 2 | ||||
-rw-r--r-- | org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ISourceViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ISourceViewer.java index d22f2fec694..caa4ce9b66a 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ISourceViewer.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ISourceViewer.java @@ -155,7 +155,7 @@ public interface ISourceViewer extends ITextViewer { * {@link ISourceViewerExtension2#getVisualAnnotationModel()}in order to * get access to the viewer's visual annotation model. * - * @return this viewer's annotation model + * @return this viewer's annotation model, or <code>null</code> if none could be determined */ IAnnotationModel getAnnotationModel(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java index 04dfd8f97cd..ca16934efbb 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java @@ -1788,8 +1788,11 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { } private String findSelectedOverviewRulerAnnotationLabel() { - Point selection= getSourceViewer().getSelectedRange(); IAnnotationModel model= getSourceViewer().getAnnotationModel(); + if (model == null) { + return null; + } + Point selection= getSourceViewer().getSelectedRange(); Annotation annotation= null; Iterator<Annotation> iter= model.getAnnotationIterator(); while (iter.hasNext()) { |