White space clean-up

[simantics/3d.git] / org.simantics.g3d.csg / src / org / simantics / g3d / csg / editor / CSGEditor2.java

diff --git a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/editor/CSGEditor2.java b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/editor/CSGEditor2.java
index bed448737e623040ddf4ca9809f62e3d3135e3d5..91b51419c0704a78b72d6cf25f9b5687adfe43c5 100644 (file)
--- a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/editor/CSGEditor2.java
+++ b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/editor/CSGEditor2.java
@@ -283,12 +283,12 @@ public class CSGEditor2  extends ResourceEditorPart {
                ren1.SetBackground(0.9,0.9,0.9);
                ren1.SetGradientBackground(true);
 
-          // vtkActor grid = vtkShape.createGridActor(8,1.0,1|2|4);
-           vtkActor grid = vtkShape.createGridActor(8,1.0, 2 );
-           grid.SetPickable(0);
-           ren1.AddActor(grid);
-           panel.addDeletable(grid);
-           
+               // vtkActor grid = vtkShape.createGridActor(8,1.0,1|2|4);
+               vtkActor grid = vtkShape.createGridActor(8,1.0, 2 );
+               grid.SetPickable(0);
+               ren1.AddActor(grid);
+               panel.addDeletable(grid);
+               
 
                
        }
@@ -296,24 +296,24 @@ public class CSGEditor2  extends ResourceEditorPart {
        protected Menu contextMenu;
        
        protected void hookContextMenu() {
-        MenuManager menuMgr = new MenuManager("#PopupMenu");
-        menuMgr.setRemoveAllWhenShown(true);
-        menuMgr.addMenuListener(new IMenuListener() {
-            public void menuAboutToShow(IMenuManager manager) {
-               final IMenuManager m = manager;
-                       List<IG3DNode> selected = selectionProvider.getSelectedNodes();
-                       if (selected.size() == 0) {
-                               m.add(new AddPrimitiveAction2(rootNode, BarrelNode.class));
-                               m.add(new AddPrimitiveAction2(rootNode, BoxNode.class));
-                               m.add(new AddPrimitiveAction2(rootNode, ConeNode.class));
-                               m.add(new AddPrimitiveAction2(rootNode, CylinderNode.class));
-                               m.add(new AddPrimitiveAction2(rootNode, EllipticCylinderNode.class));
-                               m.add(new AddPrimitiveAction2(rootNode, RectangularSolidNode.class));
-                               m.add(new AddPrimitiveAction2(rootNode, RegularPrismNode.class));
-                               m.add(new AddPrimitiveAction2(rootNode, SphereNode.class));
-                               m.add(new AddPrimitiveAction2(rootNode, TorusNode.class));
-                       } else if (selected.size() == 1) {
-                               m.add(translateAction);
+               MenuManager menuMgr = new MenuManager("#PopupMenu");
+               menuMgr.setRemoveAllWhenShown(true);
+               menuMgr.addMenuListener(new IMenuListener() {
+                       public void menuAboutToShow(IMenuManager manager) {
+                               final IMenuManager m = manager;
+                               List<IG3DNode> selected = selectionProvider.getSelectedNodes();
+                               if (selected.size() == 0) {
+                                       m.add(new AddPrimitiveAction2(rootNode, BarrelNode.class));
+                                       m.add(new AddPrimitiveAction2(rootNode, BoxNode.class));
+                                       m.add(new AddPrimitiveAction2(rootNode, ConeNode.class));
+                                       m.add(new AddPrimitiveAction2(rootNode, CylinderNode.class));
+                                       m.add(new AddPrimitiveAction2(rootNode, EllipticCylinderNode.class));
+                                       m.add(new AddPrimitiveAction2(rootNode, RectangularSolidNode.class));
+                                       m.add(new AddPrimitiveAction2(rootNode, RegularPrismNode.class));
+                                       m.add(new AddPrimitiveAction2(rootNode, SphereNode.class));
+                                       m.add(new AddPrimitiveAction2(rootNode, TorusNode.class));
+                               } else if (selected.size() == 1) {
+                                       m.add(translateAction);
                                        m.add(rotateAction);
                                        m.add(removeAction);
                                        ICSGnode node = (ICSGnode)selected.get(0);
@@ -323,16 +323,16 @@ public class CSGEditor2  extends ResourceEditorPart {
                                        if (node instanceof CSGparentNode) {
                                                m.add(new SplitBooleanOpAction2(rootNode,(CSGparentNode)node));
                                        }
-                       } else if (selected.size() == 2) {
-                               if (selected.get(0).getParent().equals(rootNode) && selected.get(1).getParent().equals(rootNode)) {
-                                       Collection<ICSGnode> nodes = new ArrayList<ICSGnode>();
-                                       for (IG3DNode n : selected)
-                                               nodes.add((ICSGnode)n);
-                                       m.add(new AddBooleanOpAction2(rootNode, DifferenceNode.class, nodes));
-                                       m.add(new AddBooleanOpAction2(rootNode, IntersectionNode.class, nodes));
-                                       m.add(new AddBooleanOpAction2(rootNode, UnionNode.class, nodes));
-                               }
-                       }
+                               } else if (selected.size() == 2) {
+                                       if (selected.get(0).getParent().equals(rootNode) && selected.get(1).getParent().equals(rootNode)) {
+                                               Collection<ICSGnode> nodes = new ArrayList<ICSGnode>();
+                                               for (IG3DNode n : selected)
+                                                       nodes.add((ICSGnode)n);
+                                               m.add(new AddBooleanOpAction2(rootNode, DifferenceNode.class, nodes));
+                                               m.add(new AddBooleanOpAction2(rootNode, IntersectionNode.class, nodes));
+                                               m.add(new AddBooleanOpAction2(rootNode, UnionNode.class, nodes));
+                                       }
+                               }
 //             try {
 //                                     SimanticsUI.getSession().syncRequest(new ReadRequest() {
 //                                             
@@ -389,12 +389,12 @@ public class CSGEditor2  extends ResourceEditorPart {
 //                                     // TODO Auto-generated catch block
 //                                     e.printStackTrace();
 //                             }
-                
-            }
-        });
+                               
+                       }
+               });
 
-        contextMenu = menuMgr.createContextMenu(parent);
-    }
+               contextMenu = menuMgr.createContextMenu(parent);
+       }
        
        private IContentOutlinePage createOutline() {
                if (rootNode == null || selectionProvider == null)