X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d.vtk%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fvtk%2Fcommon%2FAbstractVTKNodeMap.java;h=a03e89cbc8e1fc6273708686fa5fcc4174b95dde;hb=refs%2Fchanges%2F00%2F3500%2F1;hp=bb5493f6b7a76ee806d712d402691f5b862cdc8d;hpb=251cee0bb175b6a6ed1123509bc7a54c22d3443d;p=simantics%2F3d.git

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
index bb5493f6..a03e89cb 100644
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
+import java.util.function.Consumer;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Session;
@@ -40,7 +41,6 @@ import org.simantics.g3d.scenegraph.base.ParentNode;
 import org.simantics.objmap.exceptions.MappingException;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.objmap.graph.IMappingListener;
-import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.datastructures.MapList;
 import org.simantics.utils.datastructures.MapSet;
 import org.simantics.utils.datastructures.Pair;
@@ -53,7 +53,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	private static final boolean DEBUG = false;
 	
 	protected Session session;
-	protected IMapping<DBObject,E> mapping;
+	protected IMapping<DBObject, INode> mapping;
 	protected VtkView view;
 	
 	private MapList<E, vtkProp> nodeToActor = new MapList<E, vtkProp>();
@@ -66,7 +66,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	protected int redoOpCount = 0;
 	protected boolean runUndo = false;
 	protected boolean runRedo = false;
-	public AbstractVTKNodeMap(Session session, IMapping<DBObject,E> mapping, VtkView view, ParentNode<E> rootNode) {
+	public AbstractVTKNodeMap(Session session, IMapping<DBObject,INode> mapping, VtkView view, ParentNode<E> rootNode) {
 		this.session = session;
 		this.mapping = mapping;
 		this.view = view;
@@ -109,7 +109,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	@SuppressWarnings("unchecked")
 	@Override
 	public Collection<vtkProp> getRenderObjects(INode node) {
-		return nodeToActor.getValues((E)node);
+		return nodeToActor.getValues((E) node);
 	}
 	
 	protected <T extends vtkProp> void map(E node, Collection<T> props) {
@@ -127,7 +127,6 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	    nodeToActor.remove(node);
 	}
 	
-	@SuppressWarnings("unchecked")
 	@Override
 	public ParentNode<E> getRootNode() {
 		return (ParentNode<E>)rootNode;
@@ -188,12 +187,11 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 		
 	}
 	
-	@SuppressWarnings("unchecked")
 	@Override
 	public void updateRenderObjectsFor(E node) {
 		List<vtkProp> toDelete = new ArrayList<vtkProp>();
 		view.lock();
-		for (vtkProp prop : nodeToActor.getValues((E)node)) {
+		for (vtkProp prop : nodeToActor.getValues(node)) {
 			if (prop.GetVTKId() != 0) {
 				view.getRenderer().RemoveActor(prop);
 				//prop.Delete();
@@ -202,12 +200,12 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 			actorToNode.remove(prop);
 		}
 		view.unlock();
-		nodeToActor.remove((E)node);
-		Collection<vtkProp> coll = getActors((E)node);
+		nodeToActor.remove(node);
+		Collection<vtkProp> coll = getActors(node);
 		if (coll != null) {
 			for (vtkProp prop : coll) {
-				nodeToActor.add((E)node,prop);
-				actorToNode.put(prop, (E)node);
+				nodeToActor.add(node,prop);
+				actorToNode.put(prop, node);
 				toDelete.remove(prop);
 			}
 		}
@@ -253,7 +251,6 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 		repaint();
 	}
 	
-	@SuppressWarnings("unchecked")
 	private void receiveUpdate(E node, String id, boolean db) {
 		if (DEBUG) System.out.println("receiveUpdate " + debugString(node)  + " " + id + " " + db);
 		synchronized (syncMutex) {
@@ -296,10 +293,10 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 				commit(graph);
 			}
 			
-		}, new Callback<DatabaseException>() {
+		}, new Consumer<DatabaseException>() {
 			
 			@Override
-			public void run(DatabaseException parameter) {
+			public void accept(DatabaseException parameter) {
 				if (parameter != null)
 					ExceptionUtils.logAndShowError("Cannot commit editor changes", parameter);
 			}
@@ -326,7 +323,6 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 		if (DEBUG)System.out.println("domainModified");
 		session.asyncRequest(new ReadRequest() {
 			
-			@SuppressWarnings("unchecked")
 			@Override
 			public void run(ReadGraph graph) throws DatabaseException {
 				update(graph);
@@ -359,7 +355,8 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 			synchronized (syncMutex) {
 				graphUpdates = true;
 				for (DBObject domainObject : mapping.getDomainModified()) {
-					E rangeObject = mapping.get(domainObject);
+					@SuppressWarnings("unchecked")
+					E rangeObject = (E) mapping.get(domainObject);
 					if (rangeObject != null)
 						graphModified.add(rangeObject);
 				}
@@ -415,6 +412,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	 * This code here synchronizes removed and added objects to collect deletable objects. (a deletable object is one which is removed but not added).  
 	 * 
 	 */
+	@SuppressWarnings("unused")
 	protected void syncDeletes() {
 		deleteUC.clear();
 		for (Pair<E, String> n : removed) {
@@ -436,6 +434,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	/**
 	 * Clears deletable objects from mapping cache.
 	 */
+	@SuppressWarnings("unused")
 	protected void clearDeletes() {
 		if (DEBUG && delete.size() > 0) System.out.println("Delete");
 		for (E n : delete) {
@@ -682,7 +681,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 		
 	}
 	
-	public IMapping<DBObject,E> getMapping() {
+	public IMapping<DBObject,INode> getMapping() {
 		return mapping;
 	}