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;
}
@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();
// wg.claim(focusableTag, b.SubrelationOf, null, dr.IsFocusable);
Double boxDimension = 6.0;
- Collection<Statement> grid = g.getAssertedStatements(type, dr.HasGridSize);
+ Collection<Statement> 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;
// 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",
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;
}
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) {
}
public static List<Resource> 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.<List<Resource>>instance());
}
public static List<Resource> searchByType(ReadGraph graph, Resource model, Resource type) throws DatabaseException {
}
public static List<Resource> 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.<List<Resource>>instance());
}
public static List<Resource> searchByQuery(ReadGraph graph, Resource model, String query) throws DatabaseException {
}
public static List<Resource> 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.<List<Resource>>instance());
}
/**
}
- 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();
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<String, Variant> getExportMetadata() {
}
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);
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);
}
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));
}
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;
}