Import/export changes. A load.

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / util / Subgraphs.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Subgraphs.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Subgraphs.java
index 9b85adf8faadc90cac8a09345f02ce36de40ba69..c7e697e6291773b58e44d8bd3a8c2afbf0952442 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Subgraphs.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Subgraphs.java
@@ -11,15 +11,6 @@
  *******************************************************************************/
 package org.simantics.db.layer0.util;
 
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.hash.TIntIntHashMap;
-import gnu.trove.map.hash.TLongObjectHashMap;
-import gnu.trove.procedure.TIntProcedure;
-import gnu.trove.procedure.TLongObjectProcedure;
-import gnu.trove.set.TIntSet;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
 import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.FileNotFoundException;
@@ -30,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -54,6 +46,7 @@ import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.SubgraphAdvisor;
 import org.simantics.db.layer0.adapter.SubgraphExtent.ExtentStatus;
+import org.simantics.db.layer0.util.ConsistsOfProcess.InternalEntry;
 import org.simantics.db.procedure.AsyncProcedure;
 import org.simantics.db.request.AsyncRead;
 import org.simantics.db.service.ClusteringSupport;
@@ -70,6 +63,15 @@ import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.threads.logger.ITask;
 import org.simantics.utils.threads.logger.ThreadLogger;
 
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TLongObjectHashMap;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TLongObjectProcedure;
+import gnu.trove.set.TIntSet;
+import gnu.trove.set.hash.THashSet;
+import gnu.trove.set.hash.TIntHashSet;
+
 public class Subgraphs {
 
        public static String LOG_FILE = "export.log";
@@ -989,7 +991,9 @@ public class Subgraphs {
              * � All o are internal
              * � All stm are included
                         */
-                       for(Resource r : ConsistsOfProcess.walk(graph, fringe, exclusions, true)) {
+                       List<InternalEntry> entries = ConsistsOfProcess.walk(graph, null, fringe, exclusions, true); 
+                       for(InternalEntry entry : entries) {
+                               Resource r = entry.resource;
                                if (status.put(r, ExtentStatus.INTERNAL) == null) {
                                        String URI = graph.getPossibleURI(r);
                                        if(URI != null) log("URI INTERNAL " + URI);