svn commit: r1868766 - in /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui: DefaultRutaSemanticHighlightingExtension.java editor/RutaEditor.java text/ExternalTypeHyperlinkDetector.java text/RutaCorrectionProcessor.java

[vm...@apache.org]

Author: vmorari
Date: Tue Oct 22 15:56:40 2019
New Revision: 1868766

URL: http://svn.apache.org/viewvc?rev=1868766&view=rev
Log:
UIMA-5431: fixed bug by updating the deprecated implementation of dependencies.

Modified:
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java?rev=1868766&r1=1868765&r2=1868766&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java Tue Oct 22 15:56:40 2019
@@ -30,6 +30,7 @@ import org.eclipse.dltk.ast.declarations
 import org.eclipse.dltk.ast.declarations.MethodDeclaration;
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.ast.declarations.TypeDeclaration;
+import org.eclipse.dltk.compiler.env.IModuleSource;
 import org.eclipse.dltk.compiler.env.ISourceModule;
 import org.eclipse.dltk.core.SourceParserUtil;
 import org.eclipse.dltk.ui.editor.highlighting.HighlightedPosition;
@@ -102,7 +103,7 @@ public class DefaultRutaSemanticHighligh
     return highlightings;
   }
 
-  public void doOtherHighlighting(ISourceModule code,
+  public void doOtherHighlighting(IModuleSource code,
           final ISemanticHighlightingRequestor semanticHighlightingRequestor) {
     ModuleDeclaration moduleDeclaration = SourceParserUtil
             .getModuleDeclaration((org.eclipse.dltk.core.ISourceModule) (code.getModelElement()));

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java?rev=1868766&r1=1868765&r2=1868766&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java Tue Oct 22 15:56:40 2019
@@ -40,7 +40,7 @@ import org.apache.uima.ruta.ide.ui.text.
 import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
 import org.eclipse.dltk.ast.ASTNode;
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
-import org.eclipse.dltk.compiler.env.ISourceModule;
+import org.eclipse.dltk.compiler.env.IModuleSource;
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
 import org.eclipse.dltk.core.IModelElement;
 import org.eclipse.dltk.core.ISourceRange;
@@ -389,7 +389,7 @@ public class RutaEditor extends ScriptEd
     }
 
     RutaSelectionParser parser = new RutaSelectionParser();
-    ISourceModule unit = (ISourceModule) getInputModelElement();
+    IModuleSource unit = (IModuleSource) getInputModelElement();
     ModuleDeclaration parsed = parser.parse(unit);
     RutaRuleIdVisitor visitor = new RutaRuleIdVisitor(id);
     try {

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java?rev=1868766&r1=1868765&r2=1868766&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java Tue Oct 22 15:56:40 2019
@@ -46,7 +46,7 @@ import org.eclipse.core.resources.IFolde
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.dltk.ast.ASTNode;
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
-import org.eclipse.dltk.compiler.env.ISourceModule;
+import org.eclipse.dltk.compiler.env.IModuleSource;
 import org.eclipse.dltk.core.IModelElement;
 import org.eclipse.dltk.internal.ui.editor.EditorUtility;
 import org.eclipse.dltk.internal.ui.editor.ScriptEditor;
@@ -83,12 +83,11 @@ public class ExternalTypeHyperlinkDetect
       IRegion wordRegion = ScriptWordFinder.findWord(document, offset);
       if (wordRegion == null)
         return null;
-      if (input instanceof ISourceModule) {
-        ISourceModule sm = (ISourceModule) input;
+      if (input instanceof IModuleSource) {
+        IModuleSource sm = (IModuleSource) input;
         IModelElement modelElement = sm.getModelElement();
         RutaSelectionParser parser = new RutaSelectionParser();
         ModuleDeclaration moduleDeclaration = parser.parse(sm);
-        String word = document.get(wordRegion.getOffset(), wordRegion.getLength());
         RutaReferenceVisitor referenceVisitor = new RutaReferenceVisitor(wordRegion.getOffset());
         moduleDeclaration.traverse(referenceVisitor);
         ASTNode node = referenceVisitor.getResult();

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java?rev=1868766&r1=1868765&r2=1868766&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java Tue Oct 22 15:56:40 2019
@@ -37,6 +37,7 @@ import org.eclipse.dltk.core.DLTKCore;
 import org.eclipse.dltk.core.DLTKLanguageManager;
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
 import org.eclipse.dltk.core.IModelElement;
+import org.eclipse.dltk.core.IModelMarker;
 import org.eclipse.dltk.core.IScriptModelMarker;
 import org.eclipse.dltk.core.IScriptProject;
 import org.eclipse.dltk.internal.ui.editor.ScriptEditor;
@@ -120,7 +121,7 @@ public class RutaCorrectionProcessor imp
   }
 
   public static boolean isFixable(IMarker marker) {
-    if (marker.getAttribute(IScriptModelMarker.ID, 0) == RutaProblems.UNKNOWN_REQUIRED_PACKAGE) {
+    if (marker.getAttribute(IModelMarker.ID, 0) == RutaProblems.UNKNOWN_REQUIRED_PACKAGE) {
       final String[] args = CorrectionEngine.getProblemArguments(marker);
       if (args != null && args.length != 0 && args[0] != null) {
         IResource resource = marker.getResource();