(refs #7563) Mark parents of new resource optional in graph.tg

[simantics/platform.git] / bundles / org.simantics.graph / src / org / simantics / graph / representation / TransferableGraphUtils.java

diff --git a/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphUtils.java b/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphUtils.java
index 10637ad65caf0d861d52e3d1adfffdee66d5f2ca..8ee29cc953a3eacc745edb77ad1854ce6ac3b56c 100644 (file)
--- a/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphUtils.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphUtils.java
@@ -57,6 +57,10 @@ public class TransferableGraphUtils {
                 External ext = (External)id.definition;
                 if(ext.name.equals(name) && ext.parent == parent) return id;
             }
+            else if(id.definition instanceof Optional) {
+                Optional ext = (Optional)id.definition;
+                if(ext.name.equals(name) && ext.parent == parent) return id;
+            }
         }
         return null;
         
@@ -309,6 +313,9 @@ public class TransferableGraphUtils {
                 } else if (definition instanceof Internal) {
                     Internal def = (Internal)definition;
                     return getURI(identities, def.parent) + "/" + def.name;
+                } else if (definition instanceof Optional) {
+                    Optional def = (Optional)definition;
+                    return getURI(identities, def.parent) + "/" + def.name;
                 } else {
                     return "";
                 }
@@ -344,6 +351,9 @@ public class TransferableGraphUtils {
             } else if (definition instanceof Internal) {
                 Internal def = (Internal)definition;
                 return getURI(resourceCount, identities, def.parent) + "/" + URIStringUtils.escape(def.name);
+            } else if (definition instanceof Optional) {
+                Optional def = (Optional)definition;
+                return getURI(resourceCount, identities, def.parent) + "/" + URIStringUtils.escape(def.name);
             } else {
                 return "";
             }