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/12/19 17:09:31 UTC
svn commit: r1775136 - in /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching: RutaLaunchConfigurationDelegate.java RutaLauncher.java

Author: pkluegl
Date: Mon Dec 19 17:09:31 2016
New Revision: 1775136

URL: http://svn.apache.org/viewvc?rev=1775136&view=rev
Log:
UIMA-5154
- check descriptor

Modified:
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java?rev=1775136&r1=1775135&r2=1775136&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java Mon Dec 19 17:09:31 2016
@@ -92,9 +92,8 @@ public class RutaLaunchConfigurationDele
     IPath outputDirPath = projectPath.append(RutaProjectUtils.getDefaultOutputLocation());
     Collection<String> classPath = RutaProjectUtils.getClassPath(proj.getProject());
     ClassLoader classLoader = RutaProjectUtils.getClassLoader(classPath);
-    IPath analysisEngineDescriptorPath = RutaProjectUtils
-            .getAnalysisEngineDescriptorPath(member.getLocation(), proj.getProject(), classLoader);
-    String engineDefaultMethod = "";
+    IPath analysisEngineDescriptorPath = RutaProjectUtils.getAnalysisEngineDescriptorPath(member.getLocation(), proj.getProject(), classLoader);
+    String engineDefaultMethod = "null";
     if (analysisEngineDescriptorPath != null) {
       engineDefaultMethod = analysisEngineDescriptorPath.toPortableString();
     }

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java?rev=1775136&r1=1775135&r2=1775136&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java Mon Dec 19 17:09:31 2016
@@ -36,6 +36,7 @@ import java.util.List;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
@@ -107,6 +108,9 @@ public class RutaLauncher {
           throwException("Not enough arguments! Value of descriptor is missing", args, null);
         }
         String desc = args[index++];
+        if(StringUtils.equals(desc, "null")) {
+          throwException("Value for descriptor is missing", args, null);
+        }
         try {
           descriptor = new File(URLDecoder.decode(desc, URL_ENCODING));
         } catch (UnsupportedEncodingException e) {
@@ -154,12 +158,12 @@ public class RutaLauncher {
         }
       }
     }
-    if(inputFolder == null) {
-      throwException("Argument for input folder is missing", args, null);
-    }
     if(descriptor == null) {
       throwException("Argument for descriptor is missing", args, null);
     }
+    if(inputFolder == null) {
+      throwException("Argument for input folder is missing", args, null);
+    }
   }
 
   private static void throwException(String message, String[] args, Exception e) {