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 2013/06/30 13:19:52 UTC

svn commit: r1498091 - in /uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta: cde/ searchStrategy/

Author: pkluegl
Date: Sun Jun 30 11:19:52 2013
New Revision: 1498091

URL: http://svn.apache.org/r1498091
Log:
no jira 
- relax search strategy deactivation: only if it's not the default "TypeSystem.xml"
- check on correct file ending in cde

Modified:
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/DescriptorFolderSearchStrategy.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/LastLaunchSearchStrategy.java

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java?rev=1498091&r1=1498090&r2=1498091&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java Sun Jun 30 11:19:52 2013
@@ -80,7 +80,7 @@ public class RutaRuleListConstraint impl
       String tsLocation = typeSystemLocation;
       Collection<TypeSystemDescription> tsds = new ArrayList<TypeSystemDescription>();
       tsds.add(basicTypeSystem);
-      if (typeSystemLocation.endsWith(".tm")) {
+      if (typeSystemLocation.endsWith(".ruta")) {
         IFile iFile = RutaAddonsPlugin.getIFile(typeSystemLocation);
         IPath scriptPath = iFile.getLocation();
         IProject project = iFile.getProject();

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java?rev=1498091&r1=1498090&r2=1498091&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java Sun Jun 30 11:19:52 2013
@@ -80,7 +80,7 @@ public class SimpleRutaRuleConstraint im
       String tsLocation = typeSystemLocation;
       Collection<TypeSystemDescription> tsds = new ArrayList<TypeSystemDescription>();
       tsds.add(basicTypeSystem);
-      if (typeSystemLocation.endsWith(".tm")) {
+      if (typeSystemLocation.endsWith(".ruta")) {
         IFile iFile = RutaAddonsPlugin.getIFile(typeSystemLocation);
         IPath scriptPath = iFile.getLocation();
         IProject project = iFile.getProject();

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/DescriptorFolderSearchStrategy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/DescriptorFolderSearchStrategy.java?rev=1498091&r1=1498090&r2=1498091&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/DescriptorFolderSearchStrategy.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/DescriptorFolderSearchStrategy.java Sun Jun 30 11:19:52 2013
@@ -58,7 +58,7 @@ public class DescriptorFolderSearchStrat
     IProject project = casFile.getProject();
 
     IFile typeSystemLocation = TypeSystemLocationPropertyPage.getTypeSystemLocation(project);
-    if(typeSystemLocation != null) {
+    if(typeSystemLocation != null && !typeSystemLocation.getName().equals("TypeSystem.xml")) {
       // do not override the properties!
       return null;
     }

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/LastLaunchSearchStrategy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/LastLaunchSearchStrategy.java?rev=1498091&r1=1498090&r2=1498091&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/LastLaunchSearchStrategy.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/searchStrategy/LastLaunchSearchStrategy.java Sun Jun 30 11:19:52 2013
@@ -39,7 +39,7 @@ public class LastLaunchSearchStrategy im
   public IFile findTypeSystem(IFile casFile) {
     IProject project = casFile.getProject();
     IFile typeSystemLocation = TypeSystemLocationPropertyPage.getTypeSystemLocation(project);
-    if(typeSystemLocation != null) {
+    if(typeSystemLocation != null && !typeSystemLocation.getName().equals("TypeSystem.xml")) {
       // do not override the properties!
       return null;
     }