1 files changed, 24 insertions, 16 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ModelLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ModelLoader.xtend
index 5fc2cdc5..95f14bc1 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ModelLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ModelLoader.xtend
@@ -2,23 +2,31 @@ package hu.bme.mit.inf.dslreasoner.application.execution
 

 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl

 import org.eclipse.emf.common.util.URI

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PartialModelSpecification

 

 class ModelLoader {

-        def loadModel(String path, Context context) {

-                var URI uri 

-                try {

-                        uri = URI::createURI(path)

-                } catch(IllegalArgumentException e) {

-                        context.writeError('''Malformed uri: "«uri»"!''')

-                        return null

-                }

-                

-                val resourceSet = new ResourceSetImpl

-                val resource = resourceSet.getResource(uri,true)

-                if(resource === null) {

-                        

+        

+        def loadModel(PartialModelSpecification specification, ScriptExecutor scriptExecutor) {

+                val entries = specification.entry

+                if (entries.size == 1) {

+                        var URI uri

+                        try {

+                                uri = URI::createURI(

+                                        scriptExecutor.getFileSpecification(specification.entry.head.path).path

+                                )

+                        } catch (IllegalArgumentException e) {

+                                return null

+                        }

+

+                        val resourceSet = new ResourceSetImpl

+                        val resource = resourceSet.getResource(uri, true)

+                        if (resource === null) {

+                        } else {

+                                return resource.allContents.toList

+                        }

                 } else {

-                        return resource

+                        throw new UnsupportedOperationException('''Currently single partial models are supported''')

                 }

-        }       

-}
\ No newline at end of file
+

+        }

+}