svn commit: r1840188 - /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java

[pkluegl]

Author: pkluegl
Date: Thu Sep  6 07:41:50 2018
New Revision: 1840188

URL: http://svn.apache.org/viewvc?rev=1840188&view=rev
Log:
UIMA-5785 - applied patch

Modified:
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java?rev=1840188&r1=1840187&r2=1840188&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
 Thu Sep  6 07:41:50 2018
@@ -76,8 +76,7 @@ public class RutaDescriptorBuilder {
 
   private final URL defaultAnalysisEngine;
 
-  public RutaDescriptorBuilder(URL defaultTypeSystem, URL 
defaultAnalysisEngine)
-          throws InvalidXMLException, IOException {
+  public RutaDescriptorBuilder(URL defaultTypeSystem, URL 
defaultAnalysisEngine) {
     super();
     this.defaultTypeSystem = defaultTypeSystem;
     this.defaultAnalysisEngine = defaultAnalysisEngine;
@@ -154,7 +153,7 @@ public class RutaDescriptorBuilder {
                   "Build process can't find " + eachName + " in " + 
desc.getScriptName());
         }
       }
-      TypeSystemDescription each = getTypeSystemDescriptor(url, options, rm);
+      TypeSystemDescription each = getTypeSystemDescriptor(url, rm);
       if (each != null) {
         fillTypeNameMap(typeNameMap, each);
         if (include) {
@@ -204,7 +203,7 @@ public class RutaDescriptorBuilder {
                   + options.getTypeSystemSuffix() + ".xml" + " in " + 
desc.getScriptName());
         }
       }
-      TypeSystemDescription each = getTypeSystemDescriptor(url, options, rm);
+      TypeSystemDescription each = getTypeSystemDescriptor(url, rm);
       if (each != null) {
         fillTypeNameMap(typeNameMap, each);
         import_impl = new Import_impl();
@@ -572,13 +571,10 @@ public class RutaDescriptorBuilder {
             es.toArray(new String[0]));
   }
 
-  private TypeSystemDescription getTypeSystemDescriptor(URL url, 
RutaBuildOptions option,
-          ResourceManager rm) throws InvalidXMLException, IOException {
+  private TypeSystemDescription getTypeSystemDescriptor(URL url, 
ResourceManager rm) throws InvalidXMLException, IOException {
     TypeSystemDescription tsdesc = UIMAFramework.getXMLParser()
             .parseTypeSystemDescription(new XMLInputSource(url));
-    if (option.isResolveImports()) {
-      tsdesc.resolveImports(rm);
-    }
+    tsdesc.resolveImports(rm);
     return tsdesc;
   }