X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FModelingUtils.java;h=b10ad9da009065604f184ed0c9311799ff08d74d;hb=3c524553c98b56075d854f355bc7bab2e3ae17f7;hp=2053a8fe3e19619eb47bf8e2df2842c24c38aceb;hpb=9ad7e1083f6c05bc19febf7b40bfe41db26c3877;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 2053a8fe3..b10ad9da0 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -90,12 +90,12 @@ import org.simantics.db.common.utils.VersionInfo;
 import org.simantics.db.common.utils.VersionInfoRequest;
 import org.simantics.db.common.utils.Versions;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.QueryIndexUtils;
 import org.simantics.db.layer0.SelectionHints;
 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.DependenciesRelation.DependencyChangesRequest;
 import org.simantics.db.layer0.genericrelation.DependencyChanges;
@@ -157,7 +157,6 @@ import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.structural.stubs.StructuralResource2;
 import org.simantics.structural2.scl.StructuralComponent;
 import org.simantics.structural2.utils.StructuralUtils;
-import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.ObjectUtils;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.Triple;
@@ -412,7 +411,7 @@ public class ModelingUtils {
 
 	public static void importModel(String fileName) {
 
-		Resource project = SimanticsUI.getProject().get();
+		Resource project = Simantics.getProject().get();
 
 		try (StreamingTransferableGraphFileReader importer = new StreamingTransferableGraphFileReader(new File(fileName))) {
 			TransferableGraphSource tg = importer.readTG();
@@ -753,78 +752,59 @@ public class ModelingUtils {
         return result;
     }
 
+    @Deprecated
     public static List<Resource> searchByTypeShallow(ReadGraph graph, Resource model, Resource type) throws DatabaseException {
-        return graph.syncRequest(new QueryIndex(model, type, ""), TransientCacheListener.<List<Resource>>instance());
+        return QueryIndexUtils.searchByTypeShallow(graph, model, type);
     }
 
+    @Deprecated
     public static List<Resource> searchByType(ReadGraph graph, Resource model, Resource type) throws DatabaseException {
-    	Instances query = graph.adapt(type, Instances.class);
-    	return Layer0Utils.sortByCluster(graph, query.find(graph, model));
+        return QueryIndexUtils.searchByType(graph, model, type);
     }
 
+    @Deprecated
     public static List<Resource> searchByGUID(ReadGraph graph, Resource indexRoot, GUID guid) throws DatabaseException {
-    	return searchByGUID(graph, indexRoot, guid.indexString());
+        return QueryIndexUtils.searchByGUID(graph, indexRoot, guid);
     }
     
+    @Deprecated
     public static List<Resource> searchByGUID(ReadGraph graph, Resource indexRoot, String indexString) throws DatabaseException {
-    	return searchByQueryShallow(graph, indexRoot, "GUID:" + indexString);
+        return QueryIndexUtils.searchByGUID(graph, indexRoot, indexString);
     }
 
+    @Deprecated
     public static List<Resource> searchByQueryShallow(ReadGraph graph, Resource model, String query) throws DatabaseException {
-        return graph.syncRequest(new QueryIndex(model, Layer0.getInstance(graph).Entity, query), TransientCacheListener.<List<Resource>>instance());
+        return QueryIndexUtils.searchByQueryShallow(graph, model, query);
     }
 
+    @Deprecated
     public static List<Resource> searchByQuery(ReadGraph graph, Resource model, String query) throws DatabaseException {
-        Instances instances = graph.adapt(Layer0.getInstance(graph).Entity, Instances.class);
-        Collection<Resource> queryResult = instances.find(graph, model, query);
-        return Layer0Utils.sortByCluster(graph, queryResult);
+        return QueryIndexUtils.searchByQuery(graph, model, query);
     }
 
+    @Deprecated
     public static List<Resource> searchByTypeAndFilter(ReadGraph graph, Resource model, Resource type, Function1<Resource,Boolean> filter) throws DatabaseException {
-    	Instances query = graph.adapt(type, Instances.class);
-    	ArrayList<Resource> result =  new ArrayList<Resource>();
-    	for(Resource r : query.find(graph, model)) {
-    		if(filter.apply(r))
-    			result.add(r);
-    	}
-    	return result;
+        return QueryIndexUtils.searchByTypeAndFilter(graph, model, type, filter);
     }
 
+    @Deprecated
     public static List<Triple<Resource, Resource, String>> getIndexEntries(ReadGraph graph, Resource model, String filter) throws DatabaseException {
-    	Layer0 L0 = Layer0.getInstance(graph);
-    	List<Resource> entries = searchByQuery(graph, model, filter);
-    	List<Triple<Resource, Resource, String>> listOfTriples = new ArrayList<Triple<Resource,Resource,String>>();
-    	for (Resource entry : entries) {
-    		Resource type = graph.getPossibleObject(entry, L0.InstanceOf);
-    		String name = NameUtils.getSafeName(graph, entry);
-    		listOfTriples.add(new Triple<Resource, Resource, String>(entry, type, name));
-    	}
-		return listOfTriples;
+        return QueryIndexUtils.getIndexEntries(graph, model, filter);
     }
-    
+
+    @Deprecated
     public static String listIndexEntries(ReadGraph graph, Resource model, String filter) throws DatabaseException {
-    	List<Triple<Resource, Resource, String>> listOfTriples = getIndexEntries(graph, model, filter);
-    	StringBuilder sb = new StringBuilder();
-    	sb.append("== LISTING INDEX ENTRIES OF INDEX: " + NameUtils.getSafeName(graph, model) + ". AMOUNT OF ENTRIES: " + listOfTriples.size() + " ==\n");
-    	for (Triple<Resource, Resource, String> entry : listOfTriples) {
-    		String instanceOf = NameUtils.getSafeName(graph, entry.second);
-    		sb.append("Name: " + entry.third + " instanceOf: " + instanceOf + " Resource: " + entry.first.toString() + "\n");
-    	}
-		return sb.toString();
+        return QueryIndexUtils.listIndexEntries(graph, model, filter);
     }
 
+    @Deprecated
     public static List<Resource> searchByTypeAndName(ReadGraph graph, Resource model, Resource type, String name) throws DatabaseException {
-    	Instances query = graph.adapt(type, Instances.class);
-    	ArrayList<Resource> result =  new ArrayList<Resource>();
-    	for(Resource r : query.findByName(graph, model, name)) {
-    		if(graph.isInstanceOf(r, type))
-    			result.add(r);
-    	}
-    	return result;
+        return QueryIndexUtils.searchByTypeAndName(graph, model, type, name);
     }
 
+    @Deprecated
     public static List<Resource> searchByTypeAndNameShallow(ReadGraph graph, Resource model, Resource type, String name) throws DatabaseException {
-        return graph.syncRequest(new QueryIndex(model, type, name), TransientCacheListener.<List<Resource>>instance());
+        return QueryIndexUtils.searchByTypeAndNameShallow(graph, model, type, name);
     }
 
 	/**
@@ -2389,7 +2369,7 @@ public class ModelingUtils {
 			
 	        monitor.setTaskName("Creating missing GUID identifiers " + NameUtils.getSafeName(graph, root));
 			Resource indexRoot = graph.syncRequest(new PossibleIndexRoot(root));
-			for(Resource r : searchByType(graph, indexRoot, L0.Entity)) {
+			for(Resource r : searchByTypeShallow(graph, indexRoot, L0.Entity)) {
 
 				memory.maintain();