Use Consumer interface instead of deprecated Callback interface

[simantics/platform.git] / bundles / org.simantics.event / src / org / simantics / event / view / handler / ClaimAction.java

diff --git a/bundles/org.simantics.event/src/org/simantics/event/view/handler/ClaimAction.java b/bundles/org.simantics.event/src/org/simantics/event/view/handler/ClaimAction.java
index 3e8d62cd2100b746fcd2aaedd0ee21d897517d7b..81f205f2613159f1edc0fe314c850f464ce708b7 100644 (file)
--- a/bundles/org.simantics.event/src/org/simantics/event/view/handler/ClaimAction.java
+++ b/bundles/org.simantics.event/src/org/simantics/event/view/handler/ClaimAction.java
@@ -1,74 +1,70 @@
-package org.simantics.event.view.handler;\r
-\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.jface.resource.ImageDescriptor;\r
-import org.simantics.Simantics;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.Session;\r
-import org.simantics.db.VirtualGraph;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.service.VirtualGraphSupport;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.utils.datastructures.Callback;\r
-import org.simantics.utils.ui.ErrorLogger;\r
-\r
-/**\r
- * @author Tuukka Lehtonen\r
- */\r
-public class ClaimAction extends Action {\r
-\r
-    protected final String   virtualGraphId;\r
-    protected final Resource subject;\r
-    protected final String   relationURI;\r
-    protected final Resource object;\r
-\r
-    /**\r
-     * @param label\r
-     * @param image\r
-     * @param virtualGraphId\r
-     * @param tagURI\r
-     * @param tag <code>true</code> to add tag, <code>false</code> to remove tag\r
-     * @param input\r
-     */\r
-    public ClaimAction(String label, ImageDescriptor image, String virtualGraphId, Resource subject, String relationURI, Resource object) {\r
-        super(label, image);\r
-\r
-        this.virtualGraphId = virtualGraphId;\r
-        this.subject = subject;\r
-        this.relationURI = relationURI;\r
-        this.object = object;\r
-    }\r
-\r
-    @Override\r
-    public void run() {\r
-        Session session = Simantics.peekSession();\r
-        if (session != null) {\r
-            VirtualGraph vg = virtualGraphId == null ? null :\r
-                session.getService(VirtualGraphSupport.class).getWorkspacePersistent(virtualGraphId);\r
-            session.asyncRequest(new WriteRequest(vg) {\r
-                @Override\r
-                public void perform(WriteGraph graph) throws DatabaseException {\r
-                    claim(graph);\r
-                }\r
-            }, new Callback<DatabaseException>() {\r
-                @Override\r
-                public void run(DatabaseException parameter) {\r
-                    if (parameter != null)\r
-                        ErrorLogger.defaultLogError(parameter);\r
-                }\r
-            });\r
-        }\r
-    }\r
-\r
-    public void claim(WriteGraph graph) throws DatabaseException {\r
-        Layer0 L0 = Layer0.getInstance(graph);\r
-        Resource relation = graph.getResource(relationURI);\r
-        boolean functional = graph.isInstanceOf(relation, L0.FunctionalRelation);\r
-        if (functional)\r
-            graph.deny(subject, relation);\r
-        graph.claim(subject, graph.getResource(relationURI), object);\r
-    }\r
-\r
-}\r
+package org.simantics.event.view.handler;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.simantics.Simantics;
+import org.simantics.db.Resource;
+import org.simantics.db.Session;
+import org.simantics.db.VirtualGraph;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.WriteRequest;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.service.VirtualGraphSupport;
+import org.simantics.layer0.Layer0;
+import org.simantics.utils.ui.ErrorLogger;
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public class ClaimAction extends Action {
+
+    protected final String   virtualGraphId;
+    protected final Resource subject;
+    protected final String   relationURI;
+    protected final Resource object;
+
+    /**
+     * @param label
+     * @param image
+     * @param virtualGraphId
+     * @param tagURI
+     * @param tag <code>true</code> to add tag, <code>false</code> to remove tag
+     * @param input
+     */
+    public ClaimAction(String label, ImageDescriptor image, String virtualGraphId, Resource subject, String relationURI, Resource object) {
+        super(label, image);
+
+        this.virtualGraphId = virtualGraphId;
+        this.subject = subject;
+        this.relationURI = relationURI;
+        this.object = object;
+    }
+
+    @Override
+    public void run() {
+        Session session = Simantics.peekSession();
+        if (session != null) {
+            VirtualGraph vg = virtualGraphId == null ? null :
+                session.getService(VirtualGraphSupport.class).getWorkspacePersistent(virtualGraphId);
+            session.asyncRequest(new WriteRequest(vg) {
+                @Override
+                public void perform(WriteGraph graph) throws DatabaseException {
+                    claim(graph);
+                }
+            }, e -> {
+                if (e != null)
+                    ErrorLogger.defaultLogError(e);
+            });
+        }
+    }
+
+    public void claim(WriteGraph graph) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        Resource relation = graph.getResource(relationURI);
+        boolean functional = graph.isInstanceOf(relation, L0.FunctionalRelation);
+        if (functional)
+            graph.deny(subject, relation);
+        graph.claim(subject, graph.getResource(relationURI), object);
+    }
+
+}