/*******************************************************************************\r
- * Copyright (c) 2007 VTT Technical Research Centre of Finland and others.\r
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.\r
* All rights reserved. This program and the accompanying materials\r
* are made available under the terms of the Eclipse Public License v1.0\r
* which accompanies this distribution, and is available at\r
import java.util.List;\r
import java.util.Queue;\r
import java.util.Set;\r
-import java.util.Stack;\r
import java.util.concurrent.ConcurrentLinkedQueue;\r
\r
import org.simantics.db.AbstractQuery;\r
import org.simantics.proconf.g3d.scenegraph.IGraphicsNode;\r
import org.simantics.proconf.g3d.scenegraph.RootGraphicsNode;\r
import org.simantics.proconf.g3d.stubs.G3DNode;\r
-import org.simantics.utils.ErrorLogger;\r
+import org.simantics.utils.ui.ErrorLogger;\r
import org.simantics.utils.datastructures.BijectionMap;\r
\r
import com.jme.scene.Node;\r
*/\r
protected IGraphicsNode addNode(IEntity parent, IEntity r) {\r
if (!r.isInstanceOf(Resources.g3dResource.G3DNode)) {\r
- ErrorLogger.defaultLogError("Trying to add node into scenegraph that is not instance of graphicsnode " + r,new Exception("ASSERT!"));\r
+ ErrorLogger.defaultLogError("Trying to add node into scenegraph that is not instance of G3DNode " + r,new Exception("ASSERT!"));\r
return null;\r
}\r
if (parent.equals(r)) {\r
if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId() + ") already in view");\r
return inView;\r
} else {\r
- 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");\r
+ 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");\r
removeNode(inView.getParent().getResource(),r.getResource());\r
}\r
}\r
public abstract class NodeQuery extends AbstractQuery<Object>{\r
protected Resource nodeResource;\r
private boolean disposed = false;\r
- private IQueryListener listener;\r
- //private OverridingTransactionRunner runner;\r
\r
+ private IQueryListener listener = null;\r
\r
public NodeQuery(Resource r) {\r
this.nodeResource = r;\r
- //runner = new OverridingTransactionRunner(session,true);\r
- \r
}\r
\r
protected abstract Object compute2(Graph graph);\r
if (disposed)\r
throw new RuntimeException("Updating disposed query"); //return;\r
transactionRunner.run(new GraphRequestAdapter() {\r
- //session.asyncWrite(new GraphRequestAdapter() {\r
@Override\r
public GraphRequestStatus perform(Graph g) throws Exception {\r
if (!disposed) {\r
if (DEBUG) System.out.println("NodeQuery " + nodeResource + " disposed()" + " " + this.getClass());\r
}\r
\r
- //public abstract NodeQuery instantiateQuery(Resource node);\r
- //public abstract void attach();\r
- \r
@Override\r
public boolean isDisposed() {\r
return disposed;\r
}\r
\r
+ // without separate listener, this query would work only once\r
@Override\r
public IQueryListener getListener() {\r
if (listener == null) {\r
}\r
return listener;\r
}\r
- \r
}\r
\r
/**\r