Removed os.modelling.ui.modelBrowser.model.INode dependency.

[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..af39f8936e228778d3b5f31e7f5da7d8418e9f0b 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java
+++ b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java
@@ -7,7 +7,6 @@ import java.util.List;
 import org.eclipse.jface.resource.ImageDescriptor;\r
 import org.eclipse.jface.viewers.ISelection;\r
 import org.simantics.browsing.ui.content.Labeler.Modifier;\r
-import org.simantics.db.Builtins;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.Session;\r
@@ -15,16 +14,17 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.interop.Activator;\r
 import org.simantics.interop.stubs.InteropResource;\r
-import org.simantics.modeling.ui.modelBrowser.model.INode;\r
 \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
+       @SuppressWarnings("rawtypes")\r
        @Override\r
        public Object getAdapter(Class adapter) {\r
                return null;\r
@@ -72,36 +72,17 @@ public class ImportNode implements INode {
        @Override\r
        public Collection<?> getChildren(ReadGraph graph) throws DatabaseException {\r
                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
+               \r
+               Collection<Resource> objs = graph.getObjects(model, i.HasImportData);\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
                \r
-//             ComosResource c = ComosResource.getInstance(graph);\r
-//             Collection<Resource> models = graph.getObjects(project, b.ConsistsOf);\r
-//             Collection<ComosGraphNode> comosImports = new ArrayList<ComosGraphNode>();\r
-//             for (Resource m : models) {\r
-//                     Collection<Resource> objs = graph.getObjects(m, b.ConsistsOf);\r
-//                     for (Resource o : objs) {\r
-//                             if (graph.isInstanceOf(o, c.ComosImportLibrary)) {\r
-//                                     String icon_db_path = ComosGraphTools.getIconPath(o, graph);\r
-//                                     if (icon_db_path == null)\r
-//                                             continue;\r
-//                                     ComosIconReader iconReader = new ComosIconReader(icon_db_path);\r
-//                                     comosImports.add(new ComosGraphNode(o, iconReader));\r
-//                             }\r
-//                     }\r
-//             }\r
-//             return comosImports;\r
        }\r
        \r
 \r