Merge branch 'master' into private/eclipse-4.7

[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / ModelingUtils.java

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 385947d0ccfbc4616f1729b95eab02f8a0ea77f0..2afdac9927aea060858b0b30f3a30c3d59ddaf87 100644 (file)
--- 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;
        }
 
@@ -400,9 +405,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) {
@@ -702,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 {
@@ -719,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 {
@@ -772,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());
     }
 
        /**