You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2016/07/25 13:45:54 UTC
svn commit: r1753997 - in
/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain:
apply/ApplyViewPage.java createdBy/CreatedByViewPage.java
Author: pkluegl
Date: Mon Jul 25 13:45:54 2016
New Revision: 1753997
URL: http://svn.apache.org/viewvc?rev=1753997&view=rev
Log:
UIMA-5029 + UIMA-5027
- avoid method locate
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyViewPage.java
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByViewPage.java
Modified: uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyViewPage.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyViewPage.java?rev=1753997&r1=1753996&r2=1753997&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyViewPage.java (original)
+++ uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyViewPage.java Mon Jul 25 13:45:54 2016
@@ -19,6 +19,7 @@
package org.apache.uima.ruta.explain.apply;
+import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -38,6 +39,7 @@ import org.apache.uima.ruta.explain.Expl
import org.apache.uima.ruta.explain.tree.ExplainTree;
import org.apache.uima.ruta.explain.tree.RuleApplyNode;
import org.apache.uima.ruta.ide.core.builder.RutaProjectUtils;
+import org.apache.uima.ruta.resource.RutaResourceLoader;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -67,6 +69,7 @@ import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.part.Page;
+import org.springframework.core.io.Resource;
public class ApplyViewPage extends Page implements ISelectionListener, ICasEditorInputListener,
IDoubleClickListener, ICasDocumentListener {
@@ -181,11 +184,14 @@ public class ApplyViewPage extends Page
try {
allScriptFolders = RutaProjectUtils.getAllScriptFolders(scriptProject);
List<String> folders = RutaProjectUtils.getFolderLocations(allScriptFolders);
- String locate = RutaEngine.locate(script, folders.toArray(new String[0]),
+ RutaResourceLoader loader = new RutaResourceLoader(folders.toArray(new String[0]));
+ Resource resource = loader.getResourceWithDotNotation(script,
RutaEngine.SCRIPT_FILE_EXTENSION);
- IPath locatedPath = new Path(locate);
- ExplainUtils.openInRutaEditor(locatedPath, id);
- } catch (CoreException e) {
+ if (resource != null && resource.exists()) {
+ IPath locatedPath = new Path(resource.getFile().getAbsolutePath());
+ ExplainUtils.openInRutaEditor(locatedPath, id);
+ }
+ } catch (CoreException | IOException e) {
RutaAddonsPlugin.error(e);
}
}
Modified: uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByViewPage.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByViewPage.java?rev=1753997&r1=1753996&r2=1753997&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByViewPage.java (original)
+++ uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByViewPage.java Mon Jul 25 13:45:54 2016
@@ -19,6 +19,7 @@
package org.apache.uima.ruta.explain.createdBy;
+import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,6 +38,7 @@ import org.apache.uima.ruta.addons.RutaA
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.explain.ExplainUtils;
import org.apache.uima.ruta.ide.core.builder.RutaProjectUtils;
+import org.apache.uima.ruta.resource.RutaResourceLoader;
import org.apache.uima.ruta.visitor.CreatedByVisitor;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
@@ -67,6 +69,7 @@ import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.part.Page;
+import org.springframework.core.io.Resource;
public class CreatedByViewPage extends Page implements ISelectionListener, ICasEditorInputListener,
IDoubleClickListener {
@@ -165,16 +168,17 @@ public class CreatedByViewPage extends P
try {
allScriptFolders = RutaProjectUtils.getAllScriptFolders(scriptProject);
List<String> folders = RutaProjectUtils.getFolderLocations(allScriptFolders);
- String locate = RutaEngine.locate(script, folders.toArray(new String[0]),
+ RutaResourceLoader loader = new RutaResourceLoader(folders.toArray(new String[0]));
+ Resource resource = loader.getResourceWithDotNotation(script,
RutaEngine.SCRIPT_FILE_EXTENSION);
- if (locate != null) {
- IPath locatedPath = new Path(locate);
+ if (resource != null && resource.exists()) {
+ IPath locatedPath = new Path(resource.getFile().getAbsolutePath());
ExplainUtils.openInRutaEditor(locatedPath, id);
} else {
RutaAddonsPlugin.error(new IllegalArgumentException("Not able to locate script: "
+ script));
}
- } catch (CoreException e) {
+ } catch (CoreException | IOException e) {
RutaAddonsPlugin.error(e);
}
}