X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FModelingUtils.java;h=81505e0bc89863a8594cc6dc31e8fc874d6229ab;hb=b26efd413afbe72381af527de7cd706f83be1340;hp=78125828c58cc6628c572744d9394b56785698c2;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;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 78125828c..81505e0bc 100644 --- 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; @@ -101,6 +102,7 @@ import org.simantics.db.layer0.request.IsLinkedTo; import org.simantics.db.layer0.request.PossibleModel; import org.simantics.db.layer0.util.ClipboardUtils; import org.simantics.db.layer0.util.DraftStatusBean; +import org.simantics.db.layer0.util.ExternalDownloadBean; import org.simantics.db.layer0.util.Layer0Utils; import org.simantics.db.layer0.util.ModelTransferableGraphSourceRequest; import org.simantics.db.layer0.util.PasteEventHandler; @@ -182,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(); @@ -191,7 +197,7 @@ public class ModelingUtils { // wg.claim(focusableTag, b.SubrelationOf, null, dr.IsFocusable); Double boxDimension = 6.0; - Collection grid = g.getAssertedStatements(type, dr.HasGridSize); + Collection 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; @@ -216,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", @@ -234,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; } @@ -399,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) { @@ -701,7 +705,7 @@ public class ModelingUtils { } public static List 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.>instance()); } public static List searchByType(ReadGraph graph, Resource model, Resource type) throws DatabaseException { @@ -718,7 +722,7 @@ public class ModelingUtils { } public static List 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.>instance()); } public static List searchByQuery(ReadGraph graph, Resource model, String query) throws DatabaseException { @@ -771,7 +775,7 @@ public class ModelingUtils { } public static List 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.>instance()); } /** @@ -1469,7 +1473,7 @@ public class ModelingUtils { } - public static void exportSharedOntology(IProgressMonitor monitor, RequestProcessor processor, File location, String format, int version, final LibraryInfo info) throws DatabaseException, IOException { + 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(); @@ -1497,14 +1501,26 @@ public class ModelingUtils { TransferableGraph1 tg = ClipboardUtils.accept(processor, object, SimanticsKeys.KEY_TRANSFERABLE_GRAPH); monitor.worked(95); + + Variant edb = tg.extensions.get(ExternalDownloadBean.EXTENSION_KEY); + if(edb != null) { + metadata.put(ExternalDownloadBean.EXTENSION_KEY, edb); + } - monitor.setTaskName("Writing transferable graph..."); - DataContainers.writeFile(location, new DataContainer( - format, version, - metadata, new Variant(TransferableGraph1.BINDING, tg))); - - monitor.worked(5); + if(location != null) { + monitor.setTaskName("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"); + } public static TreeMap getExportMetadata() { @@ -1712,6 +1728,21 @@ public class ModelingUtils { Layer0Utils.addCommentMetadata(graph, "Created SCL Module " + name + " " + sclModule.toString()); } + public static void createSCLScriptDefault(WriteGraph graph, Resource target) throws DatabaseException { + String name = NameUtils.findFreshEscapedName(graph, "SCLScript", target); + createSCLScript(graph, target, name); + } + + public static void createSCLScript(WriteGraph graph, Resource target, String name) throws DatabaseException { + graph.markUndoPoint(); + Layer0 L0 = Layer0.getInstance(graph); + Resource sclModule = GraphUtils.create2(graph, L0.SCLScript, + L0.HasName, name, + L0.PartOf, target, + L0.SCLScript_definition, ""); + Layer0Utils.addCommentMetadata(graph, "Created SCL Script " + name + " " + sclModule.toString()); + } + public static void createPGraphDefault(WriteGraph graph, Resource target) throws DatabaseException { String name = NameUtils.findFreshEscapedName(graph, "Ontology Definition File", target); createPGraph(graph, target, name); @@ -2188,18 +2219,24 @@ public class ModelingUtils { } public static void exportModel(ReadGraph graph, Resource model, String fileName, String format, int version) throws DatabaseException { + TransferableGraphConfiguration2 conf = new TransferableGraphConfiguration2(graph, model, true, false); + exportModel(graph, conf, fileName, format, version); + } + public static void exportModel(ReadGraph graph, TransferableGraphConfiguration2 conf, String fileName, String format, int version) throws DatabaseException { + try { - TransferableGraphConfiguration2 conf = new TransferableGraphConfiguration2(graph, model, true, false); TransferableGraphSource s = graph.syncRequest(new ModelTransferableGraphSourceRequest(conf)); TransferableGraphs.writeTransferableGraph(graph, format, version, s, new File(fileName)); + } catch (DatabaseException e) { + throw e; } catch (Exception e) { throw new DatabaseException(e); } } - public static void exportSharedOntology(ReadGraph graph, Resource library, String fileName, String format, int version) throws DatabaseException { + public static TransferableGraph1 exportSharedOntology(ReadGraph graph, Resource library, String fileName, String format, int version) throws DatabaseException { Layer0 L0 = Layer0.getInstance(graph); String name = graph.getRelatedValue(library, L0.HasName, Bindings.STRING); @@ -2211,7 +2248,7 @@ public class ModelingUtils { LibraryInfo info = new LibraryInfo(name, library, draft); try { - exportSharedOntology(new NullProgressMonitor(), graph, new File(fileName), format, version, info); + return exportSharedOntology(new NullProgressMonitor(), graph, fileName != null ? new File(fileName) : null, format, version, info); } catch (IOException e) { throw new DatabaseException(e); } @@ -2247,7 +2284,7 @@ public class ModelingUtils { Layer0 L0 = Layer0.getInstance(graph); while(!todo.isEmpty()) { Resource resource = todo.remove(todo.size()-1); - graph.claimLiteral(resource, L0.identifier, L0.GUID, GUID.random(), GUID.BINDING); + Layer0Utils.claimNewIdentifier(graph, resource, false); if(deep) todo.addAll(graph.getObjects(resource, L0.ConsistsOf)); } @@ -2278,7 +2315,7 @@ public class ModelingUtils { GUID existing = graph.getPossibleRelatedValue(r, L0.identifier, GUID.BINDING); if(existing == null) { - graph.addLiteral(r, L0.identifier, L0.identifier_Inverse, L0.GUID, GUID.random(), GUID.BINDING); + Layer0Utils.claimNewIdentifier(graph, r, true); madeChanges = true; }