X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fgraph%2FReadGraphImpl.java;h=ff127a09b93fae51ac2c3793e7169f417b444d5e;hb=627664d06302d454ea3b3fe14d13bb5ab739d666;hp=9b6d74044ccacc0d27e0039d3646ed0b9d5fabe7;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
index 9b6d74044..ff127a09b 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.simantics.db.impl.graph;
 
-import gnu.trove.map.hash.TObjectIntHashMap;
-
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,6 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import org.eclipse.core.runtime.Platform;
 import org.simantics.databoard.Accessors;
@@ -181,10 +180,11 @@ import org.simantics.scl.reflection.ValueNotFoundException;
 import org.simantics.scl.runtime.function.Function3;
 import org.simantics.utils.DataContainer;
 import org.simantics.utils.Development;
-import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.collections.CollectionUtils;
 
+import gnu.trove.map.hash.TObjectIntHashMap;
+
 public class ReadGraphImpl implements ReadGraph {
 
     final static boolean EMPTY_RESOURCE_CHECK = false;
@@ -1949,7 +1949,7 @@ public class ReadGraphImpl implements ReadGraph {
 
 	}
 
-	final AsyncProcedure NONE = new AsyncProcedure() {
+	final AsyncProcedure<?> NONE = new AsyncProcedure<Object>() {
 
 		@Override
 		public void execute(AsyncReadGraph graph, Object result) {
@@ -2152,7 +2152,7 @@ public class ReadGraphImpl implements ReadGraph {
 
 		if (parent != null || listener != null || ((request.getFlags() & RequestFlags.SCHEDULE) > 0)) {
 
-			Object syncParent = request;
+//			Object syncParent = request;
 
 //			final ReadGraphImpl newGraph = newSync();
 
@@ -2180,7 +2180,7 @@ public class ReadGraphImpl implements ReadGraph {
 			// System.out.println("direct call " + request );
 
 			// Do not set the sync state.parent for external threads
-			Object syncParent = request;
+//			Object syncParent = request;
 
 //			final ReadGraphImpl newGraph = newSync();
 
@@ -2342,7 +2342,7 @@ public class ReadGraphImpl implements ReadGraph {
 
 		if (parent != null || listener != null) {
 
-			Object syncParent = request;
+//			Object syncParent = request;
 
 //			final ReadGraphImpl newGraph = newSync();
 
@@ -2352,7 +2352,7 @@ public class ReadGraphImpl implements ReadGraph {
 
 		} else {
 
-			Object syncParent = request;
+//			Object syncParent = request;
 
 //			final ReadGraphImpl newGraph = newSync();
 
@@ -2471,7 +2471,7 @@ public class ReadGraphImpl implements ReadGraph {
 
 		if (parent != null || listener != null) {
 
-			Object syncParent = request;
+//			Object syncParent = request;
 
 //			final ReadGraphImpl newGraph = newSync();
 
@@ -2519,7 +2519,7 @@ public class ReadGraphImpl implements ReadGraph {
 
 		if (parent != null || listener != null) {
 
-			Object syncParent = request;
+//			Object syncParent = request;
 
 //			final ReadGraphImpl newGraph = newSync();
 
@@ -2529,7 +2529,7 @@ public class ReadGraphImpl implements ReadGraph {
 
 		} else {
 
-			Object syncParent = request;
+//			Object syncParent = request;
 
 //			final ReadGraphImpl newGraph = newSync();
 
@@ -5912,7 +5912,7 @@ public class ReadGraphImpl implements ReadGraph {
 	}
 	
 	@Override
-	public void asyncRequest(Write request, Callback<DatabaseException> callback) {
+	public void asyncRequest(Write request, Consumer<DatabaseException> callback) {
 		
 		assert (request != null);
 		
@@ -5936,7 +5936,7 @@ public class ReadGraphImpl implements ReadGraph {
 	
 	@Override
 	public void asyncRequest(DelayedWrite r,
-			Callback<DatabaseException> callback) {
+			Consumer<DatabaseException> callback) {
 		throw new Error("Not implemented.");
 	}
 
@@ -5955,7 +5955,7 @@ public class ReadGraphImpl implements ReadGraph {
 	}
 	
 	@Override
-	public void asyncRequest(WriteOnly r, Callback<DatabaseException> callback) {
+	public void asyncRequest(WriteOnly r, Consumer<DatabaseException> callback) {
 		throw new Error("Not implemented.");
 	}
 
@@ -6470,7 +6470,6 @@ public class ReadGraphImpl implements ReadGraph {
     	}
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public Variant getVariantValue2(Resource r, Object context) throws DatabaseException {
         Layer0 L0 = processor.getL0(this);