Recomplied G3D ontologies and updated AnntotatedPropertyTabContrubutor

refs #6862

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@33408 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.g3d.csg.ontology/graph.tg b/org.simantics.g3d.csg.ontology/graph.tg
index 5c532de4b4d2522c6be606a5416cc73c3a10b2a1..525ba1366927f5b541031e0a19455a2c199387ed 100644 (file)
Binary files a/org.simantics.g3d.csg.ontology/graph.tg and b/org.simantics.g3d.csg.ontology/graph.tg differ

diff --git a/org.simantics.g3d.csg.ontology/src/org/simantics/g3d/csg/ontology/CSG.java b/org.simantics.g3d.csg.ontology/src/org/simantics/g3d/csg/ontology/CSG.java
index af2df4dbb6a9999d57adfe9828d485b143abf8c5..2efbbb01b4182cb2d47c13159995a4404c93b835 100644 (file)
--- a/org.simantics.g3d.csg.ontology/src/org/simantics/g3d/csg/ontology/CSG.java
+++ b/org.simantics.g3d.csg.ontology/src/org/simantics/g3d/csg/ontology/CSG.java
@@ -11,6 +11,7 @@
  *******************************************************************************/\r
 package org.simantics.g3d.csg.ontology;\r
 \r
+import org.simantics.db.RequestProcessor;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.request.Read;\r
@@ -230,7 +231,7 @@ public class CSG {
         return ret;\r
     }\r
     \r
-    public static CSG getInstance(Session session) throws DatabaseException {\r
+    public static CSG getInstance(RequestProcessor session) throws DatabaseException {\r
         CSG ret = session.peekService(CSG.class);\r
         if(ret == null) {\r
             ret = session.syncRequest(new Read<CSG>() {\r

diff --git a/org.simantics.g3d.ontology/graph.tg b/org.simantics.g3d.ontology/graph.tg
index 8c6bb84afb0a9b963fc54b981a3506e558602149..ed0e5d348c7dfae8e25161e17491e74d34668739 100644 (file)
Binary files a/org.simantics.g3d.ontology/graph.tg and b/org.simantics.g3d.ontology/graph.tg differ

diff --git a/org.simantics.g3d.ontology/src/org/simantics/g3d/ontology/G3D.java b/org.simantics.g3d.ontology/src/org/simantics/g3d/ontology/G3D.java
index 87d260d0a77d0ca701242038403ec13ae2257fa6..ee58a301ce154945c8cae01c5c674c9e593b1474 100644 (file)
--- a/org.simantics.g3d.ontology/src/org/simantics/g3d/ontology/G3D.java
+++ b/org.simantics.g3d.ontology/src/org/simantics/g3d/ontology/G3D.java
@@ -11,6 +11,7 @@
  *******************************************************************************/\r
 package org.simantics.g3d.ontology;\r
 \r
+import org.simantics.db.RequestProcessor;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.request.Read;\r
@@ -134,7 +135,7 @@ public class G3D {
         return ret;\r
     }\r
     \r
-    public static G3D getInstance(Session session) throws DatabaseException {\r
+    public static G3D getInstance(RequestProcessor session) throws DatabaseException {\r
         G3D ret = session.peekService(G3D.class);\r
         if(ret == null) {\r
             ret = session.syncRequest(new Read<G3D>() {\r

diff --git a/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java b/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
index c0ea36e9005351f57075256e79aa664ace4281e5..b922e77d3fc937a19734bbd5ec6f388b286b6860 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
@@ -24,6 +24,7 @@ import java.util.LinkedHashMap;
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
+import java.util.function.Consumer;\r
 \r
 import org.eclipse.jface.layout.GridDataFactory;\r
 import org.eclipse.jface.viewers.AbstractTableViewer;\r
@@ -707,12 +708,10 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                \r
 \r
                \r
-               \r
-               \r
                @Override\r
-               public void updatePartName(Callback<String> updateCallback) {\r
+               public void updatePartName(Consumer<String> updateCallback) {\r
                        if (node != null)\r
-                               updateCallback.run(node.toString()); \r
+                               updateCallback.accept(node.toString()); \r
                        \r
                }\r
                \r