X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FModelingUtils.java;h=b10ad9da009065604f184ed0c9311799ff08d74d;hb=6326b65c5c6a785aadcb615cb95ceadd8f53964a;hp=1f530f59f60306d13e3f86e9426ae5ce6e5565dd;hpb=a57dcc8e1a200d33fec06da5edffb064f286a82f;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
index 1f530f59f..b10ad9da0 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -96,7 +96,6 @@ import org.simantics.db.layer0.adapter.CopyHandler;
 import org.simantics.db.layer0.adapter.GenericRelationIndex;
 import org.simantics.db.layer0.adapter.Instances;
 import org.simantics.db.layer0.adapter.impl.DefaultPasteImportAdvisor;
-import org.simantics.db.layer0.adapter.impl.EntityInstances.QueryIndex;
 import org.simantics.db.layer0.adapter.impl.ImportAdvisorFactory;
 import org.simantics.db.layer0.genericrelation.DependenciesRelation.DependencyChangesRequest;
 import org.simantics.db.layer0.genericrelation.DependencyChanges;
@@ -158,7 +157,6 @@ import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.structural.stubs.StructuralResource2;
 import org.simantics.structural2.scl.StructuralComponent;
 import org.simantics.structural2.utils.StructuralUtils;
-import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.ObjectUtils;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.Triple;
@@ -413,7 +411,7 @@ public class ModelingUtils {
 
 	public static void importModel(String fileName) {
 
-		Resource project = SimanticsUI.getProject().get();
+		Resource project = Simantics.getProject().get();
 
 		try (StreamingTransferableGraphFileReader importer = new StreamingTransferableGraphFileReader(new File(fileName))) {
 			TransferableGraphSource tg = importer.readTG();
@@ -2371,7 +2369,7 @@ public class ModelingUtils {
 			
 	        monitor.setTaskName("Creating missing GUID identifiers " + NameUtils.getSafeName(graph, root));
 			Resource indexRoot = graph.syncRequest(new PossibleIndexRoot(root));
-			for(Resource r : searchByType(graph, indexRoot, L0.Entity)) {
+			for(Resource r : searchByTypeShallow(graph, indexRoot, L0.Entity)) {
 
 				memory.maintain();