X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FModelingUtils.java;h=2053a8fe3e19619eb47bf8e2df2842c24c38aceb;hp=e0551eb3e76df1a7193d6e0f4ffcbd85b0715173;hb=9ad7e1083f6c05bc19febf7b40bfe41db26c3877;hpb=1ace215e82ee630279b6db4984c1f8c7a48e9a8b

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
index e0551eb3e..2053a8fe3 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -100,6 +100,7 @@ import org.simantics.db.layer0.adapter.impl.ImportAdvisorFactory;
 import org.simantics.db.layer0.genericrelation.DependenciesRelation.DependencyChangesRequest;
 import org.simantics.db.layer0.genericrelation.DependencyChanges;
 import org.simantics.db.layer0.genericrelation.IndexedRelations;
+import org.simantics.db.layer0.migration.MigratedImportResult;
 import org.simantics.db.layer0.migration.MigrationUtils;
 import org.simantics.db.layer0.request.ActivateModel;
 import org.simantics.db.layer0.request.ActiveModels;
@@ -1450,18 +1451,27 @@ public class ModelingUtils {
     	
     }
     
-    public static void importSharedOntology(String fileName) throws Exception {
+    public static MigratedImportResult importSharedOntologyWithResult(String fileName) throws Exception {
     	try {
     		DataContainer dc = DataContainers.readFile(new File(fileName));
     		TransferableGraph1 tg = (TransferableGraph1)dc.content.getValue(TransferableGraph1.BINDING);
         	Variant draftStatus = dc.metadata.get(DraftStatusBean.EXTENSION_KEY);
-	    	MigrationUtils.importSharedOntology(Simantics.getSession(), tg, draftStatus == null);
+	    	return MigrationUtils.importSharedOntology(Simantics.getSession(), tg, draftStatus == null);
     	} catch (Exception e) {
     		Logger.defaultLogError(e);
     		throw e;
     	}
     }
     
+    public static void importSharedOntology(String fileName) throws Exception {
+    	importSharedOntologyWithResult(fileName);
+    }
+
+    public static List<Resource> importSharedOntology2(String fileName) throws Exception {
+    	MigratedImportResult result = importSharedOntologyWithResult(fileName);
+    	return new ArrayList<Resource>(result.roots);
+    }
+    
     public static void importSharedOntologyWithUI(ReadGraph graph, final Variable variable) throws DatabaseException {
     	
     	Display.getDefault().asyncExec(new Runnable() {
@@ -1760,28 +1770,36 @@ public class ModelingUtils {
     	
     }
 
-    
-    public static void createSCLModuleDefault(WriteGraph graph, Resource target) throws DatabaseException {
-    	String name = NameUtils.findFreshEscapedName(graph, "SCLModule", target);
-    	createSCLModule(graph, target, name);
+    public static Resource createSCLModuleDefault(WriteGraph graph, Resource target) throws DatabaseException {
+        String name = NameUtils.findFreshEscapedName(graph, "SCLModule", target);
+        return createSCLModule(graph, target, name);
     }
 
-    public static void createSCLModule(WriteGraph graph, Resource target, String name) throws DatabaseException {
+    public static Resource createSCLModule(WriteGraph graph, Resource target, String name) throws DatabaseException {
         graph.markUndoPoint();
-    	Layer0 L0 = Layer0.getInstance(graph);
+        Layer0 L0 = Layer0.getInstance(graph);
         Resource sclModule = GraphUtils.create2(graph, L0.SCLModule,
                 L0.HasName, name,
                 L0.PartOf, target,
                 L0.SCLModule_definition, "");
-    	Layer0Utils.addCommentMetadata(graph, "Created SCL Module " + name + " " + sclModule.toString());
+        Layer0Utils.addCommentMetadata(graph, "Created SCL Module " + name + " " + sclModule.toString());
+        return sclModule;
+    }
+
+    public static Resource setSCLModuleDefinition(WriteGraph graph, Resource module, String definition) throws DatabaseException {
+        graph.markUndoPoint();
+        Layer0 L0 = Layer0.getInstance(graph);
+        graph.claimLiteral(module, L0.SCLModule_definition, definition, Bindings.STRING);
+        Layer0Utils.addCommentMetadata(graph, "Set SCL module " + module + " definition.");
+        return module;
     }
 
-    public static void createSCLScriptDefault(WriteGraph graph, Resource target) throws DatabaseException {
+    public static Resource createSCLScriptDefault(WriteGraph graph, Resource target) throws DatabaseException {
         String name = NameUtils.findFreshEscapedName(graph, "SCLScript", target);
-        createSCLScript(graph, target, name);
+        return createSCLScript(graph, target, name);
     }
 
-    public static void createSCLScript(WriteGraph graph, Resource target, String name) throws DatabaseException {
+    public static Resource createSCLScript(WriteGraph graph, Resource target, String name) throws DatabaseException {
         graph.markUndoPoint();
         Layer0 L0 = Layer0.getInstance(graph);
         Resource sclModule = GraphUtils.create2(graph, L0.SCLScript,
@@ -1789,23 +1807,41 @@ public class ModelingUtils {
                 L0.PartOf, target,
                 L0.SCLScript_definition, "");
         Layer0Utils.addCommentMetadata(graph, "Created SCL Script " + name + " " + sclModule.toString());
+        return sclModule;
     }
 
-    public static void createPGraphDefault(WriteGraph graph, Resource target) throws DatabaseException {
-    	String name = NameUtils.findFreshEscapedName(graph, "Ontology Definition File", target);
-    	createPGraph(graph, target, name);
+    public static Resource setSCLScriptDefinition(WriteGraph graph, Resource script, String definition) throws DatabaseException {
+        graph.markUndoPoint();
+        Layer0 L0 = Layer0.getInstance(graph);
+        graph.claimLiteral(script, L0.SCLScript_definition, definition, Bindings.STRING);
+        Layer0Utils.addCommentMetadata(graph, "Set SCL script " + script + " definition.");
+        return script;
+    }
+
+    public static Resource createPGraphDefault(WriteGraph graph, Resource target) throws DatabaseException {
+        String name = NameUtils.findFreshEscapedName(graph, "Ontology Definition File", target);
+        return createPGraph(graph, target, name);
     }
 
-    public static void createPGraph(WriteGraph graph, Resource target, String name) throws DatabaseException {
+    public static Resource createPGraph(WriteGraph graph, Resource target, String name) throws DatabaseException {
         graph.markUndoPoint();
-    	Layer0 L0 = Layer0.getInstance(graph);
+        Layer0 L0 = Layer0.getInstance(graph);
         Resource file = GraphUtils.create2(graph, L0.PGraph,
                 L0.HasName, name,
                 L0.PartOf, target,
                 L0.PGraph_definition, "");
-    	Layer0Utils.addCommentMetadata(graph, "Created Ontology Definition File " + name + " " + file.toString());
+        Layer0Utils.addCommentMetadata(graph, "Created Ontology Definition File " + name + " " + file.toString());
+        return file;
     }
-    
+
+    public static Resource setPGraphDefinition(WriteGraph graph, Resource pgraph, String definition) throws DatabaseException {
+        graph.markUndoPoint();
+        Layer0 L0 = Layer0.getInstance(graph);
+        graph.claimLiteral(pgraph, L0.PGraph_definition, definition, Bindings.STRING);
+        Layer0Utils.addCommentMetadata(graph, "Set PGraph " + pgraph + " definition.");
+        return pgraph;
+    }
+
     public static void publish(WriteGraph graph, Resource target) throws DatabaseException {
     	Layer0 L0 = Layer0.getInstance(graph);
     	graph.claimLiteral(target, L0.Entity_published, true, Bindings.BOOLEAN);