Multiple reader thread support for db client

[simantics/platform.git] / bundles / org.simantics.ui / src / org / simantics / ui / workbench / editor / input / InputValidationCombinators.java

diff --git a/bundles/org.simantics.ui/src/org/simantics/ui/workbench/editor/input/InputValidationCombinators.java b/bundles/org.simantics.ui/src/org/simantics/ui/workbench/editor/input/InputValidationCombinators.java
index 9b2c1e06ccebf16650796d94b20c2ba768219e45..1fd5a16207e3d8e29e526ff7b4d626c830c833c0 100644 (file)
--- a/bundles/org.simantics.ui/src/org/simantics/ui/workbench/editor/input/InputValidationCombinators.java
+++ b/bundles/org.simantics.ui/src/org/simantics/ui/workbench/editor/input/InputValidationCombinators.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * Copyright (c) 2007, 2018 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
@@ -20,7 +20,6 @@ import org.simantics.db.common.request.Queries;
 import org.simantics.db.common.request.UnaryRead;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.request.combinations.Combinators;
-import org.simantics.db.layer0.request.combinations.Combinators.SynchronizationProcedure;
 import org.simantics.db.request.Read;
 import org.simantics.ui.workbench.IResourceEditorInput;
 
@@ -208,10 +207,8 @@ public final class InputValidationCombinators {
         }
         @Override
         public Resource perform(ReadGraph graph) throws DatabaseException {
-            SynchronizationProcedure<Resource> procedure = new SynchronizationProcedure<Resource>();
             Resource relation = graph.getResource(relationURI);
-            graph.forPossibleObject(subject, relation, procedure);
-            return procedure.getResult();
+            return graph.getPossibleObject(subject, relation);
         }
         @Override
         public int hashCode() {
@@ -270,10 +267,8 @@ public final class InputValidationCombinators {
         }
         @Override
         public Resource perform(ReadGraph graph) throws DatabaseException {
-            SynchronizationProcedure<Resource> procedure = new SynchronizationProcedure<Resource>();
             Resource relation = graph.getResource(relationURI);
-            graph.forSingleObject(subject, relation, procedure);
-            return procedure.getResult();
+            return graph.getSingleObject(subject, relation);
         }
         @Override
         public int hashCode() {