Merge "Support dependency embedding in generic model export/import"

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / genericrelation / DependenciesRelation.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependenciesRelation.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependenciesRelation.java
index 9ec12047c6c501a0dc2a58a836c3f69d073a10fe..a3e19f1fc7d94c2af38e01f003e368df7965335d 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependenciesRelation.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependenciesRelation.java
@@ -145,7 +145,7 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
                                }
 
                                @Override
-                               public void finished(AsyncReadGraph graph) {
+                               public void finished(AsyncReadGraph graph, Resource parent) {
                                }
 
                                @Override
@@ -277,6 +277,7 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
                        Resource changeInformation = graph.getPossibleResource("http://www.simantics.org/Modeling-1.2/changeInformation/Inverse");
 
                        for (Resource value : parameter.changedValues()) {
+                               if(!value.isPersistent()) continue;
                                Statement modifiedComponent = graph.getPossibleStatement(value, l0.PropertyOf);
                                if (modifiedComponent == null
                                                || modifiedComponent.getPredicate().equals(changeInformation))