From: luukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 8 Dec 2016 14:52:18 +0000 (+0000)
Subject: Recomplied G3D ontologies and updated AnntotatedPropertyTabContrubutor
X-Git-Tag: v1.43.0~279
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b79406dcc167890ad62d43f0aa1baf1ce25b5e47;p=simantics%2F3d.git

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 5c532de4..525ba136 100644
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 af2df4db..2efbbb01 100644
--- 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 @@
  *******************************************************************************/
 package org.simantics.g3d.csg.ontology;
 
+import org.simantics.db.RequestProcessor;
 import org.simantics.db.Resource;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.request.Read;
@@ -230,7 +231,7 @@ public class CSG {
         return ret;
     }
     
-    public static CSG getInstance(Session session) throws DatabaseException {
+    public static CSG getInstance(RequestProcessor session) throws DatabaseException {
         CSG ret = session.peekService(CSG.class);
         if(ret == null) {
             ret = session.syncRequest(new Read<CSG>() {
diff --git a/org.simantics.g3d.ontology/graph.tg b/org.simantics.g3d.ontology/graph.tg
index 8c6bb84a..ed0e5d34 100644
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 87d260d0..ee58a301 100644
--- 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 @@
  *******************************************************************************/
 package org.simantics.g3d.ontology;
 
+import org.simantics.db.RequestProcessor;
 import org.simantics.db.Resource;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.request.Read;
@@ -134,7 +135,7 @@ public class G3D {
         return ret;
     }
     
-    public static G3D getInstance(Session session) throws DatabaseException {
+    public static G3D getInstance(RequestProcessor session) throws DatabaseException {
         G3D ret = session.peekService(G3D.class);
         if(ret == null) {
             ret = session.syncRequest(new Read<G3D>() {
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 c0ea36e9..b922e77d 100644
--- 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;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.viewers.AbstractTableViewer;
@@ -707,12 +708,10 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
 		
 
 		
-		
-		
 		@Override
-		public void updatePartName(Callback<String> updateCallback) {
+		public void updatePartName(Consumer<String> updateCallback) {
 			if (node != null)
-				updateCallback.run(node.toString()); 
+				updateCallback.accept(node.toString()); 
 			
 		}