Merge pull request #60 from virtualcell/validate

Validate
virtualcell · Apr 8, 2021 · d7f20e5 · d7f20e5
2 parents 273bbad + 380b4ad
commit d7f20e5
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/vcell-core/src/main/java/org/jlibsedml/execution/ArchiveModelResolver.java b/vcell-core/src/main/java/org/jlibsedml/execution/ArchiveModelResolver.java
@@ -1,10 +1,8 @@
 package org.jlibsedml.execution;
 
-import java.io.File;
 import java.net.URI;
 import java.util.List;
 
-import cbit.vcell.resource.OperatingSystemInfo;
 import org.jlibsedml.ArchiveComponents;
 import org.jlibsedml.IModelContent;
 
@@ -14,19 +12,10 @@ public ArchiveModelResolver(ArchiveComponents ac) {
         this.ac=ac;
     }
     public String getModelXMLFor(URI modelURI) {
-        String rc = null;
-        // Considering the import for nested SED-ML document
-        String regExp = null;
+        String rc=null;
         List<IModelContent> children = ac.getModelFiles();
         for (IModelContent imc: children) {
-            if (OperatingSystemInfo.getInstance().isWindows()) {
-                regExp = "\\\\";
-            } else {
-                regExp = "/";
-            }
-            String[] splitURI = modelURI.toString().split(regExp);
-            String filename = splitURI[splitURI.length-1];
-            if(imc.getName().equals(filename)){
+            if(imc.getName().equals(modelURI.toString())){
                 rc= imc.getContents();
             }
         }