Model browser Import node to correct place under Model

[simantics/interop.git] / org.simantics.interop / src / org / simantics / interop / browsing / ImportNode.java

diff --git a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java
index 6af1cad963c76320c1812bc901f3ea253ba235aa..9ed9392054650128299d0e1879a993c1a76abcde 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java
+++ b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java
@@ -19,10 +19,11 @@ import org.simantics.modeling.ui.modelBrowser.model.INode;
 \r
 public class ImportNode implements INode {\r
        \r
-       private Resource project;\r
+       //private Resource project;\r
+       private Resource model;\r
        \r
        public ImportNode(Resource project) {\r
-               this.project = project;\r
+               this.model = project;\r
        }\r
        \r
        @Override\r
@@ -74,14 +75,21 @@ public class ImportNode implements INode {
                List<INode> nodes = new ArrayList<INode>();\r
                Builtins b = graph.getBuiltins();\r
                InteropResource i = InteropResource.getInstance(graph);\r
-               Collection<Resource> models = graph.getObjects(project, b.ConsistsOf);\r
-               for (Resource m : models) {\r
-                       Collection<Resource> objs = graph.getObjects(m, b.ConsistsOf);\r
-                       for (Resource o : objs) {\r
-                               if (graph.isInstanceOf(o, i.ImportLibrary)) {\r
-                                       INode node = graph.adapt(o, INode.class);\r
-                                       nodes.add(node);\r
-                               }\r
+//             Collection<Resource> models = graph.getObjects(project, b.ConsistsOf);\r
+//             for (Resource m : models) {\r
+//                     Collection<Resource> objs = graph.getObjects(m, b.ConsistsOf);\r
+//                     for (Resource o : objs) {\r
+//                             if (graph.isInstanceOf(o, i.ImportLibrary)) {\r
+//                                     INode node = graph.adapt(o, INode.class);\r
+//                                     nodes.add(node);\r
+//                             }\r
+//                     }\r
+//             }\r
+               Collection<Resource> objs = graph.getObjects(model, b.ConsistsOf);\r
+               for (Resource o : objs) {\r
+                       if (graph.isInstanceOf(o, i.ImportLibrary)) {\r
+                               INode node = graph.adapt(o, INode.class);\r
+                               nodes.add(node);\r
                        }\r
                }\r
                return nodes;\r