X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FUserComponentMigration.java;h=928c405b5a5cb6e88d1eb4ab42ed6896e804d982;hb=b055bfb36cca301ceed0591028d245e152c8c32d;hp=b4db9c8766b863103ef3e398d9a73ce8b69bc974;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/UserComponentMigration.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/UserComponentMigration.java
index b4db9c876..928c405b5 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/UserComponentMigration.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/UserComponentMigration.java
@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.simantics.modeling;
 
-import gnu.trove.set.hash.THashSet;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -28,7 +26,6 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.NamedResource;
-import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.common.request.PossibleIndexRoot;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.common.utils.VersionMap;
@@ -37,17 +34,21 @@ import org.simantics.db.exception.CancelTransactionException;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.Instances;
 import org.simantics.db.layer0.request.ActiveModels;
+import org.simantics.db.layer0.request.ListIndexRoots;
 import org.simantics.db.layer0.util.Layer0Utils;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.MigrateModel.MigrationOperation;
 import org.simantics.modeling.migration.UserComponentPostMigrationAction;
-import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.structural.stubs.StructuralResource2;
 import org.simantics.utils.datastructures.MapList;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.Triple;
 import org.simantics.utils.strings.AlphanumComparator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gnu.trove.set.hash.THashSet;
 
 /**
  * @author Antti Villberg
@@ -55,6 +56,8 @@ import org.simantics.utils.strings.AlphanumComparator;
  */
 public class UserComponentMigration {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(UserComponentMigration.class);
+
     public static void migrateUserComponents(WriteGraph graph, Resource source, Resource target, Collection<Resource> components) throws DatabaseException {
         MigrateModel model = getComponentTypeModel(graph, source, target, null);
         if (model.instances.isEmpty())
@@ -207,7 +210,7 @@ public class UserComponentMigration {
             Resource type = graph.getPossibleType(instance, STR.Component);
             String uri = graph.getPossibleURI(instance);
             if (type == null || uri == null) {
-                System.err.println("CANNOT MIGRATE INSTANCE DUE TO TYPING PROBLEM: " + NameUtils.getURIOrSafeNameInternal(graph, instance));
+                LOGGER.warn("CANNOT MIGRATE INSTANCE DUE TO TYPING PROBLEM: " + NameUtils.getURIOrSafeNameInternal(graph, instance));
                 continue;
             }
             NamedResource best = matchBest(graph, type, targetOntology);
@@ -239,18 +242,16 @@ public class UserComponentMigration {
     }
 
     private static Collection<NamedResource> getLocations(ReadGraph graph, final Resource project) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(graph);
-        SimulationResource SIMU = SimulationResource.getInstance(graph);
         Collection<NamedResource> libraries = new ArrayList<>();
-        for (Resource r : graph.syncRequest(new ObjectsWithType(project, L0.ConsistsOf, SIMU.Model))) {
-            String name = Versions.getStandardNameString(graph, r);
-            libraries.add(new NamedResource(name, r));
-        }
-        Collection<Resource> ontologies = Simantics.applySCL("Simantics/SharedOntologies", "traverseSharedOntologies", graph, graph.getRootLibrary());
-        for (Resource r : ontologies) {
+        for (Resource r : graph.syncRequest(new ListIndexRoots())) {
             String name = Versions.getStandardNameString(graph, r);
             libraries.add(new NamedResource(name, r));
         }
+//        Collection<Resource> ontologies = Simantics.applySCL("Simantics/SharedOntologies", "traverseSharedOntologies", graph, graph.getRootLibrary());
+//        for (Resource r : ontologies) {
+//            String name = Versions.getStandardNameString(graph, r);
+//            libraries.add(new NamedResource(name, r));
+//        }
         return libraries;
     }