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=f9687f587fc67d15d54f22a3f77f7453e6c1f585;hb=1a25726897311e0277de2476c40bf2ae7c93ed86;hp=adfcc6527cf717428885a62e490d0ba95a26c2f9;hpb=87cee3d9fefb2d9d238527b6fd5267e215eb1960;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 adfcc652..f9687f58 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 VTT Technical Research Centre of Finland and others.
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -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;
@@ -38,7 +37,7 @@ import org.simantics.proconf.g3d.scenegraph.IGeometryNode;
 import org.simantics.proconf.g3d.scenegraph.IGraphicsNode;
 import org.simantics.proconf.g3d.scenegraph.RootGraphicsNode;
 import org.simantics.proconf.g3d.stubs.G3DNode;
-import org.simantics.utils.ErrorLogger;
+import org.simantics.utils.ui.ErrorLogger;
 import org.simantics.utils.datastructures.BijectionMap;
 
 import com.jme.scene.Node;
@@ -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)) {
@@ -339,7 +338,7 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
             	if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId() + ") already in view");
                 return inView;
             } else {
-            	if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId() + ") already in view, but has different parent, current parent is ("+inView.getParent().getResource()+") and node is added to  ("+parent+") -> removing from old parent and inserting to new");
+            	if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId() + ") already in view, but has different parent, current parent is ("+inView.getParent().getResource().getResourceId()+") and node is added to  ("+parent+") -> removing from old parent and inserting to new");
                 removeNode(inView.getParent().getResource(),r.getResource());
             }
         }
@@ -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;
         }
-    	
     }
     
     /**