X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Futil%2FConsistsOfProcess.java;h=4124add429dd76d4ae2756a6b3e0404e0d214f01;hp=a2e64868f7c21d43c1456c4662810c20f6ca4ed6;hb=refs%2Fchanges%2F02%2F1402%2F2;hpb=dbe0a77f0869111219b69d412d0bb90d17c391c1

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ConsistsOfProcess.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ConsistsOfProcess.java
index a2e64868f..4124add42 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ConsistsOfProcess.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ConsistsOfProcess.java
@@ -14,6 +14,8 @@ import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.common.utils.Logger;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.SubgraphExtent.ExtentStatus;
+import org.simantics.db.layer0.util.TransferableGraphConfiguration2.SeedSpec;
+import org.simantics.db.layer0.util.TransferableGraphConfiguration2.SeedSpec.SeedSpecType;
 import org.simantics.db.procedure.AsyncContextMultiProcedure;
 import org.simantics.db.procedure.Procedure;
 import org.simantics.db.service.DirectQuerySupport;
@@ -22,39 +24,53 @@ import org.simantics.utils.datastructures.Pair;
 
 class ConsistsOfProcess {
 
-	final List<InternalEntry> result;
+	final List<ConsistsOfProcessEntry> result;
 	final Set<Resource> childrenWithNoName;
-	final AsyncContextMultiProcedure<InternalEntry, Resource> structure;
-	final AsyncContextMultiProcedure<InternalEntry, Resource> names;
+	final AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource> structure;
+	final AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource> names;
 
-	public static Pair<List<InternalEntry>,Set<Resource>> walk(ReadGraph graph, ResourceMap<ExtentStatus> status, Collection<Resource> resources, Set<Resource> exclusions, boolean ignoreVirtual) throws DatabaseException {
-    	ConsistsOfProcess process = new ConsistsOfProcess(graph, status, resources, exclusions, ignoreVirtual);
+	public static Pair<List<ConsistsOfProcessEntry>,Set<Resource>> walk(ReadGraph graph, Collection<SeedSpec> specs, boolean ignoreVirtual) throws DatabaseException {
+		return walk(graph, null, specs, ignoreVirtual);
+	}
+
+	public static Pair<List<ConsistsOfProcessEntry>,Set<Resource>> walk(ReadGraph graph, ResourceMap<ExtentStatus> status, Collection<SeedSpec> specs, boolean ignoreVirtual) throws DatabaseException {
+		
+		Collection<ConsistsOfProcessEntry> entries = new ArrayList<>();
+		for(SeedSpec r : specs) {
+			if(SeedSpecType.INTERNAL.equals(r.specType))
+			    entries.add(new ConsistsOfProcessEntry(null, r.resource, true));
+			else
+				entries.add(new ConsistsOfProcessEntry(null, r.resource, false));
+		}
+    	ConsistsOfProcess process = new ConsistsOfProcess(graph, status, entries, ignoreVirtual);
     	return Pair.make(process.result, process.childrenWithNoName);
+    	
     }
     
-    static class InternalEntry {
-    	public InternalEntry parent;
+    static class ConsistsOfProcessEntry {
+    	public ConsistsOfProcessEntry parent;
     	public Resource resource;
-    	public String name;
+    	public boolean internal;
     	public boolean valid = true;
-    	InternalEntry(InternalEntry parent, Resource resource, String name) {
+    	public String name = null;
+    	ConsistsOfProcessEntry(ConsistsOfProcessEntry parent, Resource resource, boolean internal) {
     		this.parent = parent;
     		this.resource = resource;
-    		this.name = name;
+    		this.internal = internal;
     	}
     }
 	
-    private ConsistsOfProcess(ReadGraph graph, ResourceMap<ExtentStatus> status, final Collection<Resource> resources, final Set<Resource> exclusions, final boolean ignoreVirtual) throws DatabaseException {
+    private ConsistsOfProcess(ReadGraph graph, ResourceMap<ExtentStatus> status, final Collection<ConsistsOfProcessEntry> entries, final boolean ignoreVirtual) throws DatabaseException {
 
 		final Layer0 L0 = Layer0.getInstance(graph);
 		final DirectQuerySupport dqs = graph.getService(DirectQuerySupport.class);
 		
-		result = new ArrayList<InternalEntry>();
+		result = new ArrayList<>();
 		childrenWithNoName = new HashSet<>();
-		names = dqs.compileForEachObject(graph, L0.HasName, new AsyncContextMultiProcedure<InternalEntry, Resource>() {
+		names = dqs.compileForEachObject(graph, L0.HasName, new AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource>() {
 
 			@Override
-			public void execute(AsyncReadGraph graph, InternalEntry entry, Resource nameResource) {
+			public void execute(AsyncReadGraph graph, ConsistsOfProcessEntry entry, Resource nameResource) {
 		
 				if(status != null)
 					status.put(nameResource, ExtentStatus.EXCLUDED);
@@ -88,7 +104,7 @@ class ConsistsOfProcess {
 			}
 
 			@Override
-			public void finished(AsyncReadGraph graph, InternalEntry entry) {
+			public void finished(AsyncReadGraph graph, ConsistsOfProcessEntry entry) {
 			    if(entry.valid) {
 			        if(entry.name != null) {
 			            result.add(entry);
@@ -103,15 +119,16 @@ class ConsistsOfProcess {
 			}
 		});
 		
-		structure = dqs.compileForEachObject(graph, L0.ConsistsOf, new AsyncContextMultiProcedure<InternalEntry, Resource>() {
+		structure = dqs.compileForEachObject(graph, L0.ConsistsOf, new AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource>() {
 
 			@Override
-			public void execute(AsyncReadGraph graph, InternalEntry parent, Resource child) {
-				
-				if(exclusions.contains(child)) return;
+			public void execute(AsyncReadGraph graph, ConsistsOfProcessEntry parent, Resource child) {
+
+				if(status != null)
+					if(ExtentStatus.EXCLUDED.equals(status.get(child))) return;
 				
 				if(!ignoreVirtual || child.isPersistent()) {
-					InternalEntry entry = new InternalEntry(parent, child, null);
+					ConsistsOfProcessEntry entry = new ConsistsOfProcessEntry(parent, child, false);
 					dqs.forEachObjectCompiled(graph, child, entry, structure);
 					dqs.forEachObjectCompiled(graph, child, entry, names);
 				}
@@ -119,7 +136,7 @@ class ConsistsOfProcess {
 			}
 
 			@Override
-			public void finished(AsyncReadGraph graph, InternalEntry parent) {
+			public void finished(AsyncReadGraph graph, ConsistsOfProcessEntry parent) {
 			}
 
 			@Override
@@ -133,9 +150,12 @@ class ConsistsOfProcess {
 
 			@Override
 			public void run(ReadGraph graph) throws DatabaseException {
-				for(Resource r  : resources) {
-					InternalEntry root = new InternalEntry(null, r, null);
-					dqs.forEachObjectCompiled(graph, r, root, structure);
+				for(ConsistsOfProcessEntry entry  : entries) {
+					dqs.forEachObjectCompiled(graph, entry.resource, entry, structure);
+					if(entry.internal) {
+						// For roots names are not processed
+						dqs.forEachObjectCompiled(graph, entry.resource, entry, names);
+					}
 				}
 			}