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;
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.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;
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;
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;
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();
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);
}
/**
}
- 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<Resource> importSharedOntology2(String fileName) throws Exception {
+ MigratedImportResult result = importSharedOntologyWithResult(fileName);
+ return new ArrayList<Resource>(result.roots);
+ }
+
public static void importSharedOntologyWithUI(ReadGraph graph, final Variable variable) throws DatabaseException {
Display.getDefault().asyncExec(new Runnable() {
}
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<SimanticsClipboard>() {
- @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<String,Variant> 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<Representation> 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<String, Variant> getExportMetadata() {
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();
}
public static File fileDialog(String title, List<Tuple> 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 {
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);
+ }
+ });
+ }
+
}
Code Review / simantics / platform.git / blobdiff