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

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 d910f13ff..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
@@ -2,6 +2,7 @@ package org.simantics.db.layer0.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -13,44 +14,63 @@ 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;
 import org.simantics.layer0.Layer0;
+import org.simantics.utils.datastructures.Pair;
 
 class ConsistsOfProcess {
 
-	final List<InternalEntry> result;
-	final AsyncContextMultiProcedure<InternalEntry, Resource> structure;
-	final AsyncContextMultiProcedure<InternalEntry, Resource> names;
+	final List<ConsistsOfProcessEntry> result;
+	final Set<Resource> childrenWithNoName;
+	final AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource> structure;
+	final AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource> names;
 
-    public static List<InternalEntry> 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);
-    	return process.result;
+	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;
-    	InternalEntry(InternalEntry parent, Resource resource, String name) {
+    	public boolean internal;
+    	public boolean valid = true;
+    	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>();
-		
-		names = dqs.compileForEachObject(graph, L0.HasName, new AsyncContextMultiProcedure<InternalEntry, Resource>() {
+		result = new ArrayList<>();
+		childrenWithNoName = new HashSet<>();
+		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);
@@ -58,8 +78,16 @@ class ConsistsOfProcess {
 				graph.forPossibleValue(nameResource, new Procedure<String>() {
 
 					@Override
-					public void execute(String result) {
-						entry.name = result;
+					public void execute(String name) {
+					    if(!entry.valid) return;
+					    
+					    if(name == null) {
+					        entry.valid = false;
+					    } else if (entry.name != null) {
+					        entry.valid = false;
+					    } else {
+					        entry.name = name;
+					    }
 					}
 
 					@Override
@@ -76,30 +104,39 @@ class ConsistsOfProcess {
 			}
 
 			@Override
-			public void finished(AsyncReadGraph graph) {
+			public void finished(AsyncReadGraph graph, ConsistsOfProcessEntry entry) {
+			    if(entry.valid) {
+			        if(entry.name != null) {
+			            result.add(entry);
+			        } else {
+			            // This one did not have a name - not a valid internal
+			            childrenWithNoName.add(entry.resource);
+			        }
+			    } else {
+			        // Something wrong has happened. Do not treat as valid internal
+			        childrenWithNoName.add(entry.resource);
+			    }
 			}
-
 		});
 		
-		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);
-					if(result.add(entry)) {
-						dqs.forEachObjectCompiled(graph, child, entry, structure);
-						dqs.forEachObjectCompiled(graph, child, entry, names);
-					}
+					ConsistsOfProcessEntry entry = new ConsistsOfProcessEntry(parent, child, false);
+					dqs.forEachObjectCompiled(graph, child, entry, structure);
+					dqs.forEachObjectCompiled(graph, child, entry, names);
 				}
 				
 			}
 
 			@Override
-			public void finished(AsyncReadGraph graph) {
+			public void finished(AsyncReadGraph graph, ConsistsOfProcessEntry parent) {
 			}
 
 			@Override
@@ -113,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);
+					}
 				}
 			}