Use java.util.Consumer instead of os.utils.datastructures.Callback

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / graph / WriteGraphImpl.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/WriteGraphImpl.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/WriteGraphImpl.java
index f640513c62b1ec74ee3eed8dd4f42c7f070cef3c..ca485f9893957ff784075f686b87221e843fce50 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/WriteGraphImpl.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/WriteGraphImpl.java
@@ -15,6 +15,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.TreeMap;
+import java.util.function.Consumer;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.accessor.Accessor;
@@ -66,7 +67,6 @@ import org.simantics.db.request.WriteResult;
 import org.simantics.db.request.WriteTraits;
 import org.simantics.layer0.Layer0;
 import org.simantics.utils.Development;
-import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.datastructures.Pair;
 
 import gnu.trove.map.hash.THashMap;
@@ -243,19 +243,14 @@ final public class WriteGraphImpl extends ReadGraphImpl implements WriteGraph {
     @Override
     public void asyncRequest(DelayedWrite request) {
         assert (request != null);
-        getWriteRequestScheduler().scheduleRequest(request, new Callback<DatabaseException>() {
-
-                       @Override
-                       public void run(DatabaseException parameter) {
-                               if(parameter != null)
-                                       Logger.defaultLogError(parameter);
-                       }
-               
+        getWriteRequestScheduler().scheduleRequest(request, e -> {
+            if(e != null)
+                Logger.defaultLogError(e);
         }, null, Boolean.TRUE);
     }
 
     @Override
-    public void asyncRequest(DelayedWrite request, Callback<DatabaseException> callback) {
+    public void asyncRequest(DelayedWrite request, Consumer<DatabaseException> callback) {
         assert (request != null);
         getWriteRequestScheduler().scheduleRequest(request, callback, null, Boolean.TRUE);
     }
@@ -269,19 +264,14 @@ final public class WriteGraphImpl extends ReadGraphImpl implements WriteGraph {
     @Override
     public void asyncRequest(final Write r) {
         assert (r != null);
-        getWriteRequestScheduler().scheduleRequest(r, new Callback<DatabaseException>() {
-
-                       @Override
-                       public void run(DatabaseException parameter) {
-                               if(parameter != null)
-                                       Logger.defaultLogError(parameter);
-                       }
-               
+        getWriteRequestScheduler().scheduleRequest(r, e -> {
+            if(e != null)
+                Logger.defaultLogError(e);
         }, null, Boolean.TRUE);
     }
 
     @Override
-    public void asyncRequest(Write request, Callback<DatabaseException> callback) {
+    public void asyncRequest(Write request, Consumer<DatabaseException> callback) {
         assert (request != null);
         getWriteRequestScheduler().scheduleRequest(request, callback, null, Boolean.TRUE);
     }
@@ -289,19 +279,14 @@ final public class WriteGraphImpl extends ReadGraphImpl implements WriteGraph {
     @Override
     public void asyncRequest(WriteOnly request) {
         assert (request != null);
-        getWriteRequestScheduler().scheduleRequest(request, new Callback<DatabaseException>() {
-
-                       @Override
-                       public void run(DatabaseException parameter) {
-                               if(parameter != null)
-                                       Logger.defaultLogError(parameter);
-                       }
-               
+        getWriteRequestScheduler().scheduleRequest(request, e -> {
+            if(e != null)
+                Logger.defaultLogError(e);
         }, null, Boolean.TRUE);
     }
     
     @Override
-    public void asyncRequest(WriteOnly request, Callback<DatabaseException> callback) {
+    public void asyncRequest(WriteOnly request, Consumer<DatabaseException> callback) {
         assert (request != null);
         getWriteRequestScheduler().scheduleRequest(request, callback, null, Boolean.TRUE);
     }