Rename findWord to getWord

The rename is necessary because methods starting with `find` should return an `Option` and later refactorings are built upon this change.
scala-ide · Sep 25, 2014 · 5b373c4 · 5b373c4
1 parent 23fde58
commit 5b373c4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...la-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/IScalaWordFinder.java b/...la-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/IScalaWordFinder.java
@@ -9,5 +9,5 @@
 import org.eclipse.jface.text.IRegion;
 
 public interface IScalaWordFinder {
-  public IRegion findWord(IDocument document, int offset); 
+  public IRegion getWord(IDocument document, int offset);
 }
diff --git a/...dt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/ui/javaeditor/HoversAspect.aj b/...dt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/ui/javaeditor/HoversAspect.aj
@@ -38,7 +38,7 @@ public privileged aspect HoversAspect {
       return proceed(th, textViewer, offset);
 
     IScalaCompilationUnit scu = (IScalaCompilationUnit)codeAssist;
-    return scu.getScalaWordFinder().findWord(textViewer.getDocument(), offset);
+    return scu.getScalaWordFinder().getWord(textViewer.getDocument(), offset);
   }
 
   void around(JavaElementLabelComposer jelc, IJavaElement element, long flags) :

diff --git a/org.scala-ide.sdt.core/src/org/scalaide/util/internal/ScalaWordFinder.scala b/org.scala-ide.sdt.core/src/org/scalaide/util/internal/ScalaWordFinder.scala
@@ -29,6 +29,9 @@ object ScalaWordFinder extends IScalaWordFinder {
     override def length = buf.getLength
   }
 
+  override def getWord(document: IDocument, offset: Int): IRegion =
+    findWord(document, offset)
+
   def findWord(document : IDocument, offset : Int) : IRegion =
     findWord(docToSeq(document), offset)