TransferableGraph import to VG with different name

[simantics/platform.git] / bundles / org.simantics.graph.db / src / org / simantics / graph / db / StreamingTransferableGraphImportProcess.java

diff --git a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
index 6d3f7e48e7d421a0e5fe7e444e453f585ce2dfd5..e61937fc9e90aaf92d2dc57767d35c4545d6b91e 100644 (file)
--- a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
+++ b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
@@ -188,6 +188,21 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
                this.handles = new int[resourceCount];
                TIntObjectMap<Identity> identityMap = TransferableGraphUtils.mapIdentities(identities);
                
+               // We must process roots first, because internal identifiers depend on them.
+               for(Identity identity : identities) {
+                       IdentityDefinition definition = identity.definition;
+                       if (definition instanceof Root) {
+                               Root root = (Root) definition;
+                               if (root.name.equals(""))
+                                       handles[identity.resource] = builder.handle(RootLibrary);
+                               else {
+                                       Resource existing = advisor.analyzeRoot(graph, root);
+                                       if (existing != null)
+                                               handles[identity.resource] = builder.handle(existing);
+                               }
+                       }
+               }
+               
                for(Identity identity : identities) {
                        IdentityDefinition definition = identity.definition;
                        if(definition instanceof External) {
@@ -227,16 +242,6 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
                                        existingInternalMap.put(identity.resource, existing);
                                }
                        }
-                       else if(definition instanceof Root) {
-                               Root root = (Root)definition;
-                               if(root.name.equals(""))
-                                   handles[identity.resource] = builder.handle(RootLibrary);
-                               else  {
-                                       Resource existing = advisor.analyzeRoot(graph, root);
-                                       if(existing != null)
-                                           handles[identity.resource] = builder.handle(existing);
-                               }
-                       }
                        else if(definition instanceof Optional) {
                                External def = (External)definition;
                                Resource parent = builder.resource(handles[def.parent]);
@@ -269,6 +274,8 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
        }
 
        int[] getClustering() {
+               if (vg != null)
+                       return null;
                Variant v = extensions.get(Extensions.CLUSTERING);
                if(v == null) return null;
                try {
@@ -280,6 +287,8 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
        }
 
        int[] getClusterSets() {
+               if (vg != null)
+                       return null;
                Variant v = extensions.get(Extensions.CLUSTER_SETS);
                if(v == null) return null;
                try {
@@ -605,7 +614,11 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
                tg.forValues2(null, new ValueProcedure());
                
                for(Resource r : existingInternalMap.valueCollection()) {
-                       graph.deny(r, InstanceOf, null, ExternalEntity, null);
+                       try {
+                               graph.deny(r, InstanceOf, null, ExternalEntity, null);
+                       } catch (DatabaseException e) {
+                               graph.deny(r, InstanceOf, null, ExternalEntity, vg);
+                       }
                }
                
        }