X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.proconf.g3d%2Fsrc%2Forg%2Fsimantics%2Fproconf%2Fg3d%2Fbase%2FScenegraphAdapterImpl.java;h=d90b9dd0a3226b5db08eef62cc4f112ef89a9122;hb=7b23bd59260035f6f4b5958b0148e06883ee5a5f;hp=eb243735d45826d9f3d8057815f78e9fb894592e;hpb=f9e3fe0569bf1cf3bbcdbc56fb81c736cba086f9;p=simantics%2F3d.git

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
index eb243735..d90b9dd0 100644
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
@@ -17,7 +17,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Queue;
 import java.util.Set;
-import java.util.Stack;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.simantics.db.AbstractQuery;
@@ -318,7 +317,7 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
      */
     protected IGraphicsNode addNode(IEntity parent, IEntity r) {
         if (!r.isInstanceOf(Resources.g3dResource.G3DNode)) {
-            ErrorLogger.defaultLogError("Trying to add node into scenegraph that is not instance of graphicsnode " + r,new Exception("ASSERT!"));
+            ErrorLogger.defaultLogError("Trying to add node into scenegraph that is not instance of G3DNode " + r,new Exception("ASSERT!"));
             return null;
         }
         if (parent.equals(r)) {
@@ -473,14 +472,11 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
     public abstract class NodeQuery extends AbstractQuery<Object>{
         protected Resource nodeResource;
         private boolean disposed = false;
-        private IQueryListener listener;
-        //private OverridingTransactionRunner runner;
         
+        private IQueryListener listener = null;
     	
     	public NodeQuery(Resource r) {
     		this.nodeResource = r;
-    		//runner = new OverridingTransactionRunner(session,true);
-    		
     	}
     	
     	protected abstract Object compute2(Graph graph);
@@ -508,7 +504,6 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
     		if (disposed)
     			throw new RuntimeException("Updating disposed query"); //return;
     		transactionRunner.run(new GraphRequestAdapter() {
-    		//session.asyncWrite(new GraphRequestAdapter() {
         		@Override
         		public GraphRequestStatus perform(Graph g) throws Exception {
         			if (!disposed) {
@@ -543,14 +538,12 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
     		if (DEBUG) System.out.println("NodeQuery " +  nodeResource +  " disposed()" + " " + this.getClass());
     	}
     	
-    	//public abstract NodeQuery instantiateQuery(Resource node);
-    	//public abstract void attach();
-    	
         @Override
         public boolean isDisposed() {
             return disposed;
         }
         
+        // without separate listener, this query would work only once
         @Override
         public IQueryListener getListener() {
         	if (listener == null) {
@@ -568,7 +561,6 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
         	}
         	return listener;
         }
-    	
     }
     
     /**