X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FDirectQuerySupportImpl.java;h=a0f6c1d1eb3cd437a65a340083c4d1ed1f6c241b;hp=9d6b019e4a2d22de5a3954f77f125abde174a468;hb=4aa615b51b887cd75b558a823f0d87b3174e5f5e;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/DirectQuerySupportImpl.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/DirectQuerySupportImpl.java
index 9d6b019e4..a0f6c1d1e 100644
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/DirectQuerySupportImpl.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/DirectQuerySupportImpl.java
@@ -30,7 +30,6 @@ import org.simantics.db.procore.cluster.ResourceTableSmall;
 import org.simantics.db.procore.cluster.ValueTableSmall;
 import org.simantics.db.request.AsyncRead;
 import org.simantics.db.service.DirectQuerySupport;
-import org.simantics.utils.datastructures.Callback;
 
 public class DirectQuerySupportImpl implements DirectQuerySupport {
 
@@ -484,14 +483,9 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
 		if(subject < 0) {
 
 			if(!SessionImplSocket.areVirtualStatementsLoaded(session.virtualGraphServerSupport, subject, predicate)) {
-			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, predicate, new Callback<ReadGraphImpl>()  {
-
-					@Override
-					public void run(ReadGraphImpl graph) {
-						getRelatedValue4(graph, subject, context, procedure);
-					}
-					
-				});
+			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, predicate,
+			            g -> getRelatedValue4(g, subject, context, procedure)
+				);
 				return;
 			}
 			
@@ -524,28 +518,16 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
 		
         final org.simantics.db.procore.cluster.ClusterImpl cluster = session.clusterTable.getClusterByResourceKey(subject);
         if(!cluster.isLoaded()) {
-        	cluster.load(session.clusterTranslator, new Runnable() {
-
-				@Override
-				public void run() {
-					getRelatedValue4(graph, subject, context, procedure);
-				}
-        		
-        	});
+        	cluster.load(session.clusterTranslator, () -> getRelatedValue4(graph, subject, context, procedure));
         	return;
         }
         
         if(cluster.hasVirtual() && session.virtualGraphServerSupport.virtuals.contains(subject)) {
 			
 			if(!SessionImplSocket.areVirtualStatementsLoaded(session.virtualGraphServerSupport, subject, predicate)) {
-			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, predicate, new Callback<ReadGraphImpl>()  {
-
-					@Override
-					public void run(ReadGraphImpl graph) {
-						getRelatedValue4(graph, subject, context, procedure);
-					}
-					
-				});
+			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, predicate,
+			            g -> getRelatedValue4(g, subject, context, procedure)
+				);
 				return;
 			}
         	
@@ -578,14 +560,9 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
 		if(subject < 0) {
 
 			if(!SessionImplSocket.areVirtualStatementsLoaded(session.virtualGraphServerSupport, subject)) {
-			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, new Callback<ReadGraphImpl>()  {
-
-					@Override
-					public void run(ReadGraphImpl graph) {
-						getValue4(graph, containerCluster, subject, procedure);
-					}
-					
-				});
+			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, 
+			            g -> getValue4(g, containerCluster, subject, procedure)
+			    );
 				return;
 			}
 			
@@ -627,14 +604,9 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
         if(cluster.hasVirtual() && session.virtualGraphServerSupport.virtuals.contains(subject)) {
 
 			if(!SessionImplSocket.areVirtualStatementsLoaded(session.virtualGraphServerSupport, subject)) {
-			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, new Callback<ReadGraphImpl>()  {
-
-					@Override
-					public void run(ReadGraphImpl graph) {
-						getValue4(graph, containerCluster, subject, procedure);
-					}
-					
-				});
+			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject,
+			    g -> getValue4(g, containerCluster, subject, procedure)
+			    );
 				return;
 			}
         	
@@ -682,14 +654,9 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
 		if(subject < 0) {
 
 			if(!SessionImplSocket.areVirtualStatementsLoaded(session.virtualGraphServerSupport, subject)) {
-			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, new Callback<ReadGraphImpl>()  {
-
-					@Override
-					public void run(ReadGraphImpl graph) {
-						getValue4(graph, containerCluster, subject, context, procedure);
-					}
-					
-				});
+			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject,
+			            g -> getValue4(g, containerCluster, subject, context, procedure)
+			    );
 				return;
 			}
 			
@@ -731,14 +698,9 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
         if(cluster.hasVirtual() && session.virtualGraphServerSupport.virtuals.contains(subject)) {
 
 			if(!SessionImplSocket.areVirtualStatementsLoaded(session.virtualGraphServerSupport, subject)) {
-			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, new Callback<ReadGraphImpl>()  {
-
-					@Override
-					public void run(ReadGraphImpl graph) {
-						getValue4(graph, containerCluster, subject, context, procedure);
-					}
-					
-				});
+			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject,
+			             g -> getValue4(g, containerCluster, subject, context, procedure)
+			    );
 				return;
 			}
         	
@@ -842,14 +804,9 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
 		if(subject < 0) {
 
 			if(!SessionImplSocket.areVirtualStatementsLoaded(session.virtualGraphServerSupport, subject, predicate)) {
-			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, predicate, new Callback<ReadGraphImpl>()  {
-
-					@Override
-					public void run(ReadGraphImpl graph) {
-						getRelatedValue4(graph, subject, procedure);
-					}
-					
-				});
+			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, predicate,
+			            g -> getRelatedValue4(g, subject, procedure)
+			    );
 				return;
 			}
 			
@@ -896,14 +853,9 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
         if(cluster.hasVirtual() && session.virtualGraphServerSupport.virtuals.contains(subject)) {
 			
 			if(!SessionImplSocket.areVirtualStatementsLoaded(session.virtualGraphServerSupport, subject, predicate)) {
-			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, predicate, new Callback<ReadGraphImpl>()  {
-
-					@Override
-					public void run(ReadGraphImpl graph) {
-						getRelatedValue4(graph, subject, procedure);
-					}
-					
-				});
+			    SessionImplSocket.loadVirtualStatements(session.virtualGraphServerSupport, graph, subject, predicate,
+			            g -> getRelatedValue4(graph, subject, procedure)
+			    );
 				return;
 			}