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=1edf3cd3121a4e4682e5de0012916fcfd0b74ee5;hp=81505e0bc89863a8594cc6dc31e8fc874d6229ab;hb=9214a600c9401b06057fc2c10ea86a0ce0218d87;hpb=b26efd413afbe72381af527de7cd706f83be1340 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 81505e0bc..1edf3cd31 100644 --- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java +++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java @@ -29,6 +29,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; @@ -61,13 +62,18 @@ import org.simantics.databoard.serialization.SerializationException; import org.simantics.databoard.type.Datatype; import org.simantics.databoard.util.URIStringUtils; import org.simantics.datatypes.literal.GUID; +import org.simantics.db.MetadataI; import org.simantics.db.ReadGraph; import org.simantics.db.RequestProcessor; import org.simantics.db.Resource; +import org.simantics.db.Session; import org.simantics.db.Statement; +import org.simantics.db.VirtualGraph; import org.simantics.db.WriteGraph; +import org.simantics.db.common.Indexing; import org.simantics.db.common.NamedResource; import org.simantics.db.common.QueryMemoryWatcher; +import org.simantics.db.common.changeset.GenericChangeListener; import org.simantics.db.common.primitiverequest.IsInstanceOf; import org.simantics.db.common.procedure.adapter.TransientCacheAsyncListener; import org.simantics.db.common.procedure.adapter.TransientCacheListener; @@ -86,14 +92,17 @@ 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; 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; @@ -117,11 +126,13 @@ import org.simantics.db.layer0.variable.Variables; import org.simantics.db.request.Read; import org.simantics.db.service.ClusterControl; import org.simantics.db.service.CollectionSupport; +import org.simantics.db.service.GraphChangeListenerSupport; import org.simantics.db.service.QueryControl; 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; @@ -139,6 +150,7 @@ import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.modeling.adapters.ChangeInformation; import org.simantics.modeling.template2d.ontology.Template2dResource; +import org.simantics.modeling.utils.OntologicalRequirementTracker; import org.simantics.operation.Layer0X; import org.simantics.project.ontology.ProjectResource; import org.simantics.scenegraph.profile.ProfileUtils; @@ -146,9 +158,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; @@ -403,7 +415,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(); @@ -631,6 +643,46 @@ public class ModelingUtils { } + public static void trackOntologicalRequirements() { + Session session = Simantics.getSession(); + GraphChangeListenerSupport changeListenerSupport = session.getService(GraphChangeListenerSupport.class); + changeListenerSupport.addMetadataListener( OntologicalRequirementListener.getInstance() ); + } + + public static void untrackOntologicalRequirements() { + Session session = Simantics.getSession(); + GraphChangeListenerSupport changeListenerSupport = session.getService(GraphChangeListenerSupport.class); + changeListenerSupport.removeMetadataListener( OntologicalRequirementListener.getInstance() ); + } + + public static class OntologicalRequirementListener extends GenericChangeListener { + + private static OntologicalRequirementListener INSTANCE; + + public static OntologicalRequirementListener getInstance() { + if(INSTANCE == null) { + INSTANCE = new OntologicalRequirementListener(); + } + return INSTANCE; + } + + private OntologicalRequirementListener() { + } + + private OntologicalRequirementTracker changeInformationUpdater = new OntologicalRequirementTracker(); + + @Override + public boolean preEventRequest() { + return !Indexing.isDependenciesIndexingDisabled(); + } + + @Override + public void onEvent(ReadGraph graph, MetadataI metadata, DependencyChanges event) throws DatabaseException { + changeInformationUpdater.update(graph, metadata, event); + } + + } + public static void removeIndex(WriteGraph graph, Resource model) throws DatabaseException { Layer0X L0X = Layer0X.getInstance(graph); IndexedRelations ir = graph.getService(IndexedRelations.class); @@ -704,78 +756,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); } /** @@ -1402,18 +1435,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() { @@ -1474,53 +1516,46 @@ 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(); - + SubMonitor mon = SubMonitor.convert(monitor, "Exporting shared library", 100); + // TODO: figure out a way to make the TG go directly into a file // instead of having it all in memory at once. - monitor.beginTask("Exporting shared library...", 100); - SimanticsClipboard clipboard = processor.syncRequest(new Read() { - @Override - public SimanticsClipboard perform(ReadGraph graph) throws DatabaseException { - CopyHandler ch = graph.adapt(info.library.getResource(), CopyHandler.class); - SimanticsClipboardImpl clipboard = new SimanticsClipboardImpl(); - ch.copyToClipboard(graph, clipboard); - return clipboard; - } + SimanticsClipboard clipboard = processor.syncRequest((ReadGraph graph) -> { + CopyHandler ch = graph.adapt(info.library.getResource(), CopyHandler.class); + SimanticsClipboardImpl result = new SimanticsClipboardImpl(); + ch.copyToClipboard(graph, result, mon.split(5)); + return result; }); - + TreeMap metadata = getExportMetadata(); DraftStatusBean draft = info.draft; if(draft != null) { - metadata.put(DraftStatusBean.EXTENSION_KEY, new Variant(DraftStatusBean.BINDING ,draft)); + metadata.put(DraftStatusBean.EXTENSION_KEY, new Variant(DraftStatusBean.BINDING ,draft)); } - + for (Set object : clipboard.getContents()) { - + mon.subTask("Constructing exported material"); TransferableGraph1 tg = ClipboardUtils.accept(processor, object, SimanticsKeys.KEY_TRANSFERABLE_GRAPH); - monitor.worked(95); - + mon.worked(90); + Variant edb = tg.extensions.get(ExternalDownloadBean.EXTENSION_KEY); if(edb != null) { - metadata.put(ExternalDownloadBean.EXTENSION_KEY, edb); + metadata.put(ExternalDownloadBean.EXTENSION_KEY, edb); } if(location != null) { - monitor.setTaskName("Writing transferable graph..."); + monitor.subTask("Writing transferable graph"); DataContainers.writeFile(location, new DataContainer( format, version, metadata, new Variant(TransferableGraph1.BINDING, tg))); monitor.worked(5); } - + return tg; - } - - throw new DatabaseException("Failed to export"); - + + throw new DatabaseException("Export failed, no contents to export"); } public static TreeMap getExportMetadata() { @@ -1712,28 +1747,36 @@ public class ModelingUtils { } - - public static void createSCLModuleDefault(WriteGraph graph, Resource target) throws DatabaseException { - String name = NameUtils.findFreshEscapedName(graph, "SCLModule", target); - createSCLModule(graph, target, name); + public static Resource createSCLModuleDefault(WriteGraph graph, Resource target) throws DatabaseException { + String name = NameUtils.findFreshEscapedName(graph, "SCLModule", target); + return createSCLModule(graph, target, name); } - public static void createSCLModule(WriteGraph graph, Resource target, String name) throws DatabaseException { + public static Resource createSCLModule(WriteGraph graph, Resource target, String name) throws DatabaseException { graph.markUndoPoint(); - Layer0 L0 = Layer0.getInstance(graph); + Layer0 L0 = Layer0.getInstance(graph); Resource sclModule = GraphUtils.create2(graph, L0.SCLModule, L0.HasName, name, L0.PartOf, target, L0.SCLModule_definition, ""); - Layer0Utils.addCommentMetadata(graph, "Created SCL Module " + name + " " + sclModule.toString()); + Layer0Utils.addCommentMetadata(graph, "Created SCL Module " + name + " " + sclModule.toString()); + return sclModule; } - public static void createSCLScriptDefault(WriteGraph graph, Resource target) throws DatabaseException { + public static Resource setSCLModuleDefinition(WriteGraph graph, Resource module, String definition) throws DatabaseException { + graph.markUndoPoint(); + Layer0 L0 = Layer0.getInstance(graph); + graph.claimLiteral(module, L0.SCLModule_definition, definition, Bindings.STRING); + Layer0Utils.addCommentMetadata(graph, "Set SCL module " + module + " definition."); + return module; + } + + public static Resource createSCLScriptDefault(WriteGraph graph, Resource target) throws DatabaseException { String name = NameUtils.findFreshEscapedName(graph, "SCLScript", target); - createSCLScript(graph, target, name); + return createSCLScript(graph, target, name); } - public static void createSCLScript(WriteGraph graph, Resource target, String name) throws DatabaseException { + public static Resource createSCLScript(WriteGraph graph, Resource target, String name) throws DatabaseException { graph.markUndoPoint(); Layer0 L0 = Layer0.getInstance(graph); Resource sclModule = GraphUtils.create2(graph, L0.SCLScript, @@ -1741,23 +1784,41 @@ public class ModelingUtils { L0.PartOf, target, L0.SCLScript_definition, ""); Layer0Utils.addCommentMetadata(graph, "Created SCL Script " + name + " " + sclModule.toString()); + return sclModule; + } + + public static Resource setSCLScriptDefinition(WriteGraph graph, Resource script, String definition) throws DatabaseException { + graph.markUndoPoint(); + Layer0 L0 = Layer0.getInstance(graph); + graph.claimLiteral(script, L0.SCLScript_definition, definition, Bindings.STRING); + Layer0Utils.addCommentMetadata(graph, "Set SCL script " + script + " definition."); + return script; } - public static void createPGraphDefault(WriteGraph graph, Resource target) throws DatabaseException { - String name = NameUtils.findFreshEscapedName(graph, "Ontology Definition File", target); - createPGraph(graph, target, name); + public static Resource createPGraphDefault(WriteGraph graph, Resource target) throws DatabaseException { + String name = NameUtils.findFreshEscapedName(graph, "Ontology Definition File", target); + return createPGraph(graph, target, name); } - public static void createPGraph(WriteGraph graph, Resource target, String name) throws DatabaseException { + public static Resource createPGraph(WriteGraph graph, Resource target, String name) throws DatabaseException { graph.markUndoPoint(); - Layer0 L0 = Layer0.getInstance(graph); + Layer0 L0 = Layer0.getInstance(graph); Resource file = GraphUtils.create2(graph, L0.PGraph, L0.HasName, name, L0.PartOf, target, L0.PGraph_definition, ""); - Layer0Utils.addCommentMetadata(graph, "Created Ontology Definition File " + name + " " + file.toString()); + Layer0Utils.addCommentMetadata(graph, "Created Ontology Definition File " + name + " " + file.toString()); + return file; } - + + public static Resource setPGraphDefinition(WriteGraph graph, Resource pgraph, String definition) throws DatabaseException { + graph.markUndoPoint(); + Layer0 L0 = Layer0.getInstance(graph); + graph.claimLiteral(pgraph, L0.PGraph_definition, definition, Bindings.STRING); + Layer0Utils.addCommentMetadata(graph, "Set PGraph " + pgraph + " definition."); + return pgraph; + } + public static void publish(WriteGraph graph, Resource target) throws DatabaseException { Layer0 L0 = Layer0.getInstance(graph); graph.claimLiteral(target, L0.Entity_published, true, Bindings.BOOLEAN); @@ -2305,7 +2366,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(); @@ -2334,31 +2395,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 { @@ -2380,5 +2455,20 @@ public class ModelingUtils { return library; } + public static IModelingRules getModelingRules(ReadGraph graph, Resource diagramResource) throws DatabaseException { + return DiagramGraphUtil.getModelingRules(graph, diagramResource, null); + } + public static void markChanged(WriteGraph graph, Resource r) throws DatabaseException { + VirtualGraphSupport support = Simantics.getSession().getService(VirtualGraphSupport.class); + VirtualGraph vg = support.getWorkspacePersistent("changeInformation"); + graph.syncRequest(new WriteRequest(vg) { + @Override + public void perform(WriteGraph graph) throws DatabaseException { + ModelingResources MOD = ModelingResources.getInstance(graph); + graph.claim(r, MOD.changed, MOD.changed, r); + } + }); + } + }