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=511eeb3fa0e41fb0894b866d293cc330812c3923;hp=78125828c58cc6628c572744d9394b56785698c2;hb=2e21c89c81d449bcc2301b3cf3cce4f2cd403a60;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

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 78125828c..511eeb3fa 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -101,6 +101,7 @@ import org.simantics.db.layer0.request.IsLinkedTo;
 import org.simantics.db.layer0.request.PossibleModel;
 import org.simantics.db.layer0.util.ClipboardUtils;
 import org.simantics.db.layer0.util.DraftStatusBean;
+import org.simantics.db.layer0.util.ExternalDownloadBean;
 import org.simantics.db.layer0.util.Layer0Utils;
 import org.simantics.db.layer0.util.ModelTransferableGraphSourceRequest;
 import org.simantics.db.layer0.util.PasteEventHandler;
@@ -182,7 +183,11 @@ public class ModelingUtils {
 	}
 
 	@Deprecated
-	public Resource createSymbol2(String name, Resource type) throws DatabaseException {
+	public Resource createSymbol2(String name, Resource diagramType) throws DatabaseException {
+	    return createSymbol2(name, diagramType, dr.DefinedElement);
+	}
+	@Deprecated
+	public Resource createSymbol2(String name, Resource diagramType, Resource symbolType) throws DatabaseException {
 		G2DResource g2d = G2DResource.getInstance(g);
 
 //		Resource visibleTag = wg.newResource();
@@ -191,7 +196,7 @@ public class ModelingUtils {
 //		wg.claim(focusableTag, b.SubrelationOf, null, dr.IsFocusable);
 
 		Double boxDimension = 6.0;
-		Collection<Statement> grid = g.getAssertedStatements(type, dr.HasGridSize);
+		Collection<Statement> grid = g.getAssertedStatements(diagramType, dr.HasGridSize);
 		if(grid.size() == 1) {
 			Double d = g.getPossibleValue(grid.iterator().next().getObject(), Bindings.DOUBLE);
 			if(d != null) boxDimension = 2*d;
@@ -216,7 +221,7 @@ public class ModelingUtils {
 //		wg.claim(element, visibleTag, element);
 //		wg.claim(element, focusableTag, element);
 
-		Resource orderedSet = OrderedSetUtils.create(wg, type, element);
+		Resource orderedSet = OrderedSetUtils.create(wg, diagramType, element);
 
 //		wg.claim(orderedSet, dr.HasLayer, GraphUtils.create2(wg, dr.Layer,
 //				b.HasName, "Default",
@@ -234,7 +239,7 @@ public class ModelingUtils {
 		AddElement.claimFreshElementName(wg, orderedSet, element);
 		wg.claim(orderedSet, b.ConsistsOf, element);
 
-		wg.claim(result, b.Inherits, null, dr.DefinedElement);
+		wg.claim(result, b.Inherits, null, symbolType);
 		return result;
 	}
 
@@ -399,9 +404,7 @@ public class ModelingUtils {
 
 		Resource project = SimanticsUI.getProject().get();
 
-		try {
-
-			StreamingTransferableGraphFileReader importer = new StreamingTransferableGraphFileReader(new File(fileName));
+		try (StreamingTransferableGraphFileReader importer = new StreamingTransferableGraphFileReader(new File(fileName))) {
 			TransferableGraphSource tg = importer.readTG();
 
 			final DefaultPasteImportAdvisor advisor = new DefaultPasteImportAdvisor(project) {
@@ -1469,7 +1472,7 @@ public class ModelingUtils {
     	
     }
 	
-    public static void exportSharedOntology(IProgressMonitor monitor, RequestProcessor processor, File location, String format, int version, final LibraryInfo info) throws DatabaseException, IOException {
+    public static TransferableGraph1 exportSharedOntology(IProgressMonitor monitor, RequestProcessor processor, File location, String format, int version, final LibraryInfo info) throws DatabaseException, IOException {
     	
     	if(monitor == null) monitor = new NullProgressMonitor();
     	
@@ -1497,14 +1500,26 @@ public class ModelingUtils {
         	
             TransferableGraph1 tg = ClipboardUtils.accept(processor, object, SimanticsKeys.KEY_TRANSFERABLE_GRAPH);
             monitor.worked(95);
+            
+            Variant edb = tg.extensions.get(ExternalDownloadBean.EXTENSION_KEY);
+            if(edb != null) {
+            	metadata.put(ExternalDownloadBean.EXTENSION_KEY, edb);
+            }
 
-            monitor.setTaskName("Writing transferable graph...");
-            DataContainers.writeFile(location, new DataContainer(
-                    format, version,
-                    metadata, new Variant(TransferableGraph1.BINDING, tg)));
-
-            monitor.worked(5);
+            if(location != null) {
+	            monitor.setTaskName("Writing transferable graph...");
+	            DataContainers.writeFile(location, new DataContainer(
+	                    format, version,
+	                    metadata, new Variant(TransferableGraph1.BINDING, tg)));
+	            monitor.worked(5);
+            }
+            
+            return tg;
+            
         }
+        
+        throw new DatabaseException("Failed to export");
+        
     }
 
     public static TreeMap<String, Variant> getExportMetadata() {
@@ -2199,7 +2214,7 @@ public class ModelingUtils {
 
 	}
 
-	public static void exportSharedOntology(ReadGraph graph, Resource library, String fileName, String format, int version) throws DatabaseException {
+	public static TransferableGraph1 exportSharedOntology(ReadGraph graph, Resource library, String fileName, String format, int version) throws DatabaseException {
 		
         Layer0 L0 = Layer0.getInstance(graph);
         String name = graph.getRelatedValue(library, L0.HasName, Bindings.STRING);
@@ -2211,7 +2226,7 @@ public class ModelingUtils {
         LibraryInfo info = new LibraryInfo(name, library, draft);
 		
     	try {
-			exportSharedOntology(new NullProgressMonitor(), graph, new File(fileName), format, version, info);
+			return exportSharedOntology(new NullProgressMonitor(), graph, fileName != null ? new File(fileName) : null, format, version, info);
 		} catch (IOException e) {
 			throw new DatabaseException(e);
 		}
@@ -2247,7 +2262,7 @@ public class ModelingUtils {
 		Layer0 L0 = Layer0.getInstance(graph);
 		while(!todo.isEmpty()) {
 			Resource resource = todo.remove(todo.size()-1);
-            graph.claimLiteral(resource, L0.identifier, L0.GUID, GUID.random(), GUID.BINDING);
+			Layer0Utils.claimNewIdentifier(graph, resource, false);
             if(deep)
             	todo.addAll(graph.getObjects(resource, L0.ConsistsOf));
 		}
@@ -2278,7 +2293,7 @@ public class ModelingUtils {
 				
 				GUID existing = graph.getPossibleRelatedValue(r, L0.identifier, GUID.BINDING);
 				if(existing == null) {
-					graph.addLiteral(r, L0.identifier, L0.identifier_Inverse, L0.GUID, GUID.random(), GUID.BINDING);
+				    Layer0Utils.claimNewIdentifier(graph, r, true);
 					madeChanges = true;
 				}