X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fstubs%2FInteropResource.java;h=48c0e3a7774971f6660cb9bd499bb52fd4414246;hb=176c9a07805082054296461fc13d5ca8a222adfd;hp=bfa3c47f70d2fe3d6f89497ac22342285fd22a1f;hpb=eb67052eccd9492b4ea18c08524b083c0eef3bfe;p=simantics%2Finterop.git

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 bfa3c47..48c0e3a 100644
--- a/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java
+++ b/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java
@@ -1,31 +1,38 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
 package org.simantics.interop.stubs;
 
-
 import org.simantics.db.Resource;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.request.Read;
 import org.simantics.db.Session;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.service.QueryControl;
 
 public class InteropResource {
     
+    public final Resource HasDestination;
+    public final Resource HasGeneratorID;
+    public final Resource HasGeneratorID_Inverse;
+    public final Resource HasImportData;
+    public final Resource HasSource;
+    public final Resource INodeType;
+    public final Resource ImportDataOf;
     public final Resource ImportLibrary;
-    public final Resource InteropFeature;
-    
+    public final Resource InteropBrowseContext;
+    public final Resource InteropBrowseContext_InteropChildRule;
+    public final Resource InteropBrowseContext_InteropNode;
+        
     public static class URIs {
-        public static final String ImportLibrary = "http://www.simantics.org/Interoperability-1.0/Types/ImportLibrary";
-        public static final String InteropFeature = "http://www.simantics.org/Interoperability-1.0/InteropFeature";
+        public static final String HasDestination = "http://www.simantics.org/Interop-1.0/HasDestination";
+        public static final String HasGeneratorID = "http://www.simantics.org/Interop-1.0/HasGeneratorID";
+        public static final String HasGeneratorID_Inverse = "http://www.simantics.org/Interop-1.0/HasGeneratorID/Inverse";
+        public static final String HasImportData = "http://www.simantics.org/Interop-1.0/HasImportData";
+        public static final String HasSource = "http://www.simantics.org/Interop-1.0/HasSource";
+        public static final String INodeType = "http://www.simantics.org/Interop-1.0/INodeType";
+        public static final String ImportDataOf = "http://www.simantics.org/Interop-1.0/ImportDataOf";
+        public static final String ImportLibrary = "http://www.simantics.org/Interop-1.0/ImportLibrary";
+        public static final String InteropBrowseContext = "http://www.simantics.org/Interop-1.0/InteropBrowseContext";
+        public static final String InteropBrowseContext_InteropChildRule = "http://www.simantics.org/Interop-1.0/InteropBrowseContext/InteropChildRule";
+        public static final String InteropBrowseContext_InteropNode = "http://www.simantics.org/Interop-1.0/InteropBrowseContext/InteropNode";
     }
     
     public static Resource getResourceOrNull(ReadGraph graph, String uri) {
@@ -38,15 +45,25 @@ public class InteropResource {
     }
     
     public InteropResource(ReadGraph graph) {
+        HasDestination = getResourceOrNull(graph, URIs.HasDestination);
+        HasGeneratorID = getResourceOrNull(graph, URIs.HasGeneratorID);
+        HasGeneratorID_Inverse = getResourceOrNull(graph, URIs.HasGeneratorID_Inverse);
+        HasImportData = getResourceOrNull(graph, URIs.HasImportData);
+        HasSource = getResourceOrNull(graph, URIs.HasSource);
+        INodeType = getResourceOrNull(graph, URIs.INodeType);
+        ImportDataOf = getResourceOrNull(graph, URIs.ImportDataOf);
         ImportLibrary = getResourceOrNull(graph, URIs.ImportLibrary);
-        InteropFeature = getResourceOrNull(graph, URIs.InteropFeature);
+        InteropBrowseContext = getResourceOrNull(graph, URIs.InteropBrowseContext);
+        InteropBrowseContext_InteropChildRule = getResourceOrNull(graph, URIs.InteropBrowseContext_InteropChildRule);
+        InteropBrowseContext_InteropNode = getResourceOrNull(graph, URIs.InteropBrowseContext_InteropNode);
     }
     
     public static InteropResource getInstance(ReadGraph graph) {
         Session session = graph.getSession();
         InteropResource ret = session.peekService(InteropResource.class);
         if(ret == null) {
-            ret = new InteropResource(graph);
+            QueryControl qc = graph.getService(QueryControl.class);
+            ret = new InteropResource(qc.getIndependentGraph(graph));
             session.registerService(InteropResource.class, ret);
         }
         return ret;
@@ -57,7 +74,8 @@ public class InteropResource {
         if(ret == null) {
             ret = session.syncRequest(new Read<InteropResource>() {
                 public InteropResource perform(ReadGraph graph) throws DatabaseException {
-                    return new InteropResource(graph);
+                    QueryControl qc = graph.getService(QueryControl.class);
+                    return new InteropResource(qc.getIndependentGraph(graph));
                 }
             });
             session.registerService(InteropResource.class, ret);