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=ea960c1d0de2fe97dfae468331b0521f69219ccd;hp=2053a8fe3e19619eb47bf8e2df2842c24c38aceb;hb=refs%2Fchanges%2F27%2F2827%2F2;hpb=9ad7e1083f6c05bc19febf7b40bfe41db26c3877 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..ea960c1d0 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; @@ -130,6 +130,7 @@ import org.simantics.db.service.VirtualGraphSupport; import org.simantics.diagram.stubs.DiagramResource; import org.simantics.diagram.stubs.G2DResource; import org.simantics.diagram.synchronization.graph.AddElement; +import org.simantics.diagram.synchronization.graph.DiagramGraphUtil; import org.simantics.graph.db.IImportAdvisor2; import org.simantics.graph.db.ImportAdvisors; import org.simantics.graph.db.MissingDependencyException; @@ -155,9 +156,9 @@ import org.simantics.scl.runtime.function.Function1; import org.simantics.scl.runtime.tuple.Tuple; import org.simantics.simulation.ontology.SimulationResource; import org.simantics.structural.stubs.StructuralResource2; +import org.simantics.structural2.modelingRules.IModelingRules; 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 +413,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 +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); } /** @@ -1534,7 +1516,7 @@ public class ModelingUtils { 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(); - + final IProgressMonitor finalMonitor = monitor; // TODO: figure out a way to make the TG go directly into a file // instead of having it all in memory at once. @@ -1544,7 +1526,7 @@ public class ModelingUtils { public SimanticsClipboard perform(ReadGraph graph) throws DatabaseException { CopyHandler ch = graph.adapt(info.library.getResource(), CopyHandler.class); SimanticsClipboardImpl clipboard = new SimanticsClipboardImpl(); - ch.copyToClipboard(graph, clipboard); + ch.copyToClipboard(graph, clipboard, finalMonitor); return clipboard; } }); @@ -2389,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(); @@ -2418,31 +2400,45 @@ public class ModelingUtils { } public static File fileDialog(String title, List namesAndExtensions) { - - Display display = Display.getCurrent(); - Shell shell = display.getActiveShell(); - - FileDialog dialog = new FileDialog(shell, SWT.OPEN); - dialog.setText(title); - - String[] extensions = new String[namesAndExtensions.size()]; - String[] filterNames = new String[namesAndExtensions.size()]; - int index = 0; - for(Tuple t : namesAndExtensions) { - String filterName = (String)t.get(0); - String extension = (String)t.get(1); - filterNames[index] = filterName; - extensions[index] = extension; - index++; - } - - dialog.setFilterExtensions(extensions); - dialog.setFilterNames(filterNames); - final String fileName = dialog.open(); - if (fileName == null) return null; - - return new File(fileName); + return new Runnable() { + private File result; + + File getFile() { + Display.getDefault().syncExec(this); + return result; + } + + @Override + public void run() { + result = showDialog(); + } + private File showDialog() { + Display display = Display.getCurrent(); + Shell shell = display.getActiveShell(); + + FileDialog dialog = new FileDialog(shell, SWT.OPEN); + dialog.setText(title); + + String[] extensions = new String[namesAndExtensions.size()]; + String[] filterNames = new String[namesAndExtensions.size()]; + int index = 0; + for(Tuple t : namesAndExtensions) { + String filterName = (String)t.get(0); + String extension = (String)t.get(1); + filterNames[index] = filterName; + extensions[index] = extension; + index++; + } + + dialog.setFilterExtensions(extensions); + dialog.setFilterNames(filterNames); + final String fileName = dialog.open(); + if (fileName == null) return null; + + return new File(fileName); + } + }.getFile(); } public static Resource createLibrary(WriteGraph graph, Resource parent) throws DatabaseException { @@ -2464,5 +2460,8 @@ public class ModelingUtils { return library; } + public static IModelingRules getModelingRules(ReadGraph graph, Resource diagramResource) throws DatabaseException { + return DiagramGraphUtil.getModelingRules(graph, diagramResource, null); + } }