X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FModelingUtils.java;h=de388b2576d5df5d1883faed042d27ca2ecfefde;hb=a273e6d58281279740b60b07057fe6dd7d6780c3;hp=a43220f0677a0efc3b6c54a3f4b2c39caded4b83;hpb=3edbf85ff8a7f1bd596857a24b1bdebd66943d6b;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 a43220f06..de388b257 100644 --- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java +++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java @@ -90,6 +90,7 @@ 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; @@ -100,6 +101,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; @@ -752,78 +754,59 @@ public class ModelingUtils { return result; } + @Deprecated public static List searchByTypeShallow(ReadGraph graph, Resource model, Resource type) throws DatabaseException { - return graph.syncRequest(new QueryIndex(model, type, ""), TransientCacheListener.>instance()); + return QueryIndexUtils.searchByTypeShallow(graph, model, type); } + @Deprecated public static List 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 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 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 searchByQueryShallow(ReadGraph graph, Resource model, String query) throws DatabaseException { - return graph.syncRequest(new QueryIndex(model, Layer0.getInstance(graph).Entity, query), TransientCacheListener.>instance()); + return QueryIndexUtils.searchByQueryShallow(graph, model, query); } + @Deprecated public static List searchByQuery(ReadGraph graph, Resource model, String query) throws DatabaseException { - Instances instances = graph.adapt(Layer0.getInstance(graph).Entity, Instances.class); - Collection queryResult = instances.find(graph, model, query); - return Layer0Utils.sortByCluster(graph, queryResult); + return QueryIndexUtils.searchByQuery(graph, model, query); } + @Deprecated public static List searchByTypeAndFilter(ReadGraph graph, Resource model, Resource type, Function1 filter) throws DatabaseException { - Instances query = graph.adapt(type, Instances.class); - ArrayList result = new ArrayList(); - 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> getIndexEntries(ReadGraph graph, Resource model, String filter) throws DatabaseException { - Layer0 L0 = Layer0.getInstance(graph); - List entries = searchByQuery(graph, model, filter); - List> listOfTriples = new ArrayList>(); - for (Resource entry : entries) { - Resource type = graph.getPossibleObject(entry, L0.InstanceOf); - String name = NameUtils.getSafeName(graph, entry); - listOfTriples.add(new Triple(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> 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 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 searchByTypeAndName(ReadGraph graph, Resource model, Resource type, String name) throws DatabaseException { - Instances query = graph.adapt(type, Instances.class); - ArrayList result = new ArrayList(); - 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 searchByTypeAndNameShallow(ReadGraph graph, Resource model, Resource type, String name) throws DatabaseException { - return graph.syncRequest(new QueryIndex(model, type, name), TransientCacheListener.>instance()); + return QueryIndexUtils.searchByTypeAndNameShallow(graph, model, type, name); } /** @@ -1450,18 +1433,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 importSharedOntology2(String fileName) throws Exception { + MigratedImportResult result = importSharedOntologyWithResult(fileName); + return new ArrayList(result.roots); + } + public static void importSharedOntologyWithUI(ReadGraph graph, final Variable variable) throws DatabaseException { Display.getDefault().asyncExec(new Runnable() { @@ -2379,7 +2371,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();