Added preference for Import dependencies in generic model import/export

[simantics/platform.git] / bundles / org.simantics.modeling.ui / src / org / simantics / modeling / ui / sharedontology / wizard / ModelImporter.java

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/sharedontology/wizard/ModelImporter.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/sharedontology/wizard/ModelImporter.java
index 6a8d6718d7c5d140a6a077637ea2802cf7fbd7bf..e7707dd407a8d4978aa8c54716ba5f1fe6604363 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/sharedontology/wizard/ModelImporter.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/sharedontology/wizard/ModelImporter.java
@@ -27,6 +27,7 @@ import org.simantics.databoard.container.DataContainers;
 import org.simantics.databoard.container.FormatHandler;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
+import org.simantics.db.common.primitiverequest.IsExternalEntity;
 import org.simantics.db.common.primitiverequest.PossibleResource;
 import org.simantics.db.layer0.adapter.impl.DefaultPasteImportAdvisor;
 import org.simantics.db.layer0.migration.MigratedImportResult;
@@ -74,7 +75,8 @@ public class ModelImporter {
                         if (libraryDependenciesBean != null) {
                             for (ModelDependency dependency : libraryDependenciesBean.dependencies) {
                                 Resource existing = session.sync(new PossibleResource(dependency.uri));
-                                if (existing == null) {
+                                boolean isExternalEntity = existing != null && session.syncRequest(new IsExternalEntity(existing));
+                                if (existing == null || isExternalEntity) {
                                     MigrationUtils.importSharedOntology(session, dependency.tg, false);
                                 }
                             }