X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fscl%2FScriptNodeMap.java;h=fc63fffc381cb2b5cb8da82d4ee349828496aa3d;hb=e7804ee146821cf2ea38e4671c5efdeaf73bf479;hp=37b124e3f49757fdf2461ac3a8b9ceb012221041;hpb=53d55c24c779745f188bdb18d32f71d20acb61b2;p=simantics%2F3d.git

diff --git a/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java b/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
index 37b124e3..fc63fffc 100644
--- a/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
@@ -1,15 +1,17 @@
 package org.simantics.g3d.scl;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.Stack;
 
 import org.simantics.db.ReadGraph;
-import org.simantics.db.Session;
+import org.simantics.db.RequestProcessor;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.common.request.WriteRequest;
@@ -25,6 +27,8 @@ import org.simantics.objmap.graph.IMapping;
 import org.simantics.objmap.graph.IMappingListener;
 import org.simantics.utils.datastructures.MapSet;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * NodeMap implementation used with SCL scripts.
@@ -40,12 +44,12 @@ import org.simantics.utils.datastructures.Pair;
  *
  * @param <E>
  */
-public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E>, IMappingListener, NodeListener {
+public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap<DBObject,Object,E>, IMappingListener, NodeListener {
 
-	private static final boolean DEBUG = false;
+	private static final Logger LOGGER = LoggerFactory.getLogger(ScriptNodeMap.class);
 	
-	protected Session session;
-	protected IMapping<Object,E> mapping;
+	protected RequestProcessor session;
+	protected IMapping<DBObject,INode> mapping;
 	
 	protected ParentNode<E> rootNode;
 	
@@ -53,7 +57,7 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	
 	private boolean dirty = false;
 	
-	public ScriptNodeMap(Session session, IMapping<Object,E> mapping, ParentNode<E> rootNode) {
+	public ScriptNodeMap(RequestProcessor session, IMapping<DBObject,INode> mapping, ParentNode<E> rootNode) {
 		this.session = session;
 		this.mapping = mapping;
 		this.rootNode = rootNode;
@@ -89,10 +93,9 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 		return Collections.EMPTY_LIST;
 	}
 	
-	@SuppressWarnings("unchecked")
 	@Override
 	public ParentNode<E> getRootNode() {
-		return (ParentNode<E>)rootNode;
+		return rootNode;
 	}
 	
 	
@@ -118,16 +121,14 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 
 	private boolean rangeModified = false;
 	
-	@SuppressWarnings("unchecked")
 	@Override
 	public void updateRenderObjectsFor(E node) {
-		nodes.add((E)node);
-
+		nodes.add(node);
 	}
 	
 	@SuppressWarnings("unchecked")
 	private void receiveAdd(E node, String id, boolean db) {
-		if (DEBUG) System.out.println("receiveAdd " + debugString(node)  + " " + id + " " + db);
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("receiveAdd " + debugString(node)  + " " + id + " " + db);
 		synchronized (syncMutex) {
 			for (Pair<E, String> n : added) {
 				if (n.first.equals(node))
@@ -144,7 +145,7 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	
 	@SuppressWarnings("unchecked")
 	private void receiveRemove(E node, String id, boolean db) {
-		if (DEBUG) System.out.println("receiveRemove " + debugString(node)  + " " + id + " " + db);
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("receiveRemove " + debugString(node)  + " " + id + " " + db);
 		synchronized (syncMutex) {
 			for (Pair<E, String> n : removed) {
 				if (n.first.equals(node))
@@ -158,9 +159,8 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 		repaint();
 	}
 	
-	@SuppressWarnings("unchecked")
 	private void receiveUpdate(E node, String id, boolean db) {
-		if (DEBUG) System.out.println("receiveUpdate " + debugString(node)  + " " + id + " " + db);
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("receiveUpdate " + debugString(node)  + " " + id + " " + db);
 		synchronized (syncMutex) {
 //          for (Pair<E, String> n : updated) {
 //              if (n.first.equals(node))
@@ -192,7 +192,7 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 			
 			@Override
 			public void perform(WriteGraph graph) throws DatabaseException {
-				if (DEBUG) System.out.println("Commit " + commitMessage);
+				if (LOGGER.isTraceEnabled()) LOGGER.trace("Commit " + commitMessage);
 				if (commitMessage != null) {
 					Layer0Utils.addCommentMetadata(graph, commitMessage);
 					graph.markUndoPoint();
@@ -206,12 +206,12 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	
 	protected void commit(WriteGraph graph) throws DatabaseException {
 		synchronized(syncMutex) {
-			if (DEBUG) System.out.println("Commit");
+			if (LOGGER.isTraceEnabled()) LOGGER.trace("Commit");
 			graphUpdates = true;
 			mapping.updateDomain(graph);
 			graphUpdates = false;
 			clearDeletes();
-			if (DEBUG) System.out.println("Commit done");
+			if (LOGGER.isTraceEnabled()) LOGGER.trace("Commit done");
 		}
 	}
 	
@@ -221,7 +221,7 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	public void domainModified() {
 		if (graphUpdates)
 			return;
-		if (DEBUG)System.out.println("domainModified");
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("domainModified");
 		// FIXME : this is called by IMapping id DB thread
 		dirty = true;
 //        session.asyncRequest(new ReadRequest() {
@@ -236,11 +236,11 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	}
 	
 	protected void reset(ReadGraph graph) throws MappingException {
-		if (DEBUG) System.out.println("Reset");
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("Reset");
 		synchronized (syncMutex) {
 			graphUpdates = true;
 			mapping.getRangeModified().clear();
-			for (Object o : mapping.getDomain())
+			for (DBObject o : mapping.getDomain())
 				mapping.domainModified(o);
 			mapping.updateRange(graph);
 			graphModified.clear();
@@ -249,11 +249,12 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	}
 	
 	protected void update(ReadGraph graph) throws DatabaseException {
-		if (DEBUG) System.out.println("Graph update start");
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("Graph update start");
 		synchronized (syncMutex) {
 			graphUpdates = true;
-			for (Object domainObject : mapping.getDomainModified()) {
-				E rangeObject = mapping.get(domainObject);
+			for (DBObject domainObject : mapping.getDomainModified()) {
+				@SuppressWarnings("unchecked")
+				E rangeObject = (E) mapping.get(domainObject);
 				if (rangeObject != null)
 					graphModified.add(rangeObject);
 			}
@@ -268,7 +269,7 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 		//if (mapping.isRangeModified() && !runUndo) // FIXME : redo?
 		if (mapping.isRangeModified())
 			commit((String)null);
-		if (DEBUG) System.out.println("Graph update done");
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("Graph update done");
 	}
 	
 	@Override
@@ -288,7 +289,6 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 				doCommit();
 			}
 			session.syncRequest(new ReadRequest() { 
-				@SuppressWarnings("unchecked")
 				@Override
 				public void run(ReadGraph graph) throws DatabaseException {
 					update(graph);
@@ -317,6 +317,7 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	 * 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) {
@@ -325,10 +326,10 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 		for (Pair<E, String> n : added) {
 			deleteUC.remove(n.first);   
 		} 
-		if (DEBUG && deleteUC.size() > 0) {
-			System.out.println("Delete sync");
+		if (LOGGER.isTraceEnabled() && deleteUC.size() > 0) {
+			LOGGER.trace("Delete sync");
 			for (E n : delete) {
-				System.out.println(debugString(n));
+				LOGGER.trace(debugString(n));
 			}
 		}
 		delete.addAll(deleteUC);
@@ -338,10 +339,11 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	/**
 	 * Clears deletable objects from mapping cache.
 	 */
+	@SuppressWarnings("unused")
 	protected void clearDeletes() {
-		if (DEBUG && delete.size() > 0) System.out.println("Delete");
+		if (LOGGER.isTraceEnabled() && delete.size() > 0) LOGGER.trace("Delete");
 		for (E n : delete) {
-			if (DEBUG) System.out.println(debugString(n));
+			if (LOGGER.isTraceEnabled()) LOGGER.trace(debugString(n));
 			mapping.getRange().remove(n);
 		}
 		delete.clear();
@@ -360,6 +362,27 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 		
 		
 		synchronized (syncMutex) {
+		    // Check for overlapping additions and deletions, prevent deleting objects that are also added.
+            Deque<E> stack = new ArrayDeque<E>();
+            for (Pair<E, String> n : added) {
+                stack.add(n.first);
+            }
+            while (!stack.isEmpty()) {
+                E n = stack.pop();
+                for (int i = removed.size()-1; i >= 0; i--) {
+                    if (removed.get(i).first == n) {
+                        removed.remove(i);
+                        break;
+                    }
+                }
+                if (n instanceof ParentNode) {
+                    ParentNode<INode> pn = (ParentNode<INode>)n;
+                    for (INode cn : pn.getNodes()) {
+                        stack.push((E)cn);
+                    }
+                }
+            }
+            
 			rem.addAll(removed);
 			add.addAll(added);
 			for (E e : updated.getKeys()) {
@@ -491,7 +514,7 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	@Override
 	public <T extends INode> void nodeAdded(ParentNode<T> node, INode child,
 			String rel) {
-		if (DEBUG) System.out.println("Node added " + child + " parent " + node);
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("Node added " + child + " parent " + node);
 		//receiveAdd((E)child, rel ,graphUpdates);
 		receiveAdd((E)child, rel ,graphModified.contains(node));
 		
@@ -501,7 +524,7 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 	@Override
 	public <T extends INode> void nodeRemoved(ParentNode<T> node, INode child,
 			String rel) {
-		if (DEBUG) System.out.println("Node removed " + child + " parent " + node);
+		if (LOGGER.isTraceEnabled()) LOGGER.trace("Node removed " + child + " parent " + node);
 		//receiveRemove((E)child, rel, graphUpdates);
 		receiveRemove((E)child, rel, graphModified.contains(node));
 		
@@ -538,7 +561,8 @@ public abstract class ScriptNodeMap<E extends INode> implements NodeMap<Object,E
 		
 	}
 	
-	public IMapping<Object,E> getMapping() {
+	@Override
+	public IMapping<DBObject,INode> getMapping() {
 		return mapping;
 	}