From b1f6ab3171cbb013773e3f2853b1e940f99a57a4 Mon Sep 17 00:00:00 2001 From: Simon Schaefer Date: Sat, 11 Oct 2014 11:51:38 +0200 Subject: [PATCH] Remove last calls to `JavaUI.getDocumentProvider` With the introduction of `ScalaDocumentProvider`, this method no longer returns the correct document provider. --- .../src/org/scalaide/util/eclipse/EditorUtils.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/EditorUtils.scala b/org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/EditorUtils.scala index b96357ddd0..de66e7e16e 100644 --- a/org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/EditorUtils.scala +++ b/org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/EditorUtils.scala @@ -25,6 +25,7 @@ import org.eclipse.ui.PlatformUI import org.eclipse.ui.part.FileEditorInput import org.eclipse.ui.texteditor.ITextEditor import org.scalaide.core.compiler.InteractiveCompilationUnit +import org.scalaide.core.internal.ScalaPlugin import org.scalaide.core.internal.jdt.model.ScalaSourceFile import org.scalaide.ui.editor.ISourceViewerEditor import org.scalaide.ui.editor.InteractiveCompilationUnitEditor @@ -59,7 +60,8 @@ object EditorUtils { */ def getAnnotationsAtOffset(part: org.eclipse.ui.IEditorPart, offset: Int): Iterator[(Annotation, Position)] = { import scala.collection.JavaConverters._ - val model = JavaUI.getDocumentProvider.getAnnotationModel(part.getEditorInput) + + val model = ScalaPlugin().documentProvider.getAnnotationModel(part.getEditorInput) val annotations = model match { case null => Iterator.empty @@ -247,7 +249,7 @@ object EditorUtils { val page = window.getActivePage() val part = Option(page.findEditor(new FileEditorInput(file))).getOrElse(EditorUtility.openInEditor(file, true)) page.bringToTop(part) - JavaUI.getDocumentProvider().getDocument(part.getEditorInput()); + ScalaPlugin().documentProvider.getDocument(part.getEditorInput) } } }