X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FModelingUtils.java;h=b4e63a6cc5c4188544baeb3eaf7abafcf6f3d6a7;hb=6733bb2f128363c572c1a4fcf907d034060f3aae;hp=3054fcaa531c45fd3285719333062fb4d9a14041;hpb=61033f112b0a2e643bf8530b99bcf90c64464f30;p=simantics%2Fplatform.git

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 3054fcaa5..b4e63a6cc 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -91,6 +91,7 @@ import org.simantics.db.layer0.adapter.CopyHandler;
 import org.simantics.db.layer0.adapter.GenericRelationIndex;
 import org.simantics.db.layer0.adapter.Instances;
 import org.simantics.db.layer0.adapter.impl.DefaultPasteImportAdvisor;
+import org.simantics.db.layer0.adapter.impl.EntityInstances.QueryIndex;
 import org.simantics.db.layer0.adapter.impl.ImportAdvisorFactory;
 import org.simantics.db.layer0.genericrelation.IndexedRelations;
 import org.simantics.db.layer0.migration.MigrationUtils;
@@ -183,7 +184,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();
@@ -192,7 +197,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;
@@ -217,7 +222,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",
@@ -235,7 +240,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;
 	}
 
@@ -700,7 +705,7 @@ public class ModelingUtils {
     }
 
     public static List<Resource> searchByTypeShallow(ReadGraph graph, Resource model, Resource type) throws DatabaseException {
-        return filterByIndexRoot(graph, model, searchByType(graph, model, type));
+        return graph.syncRequest(new QueryIndex(model, type, ""), TransientCacheListener.<List<Resource>>instance());
     }
 
     public static List<Resource> searchByType(ReadGraph graph, Resource model, Resource type) throws DatabaseException {
@@ -717,7 +722,7 @@ public class ModelingUtils {
     }
 
     public static List<Resource> searchByQueryShallow(ReadGraph graph, Resource model, String query) throws DatabaseException {
-        return filterByIndexRoot(graph, model, searchByQuery(graph, model, query));
+        return graph.syncRequest(new QueryIndex(model, Layer0.getInstance(graph).Entity, query), TransientCacheListener.<List<Resource>>instance());
     }
 
     public static List<Resource> searchByQuery(ReadGraph graph, Resource model, String query) throws DatabaseException {
@@ -770,7 +775,7 @@ public class ModelingUtils {
     }
 
     public static List<Resource> searchByTypeAndNameShallow(ReadGraph graph, Resource model, Resource type, String name) throws DatabaseException {
-        return filterByIndexRoot(graph, model, searchByTypeAndName(graph, model, type, name));
+        return graph.syncRequest(new QueryIndex(model, type, name), TransientCacheListener.<List<Resource>>instance());
     }
 
 	/**
@@ -2199,11 +2204,17 @@ public class ModelingUtils {
 	}
 	
 	public static void exportModel(ReadGraph graph, Resource model, String fileName, String format, int version) throws DatabaseException {
+		TransferableGraphConfiguration2 conf = new TransferableGraphConfiguration2(graph, model, true, false);
+		exportModel(graph, conf, fileName, format, version);
+	}
 	
+	public static void exportModel(ReadGraph graph, TransferableGraphConfiguration2 conf, String fileName, String format, int version) throws DatabaseException {
+		
 		try {
-			TransferableGraphConfiguration2 conf = new TransferableGraphConfiguration2(graph, model, true, false);
 	        TransferableGraphSource s = graph.syncRequest(new ModelTransferableGraphSourceRequest(conf));
 			TransferableGraphs.writeTransferableGraph(graph, format, version, s, new File(fileName));
+		} catch (DatabaseException e) {
+			throw e;
 		} catch (Exception e) {
 			throw new DatabaseException(e);
 		}