Model browser Import node to correct place under Model

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@16968 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.interop/META-INF/MANIFEST.MF b/org.simantics.interop/META-INF/MANIFEST.MF
index 99a5c997382bd0c0e432ac2c1fa968838f3625a2..bf52f70c9cac85133133690434836322b5e14a87 100644 (file)
--- a/org.simantics.interop/META-INF/MANIFEST.MF
+++ b/org.simantics.interop/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.browsing.ui.common;bundle-version="0.9.0",
  org.simantics.modeling.ui;bundle-version="1.0.0",
  org.simantics.ui;bundle-version="1.0.0",
- org.simantics.layer0.utils;bundle-version="0.8.0"
+ org.simantics.layer0.utils;bundle-version="0.8.0",
+ org.simantics.structural.ui;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

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

diff --git a/org.simantics.interop/src/org/simantics/interop/handlers/Contributor1.java b/org.simantics.interop/src/org/simantics/interop/handlers/Contributor1.java
index 26d63a6bf2e34412d5c98d5f587d24dcfbe90f8f..2ca43914bfaf8fc3f7a11f2897950d2f45217c4b 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/handlers/Contributor1.java
+++ b/org.simantics.interop/src/org/simantics/interop/handlers/Contributor1.java
@@ -10,19 +10,21 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.interop.browsing.ImportNode;\r
 import org.simantics.layer0.utils.direct.GraphUtils;\r
 import org.simantics.modeling.ui.modelBrowser.model.INode;\r
+import org.simantics.structural.ui.modelBrowser.nodes.ModelNode;\r
 \r
-public class Contributor1 extends ViewpointContributor<Resource> {\r
+\r
+public class Contributor1 extends ViewpointContributor<ModelNode> {\r
 \r
        \r
        public Contributor1() {\r
                super();\r
        }\r
        @Override\r
-       public Collection<?> getContribution(ReadGraph graph, Resource input)\r
+       public Collection<?> getContribution(ReadGraph graph, ModelNode input)\r
                        throws DatabaseException {\r
                Collection<INode> nodes = new ArrayList<INode>();\r
-               System.out.println("Contributor 1 " + input + " " + GraphUtils.getReadableName(graph, input));\r
-               nodes.add(new ImportNode(input));\r
+               System.out.println("Contributor 1 " + input + " " + GraphUtils.getReadableName(graph, input.resource));\r
+               nodes.add(new ImportNode(input.resource));\r
                return nodes;\r
        }\r
        \r
@@ -34,3 +36,26 @@ public class Contributor1 extends ViewpointContributor<Resource> {
        \r
 \r
 }\r
+//public class Contributor1 extends ViewpointContributor<Resource> {\r
+//\r
+//     \r
+//     public Contributor1() {\r
+//             super();\r
+//     }\r
+//     @Override\r
+//     public Collection<?> getContribution(ReadGraph graph, Resource input)\r
+//                     throws DatabaseException {\r
+//             Collection<INode> nodes = new ArrayList<INode>();\r
+//             System.out.println("Contributor 1 " + input + " " + GraphUtils.getReadableName(graph, input));\r
+//             nodes.add(new ImportNode(input));\r
+//             return nodes;\r
+//     }\r
+//     \r
+//     @Override\r
+//     public String getViewpointId() {\r
+//             return "Standard";\r
+//     }\r
+//     \r
+//     \r
+//\r
+//}\r