Layer0 + Apros changes

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

diff --git a/org.simantics.interop/graph.tg b/org.simantics.interop/graph.tg
index 03d4ec1f4525fd66c7bf40c0ba36b99661fc8288..cb77177e31da05d4c0db4628e43127cc6f24c6ba 100644 (file)
Binary files a/org.simantics.interop/graph.tg and b/org.simantics.interop/graph.tg differ

diff --git a/org.simantics.interop/graph/Interop.pgraph b/org.simantics.interop/graph/Interop.pgraph
index 074ac7a6c19e4bb107dc2a0bbfaeefb983097900..83428609f000d5c5d62292cfc85f255cd7c9811c 100644 (file)
--- a/org.simantics.interop/graph/Interop.pgraph
+++ b/org.simantics.interop/graph/Interop.pgraph
@@ -6,8 +6,8 @@ INTEROP = <http://www.simantics.org/Interop-1.0> : L0.Ontology
     L0.HasResourceClass "org.simantics.interop.stubs.InteropResource"\r
     @L0.new\r
     \r
-INTEROP.InteropFeature : PROJ.Feature\r
-   L0.HasDescription "Interop feature."\r
+//INTEROP.InteropFeature : PROJ.Feature\r
+//   L0.HasDescription "Interop feature."\r
    \r
    \r
 INTEROP.ImportLibrary <T L0.Library
\ No newline at end of file

diff --git a/org.simantics.interop/plugin.xml b/org.simantics.interop/plugin.xml
index ba3f9841dadd9b0a5fffd20f323db22e1b1b7877..0a51d3da24e61e8a28ad96fee3dd1861107b8a9e 100644 (file)
--- a/org.simantics.interop/plugin.xml
+++ b/org.simantics.interop/plugin.xml
@@ -4,7 +4,7 @@
    <extension\r
          point="org.simantics.browsing.ui.common.viewpointContributionBinding">\r
       <binding\r
-            browseContext="http://www.simantics.org/Structural-1.0/ModelBrowser">\r
+            browseContext="http://www.apros.fi/Apros-6.0/AprosModelBrowser">\r
          <implementation\r
                class="org.simantics.interop.handlers.Contributor1"\r
                preference="1.0">\r
@@ -18,7 +18,7 @@
    <extension\r
          point="org.simantics.browsing.ui.common.evaluatorBinding">\r
       <binding\r
-            browseContext="http://www.simantics.org/Structural-1.0/ModelBrowser">\r
+            browseContext="http://www.apros.fi/Apros-6.0/AprosModelBrowser">\r
          <implementation\r
                class="org.simantics.interop.handlers.EvaluatorFactory1"\r
                preference="1">\r

diff --git a/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java b/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java
index c88629f26ff8830ed9eb703e02470748785fddc6..ffa281f1a95a07e8aecb62935dcee8ad7b32be7d 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java
+++ b/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java
@@ -20,11 +20,9 @@ import org.simantics.db.exception.DatabaseException;
 public class InteropResource {\r
     \r
     public final Resource ImportLibrary;\r
-    public final Resource InteropFeature;\r
         \r
     public static class URIs {\r
         public static final String ImportLibrary = "http://www.simantics.org/Interop-1.0/ImportLibrary";\r
-        public static final String InteropFeature = "http://www.simantics.org/Interop-1.0/InteropFeature";\r
     }\r
     \r
     public static Resource getResourceOrNull(ReadGraph graph, String uri) {\r
@@ -38,7 +36,6 @@ public class InteropResource {
     \r
     public InteropResource(ReadGraph graph) {\r
         ImportLibrary = getResourceOrNull(graph, URIs.ImportLibrary);\r
-        InteropFeature = getResourceOrNull(graph, URIs.InteropFeature);\r
     }\r
     \r
     public static InteropResource getInstance(ReadGraph graph) {\r