White space clean-up

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / editor / P3DNodeMap.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
index 833cea3cbe77e9e044d93071be27c438a3244a7f..10e914de4e142868d099815b958af4cebfd661c3 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
@@ -13,7 +13,7 @@ import org.simantics.g3d.ontology.G3D;
 import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.scenegraph.base.ParentNode;
 import org.simantics.g3d.vtk.common.AbstractVTKNodeMap;
-import org.simantics.g3d.vtk.common.InteractiveVtkPanel;
+import org.simantics.g3d.vtk.common.VtkView;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.IP3DNode;
@@ -24,7 +24,6 @@ import org.simantics.plant3d.scenegraph.ParameterizedNode;
 import org.simantics.plant3d.scenegraph.PipeRun;
 import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
 import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
-import org.simantics.utils.threads.AWTThread;
 
 import vtk.vtkProp;
 import vtk.vtkProp3D;
@@ -33,7 +32,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
        
        private static final boolean DEBUG = false;
 
-       public P3DNodeMap(Session session, IMapping mapping, InteractiveVtkPanel panel, P3DRootNode rootNode) {
+       public P3DNodeMap(Session session, IMapping mapping, VtkView panel, P3DRootNode rootNode) {
                super(session, mapping, panel, rootNode);
                rootNode.setNodeMap(this);
        }
@@ -60,7 +59,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                }
                
                if (ids.contains(Plant3D.URIs.hasGeometry)) {
-                       node.visualize(panel);
+                       node.visualize(view);
                        updateRenderObjectsFor(node);
                        updateTransform(node);
                } 
@@ -68,7 +67,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                        ParameterizedNode geom = (ParameterizedNode)n;
                        for (String id : geom.getParameterMap().keySet()) {
                                if (ids.contains(id)) {
-                                       node.visualize(panel);
+                                       node.visualize(view);
                                        updateRenderObjectsFor(node);
                                        updateTransform(node);
                                        break;
@@ -95,7 +94,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
        private void updateTransform(IP3DNode node) {
                if (DEBUG) System.out.println("P3DNodeMap update Transform " + node);
 
-               node.update(panel.GetRenderer());
+               node.update(view.getRenderer());
                
                if (node instanceof ParentNode<?>) {
                        ParentNode<IP3DNode> p = (ParentNode<IP3DNode>)node;
@@ -140,16 +139,16 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                
                if (hasActor(node))
                        return;
-               if (Thread.currentThread() != AWTThread.getThreadAccess().getThread())
+               if (Thread.currentThread() != view.getThreadQueue().getThread())
                        throw new RuntimeException("Illegal thread.");
                
-               panel.lock();
+               view.lock();
                
-               node.visualize(panel);
+               node.visualize(view);
 
                for (vtkProp3D act : node.getActors()) {
                        nodeToActor.add(node, act);
-            actorToNode.put(act, node);
+                       actorToNode.put(act, node);
                }
                
                if (node instanceof P3DParentNode<?>) {
@@ -160,7 +159,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                
                updateTransform(node);
 
-        panel.unlock();
+               view.unlock();
 
        }
        
@@ -174,7 +173,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
        }
        
        private void remActor(IP3DVisualNode node) {
-               if (Thread.currentThread() != AWTThread.getThreadAccess().getThread())
+               if (Thread.currentThread() != view.getThreadQueue().getThread())
                        throw new RuntimeException("Illegal thread.");
 
                List<vtkProp> list = nodeToActor.getValues(node);
@@ -183,11 +182,11 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                                actorToNode.remove(obj);        
                        }
                        nodeToActor.remove(node);
-                       panel.lock();
+                       view.lock();
                        
                        node.stopVisualize();
                        
-                       panel.unlock();
+                       view.unlock();
                }
        }
        
@@ -200,10 +199,10 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
        }
        
        @Override
-       public void commit() {
+       public void commit(String commitMessage) {
                validate();
 //             System.out.println("Graph commit");
-               super.commit();
+               super.commit(commitMessage);
                
        }
        @Override