]> gerrit.simantics Code Review - simantics/3d.git/blobdiff - org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
Compiler warning elimination
[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / editor / Plant3DEditor.java
index 9d0c3b820a289e912a3be846b5c55fa748ab0897..b11cf90e98e2ea1dc35b116c20f1e5b1d8371db9 100644 (file)
@@ -1,6 +1,6 @@
 package org.simantics.plant3d.editor;
 
-import java.awt.Component;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -11,12 +11,10 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.simantics.db.ReadGraph;
@@ -24,38 +22,44 @@ import org.simantics.db.Resource;
 import org.simantics.db.Session;
 import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.g3d.scenegraph.IG3DNode;
 import org.simantics.g3d.scenegraph.NodeMap;
+import org.simantics.g3d.scenegraph.RenderListener;
 import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.vtk.action.RemoveAction;
-import org.simantics.g3d.vtk.action.RotateAction;
-import org.simantics.g3d.vtk.action.TranslateAction;
-import org.simantics.g3d.vtk.action.vtkCameraAndSelectorAction;
 import org.simantics.g3d.vtk.common.HoverHighlighter;
-import org.simantics.g3d.vtk.common.InteractiveVtkPanel;
 import org.simantics.g3d.vtk.common.NodeSelectionProvider2;
 import org.simantics.g3d.vtk.common.SelectionHighlighter;
+import org.simantics.g3d.vtk.common.VTKSelectionItem;
+import org.simantics.g3d.vtk.common.VtkView;
 import org.simantics.g3d.vtk.shape.vtkShape;
-import org.simantics.g3d.vtk.utils.vtkPanelUtil;
+import org.simantics.g3d.vtk.swt.ContextMenuListener;
+import org.simantics.g3d.vtk.swt.FocusAction;
+import org.simantics.g3d.vtk.swt.InteractiveVtkComposite;
+import org.simantics.g3d.vtk.swt.RotateAction;
+import org.simantics.g3d.vtk.swt.TranslateAction;
+import org.simantics.g3d.vtk.swt.vtkCameraAndSelectorAction;
+import org.simantics.g3d.vtk.utils.AxesDisplay;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.objmap.graph.Mappings;
 import org.simantics.objmap.graph.schema.IMappingSchema;
 import org.simantics.plant3d.actions.AddComponentAction;
 import org.simantics.plant3d.actions.AddEquipmentAction;
 import org.simantics.plant3d.actions.AddNozzleAction;
+import org.simantics.plant3d.actions.RemoveAndSplitAction;
 import org.simantics.plant3d.actions.RoutePipeAction;
+import org.simantics.plant3d.actions.TranslateFreeVariableLengthAction;
+import org.simantics.plant3d.actions.TranslateInlineAction;
+import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.EndComponent;
 import org.simantics.plant3d.scenegraph.Equipment;
 import org.simantics.plant3d.scenegraph.IP3DNode;
 import org.simantics.plant3d.scenegraph.InlineComponent;
 import org.simantics.plant3d.scenegraph.Nozzle;
 import org.simantics.plant3d.scenegraph.P3DRootNode;
-import org.simantics.plant3d.scenegraph.PipeRun;
 import org.simantics.plant3d.scenegraph.PipelineComponent;
 import org.simantics.plant3d.scenegraph.SchemaBuilder;
 import org.simantics.plant3d.scenegraph.TurnComponent;
 import org.simantics.plant3d.scenegraph.controlpoint.ControlPointFactory;
-import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
 import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
 import org.simantics.plant3d.utils.ComponentUtils;
 import org.simantics.plant3d.utils.Item;
@@ -64,40 +68,46 @@ import org.simantics.selectionview.StandardPropertyPage;
 import org.simantics.ui.workbench.IPropertyPage;
 import org.simantics.ui.workbench.IResourceEditorInput;
 import org.simantics.ui.workbench.ResourceEditorPart;
-import org.simantics.utils.threads.AWTThread;
 import org.simantics.utils.threads.ThreadUtils;
 import org.simantics.utils.ui.ExceptionUtils;
-import org.simantics.utils.ui.SWTAWTComponent;
 
 import vtk.vtkActor;
-import vtk.vtkAxesActor;
 import vtk.vtkCameraPass;
 import vtk.vtkDefaultPass;
+import vtk.vtkGaussianBlurPass;
 import vtk.vtkLightsPass;
-import vtk.vtkOrientationMarkerWidget;
+import vtk.vtkProp;
 import vtk.vtkRenderPassCollection;
 import vtk.vtkRenderer;
+import vtk.vtkSSAAPass;
 import vtk.vtkSequencePass;
+import vtk.vtkSimpleMotionBlurPass;
 
 
 public class Plant3DEditor extends ResourceEditorPart {
 
        private Composite parent;
        private Resource input;
-       private InteractiveVtkPanel panel;
-       private SWTAWTComponent component;
+//     private InteractiveVtkPanel panel;
+//     private SWTAWTComponent component;
+       private InteractiveVtkComposite panel;
        
        private P3DRootNode rootNode;
-       private IMapping<Resource,Object> mapping;
+       private IMapping<Resource,INode> mapping;
        
-       private NodeSelectionProvider2<Resource,Object> selectionProvider;
+       protected NodeSelectionProvider2<Resource, INode> selectionProvider;
        
-       private vtkCameraAndSelectorAction cameraAction;
-       private TranslateAction translateAction;
-       private RotateAction rotateAction;
-       private RemoveAction removeAction;
-       private RoutePipeAction routePipeAction;
-       private AddComponentAction addComponentAction;
+       
+       protected vtkCameraAndSelectorAction cameraAction;
+       protected FocusAction focusAction;
+       protected TranslateAction translateAction;
+       protected TranslateInlineAction translateInlineAction;
+       protected TranslateFreeVariableLengthAction translateFreeVariableLengthAction;
+       protected RotateAction rotateAction;
+       protected RemoveAction removeAction;
+       protected RemoveAndSplitAction removeSplitAction;
+       protected RoutePipeAction routePipeAction;
+       protected AddComponentAction addComponentAction;
        
        private P3DNodeMap nodeMap;
        
@@ -105,51 +115,40 @@ public class Plant3DEditor extends ResourceEditorPart {
        public void createPartControl(Composite parent) {
                this.parent = parent;
                parent.setLayout (new FillLayout ());
-               component = new SWTAWTComponent(parent,SWT.NONE) {
-                       
-                       @Override
-                       protected Component createSwingComponent() {
-                               if (panel == null) {
-                                       panel = new InteractiveVtkPanel();
-                                       vtkPanelUtil.registerPanel(panel);
-                                       createScene();
-                               }
-                               return panel;
-                       }
-               };
+//             component = new SWTAWTComponent(parent,SWT.NONE) {
+//                     
+//                     @Override
+//                     protected Component createSwingComponent() {
+//                             if (panel == null) {
+//                                     panel = new InteractiveVtkPanel();
+//                                     vtkPanelUtil.registerPanel(panel);
+//                                     createScene();
+//                             }
+//                             return panel;
+//                     }
+//             };
 
                IResourceEditorInput rei = (IResourceEditorInput)getEditorInput();
                input = rei.getResource();
                
+               panel = new InteractiveVtkComposite(parent);
+               
                
                //IActionBars actionBars = getEditorSite().getActionBars();
 
                hookContextMenu();
                
-               component.syncPopulate();
+               createScene();
                
-               panel.addMouseListener(new java.awt.event.MouseAdapter() {
-                       @Override
-                       public void mouseClicked(final java.awt.event.MouseEvent e) {
-                               if (e.getButton() == java.awt.event.MouseEvent.BUTTON3) {
-                                       Display.getDefault().asyncExec(new Runnable() {
-                                               public void run() {
-                                                       contextMenu.setLocation(e.getXOnScreen(), e.getYOnScreen());
-                                                       contextMenu.setVisible(true);
-                                               }
-                                       });
-                               }
-                       }
-               });
+               new ContextMenuListener(panel, contextMenu);
                
-
-               cameraAction = new vtkCameraAndSelectorAction(panel);   
+               cameraAction = createCameraAction();
                panel.setDefaultAction(cameraAction);
                panel.useDefaultAction();
                panel.setPickType(4);
                
                try {
-                       ControlPointFactory.preloadCache();
+                       ControlPointFactory.preloadCache(getLibraryUri());
                        ComponentUtils.preloadCache();
                } catch (Exception e) {
                        ExceptionUtils.logAndShowError("Cannot open Plant3D editor",e);
@@ -159,53 +158,25 @@ public class Plant3DEditor extends ResourceEditorPart {
                try {
                        getSession().syncRequest(new ReadRequest() {
                                
-                               @SuppressWarnings({ "rawtypes", "unchecked" })
                                @Override
                                public void run(ReadGraph graph) throws DatabaseException {
+                                   System.out.println("START PLANT3D LOAD");
                                        PipingRules.setEnabled(false);
-                                       IMappingSchema<Resource, Object> schema = getSchema(graph);
+                                       IMappingSchema<Resource,INode> schema = getSchema(graph);
                                        mapping = Mappings.createWithListening(schema);
                                        rootNode = (P3DRootNode)mapping.map(graph, input);
                                        // update control points.
                                        // TODO : this should be optimized.
+
                                        try {
-                                               for (INode node : rootNode.getChild()) {
-                                                       if (node instanceof PipeRun) {
-                                                               for (PipelineComponent pc : ((PipeRun) node).getChild())
-                                                                       pc.sync();
-                                                       } else if (node instanceof Equipment) {
-                                                               for (PipelineComponent pc : ((Equipment) node).getChild())
-                                                                       pc.sync();
-                                                       }
-                                               }
-                                               
-                                               for (INode node : rootNode.getChild()) {
-                                                       if (node instanceof PipeRun) {
-                                                               for (PipelineComponent pc : ((PipeRun) node).getChild())
-                                                                       pc.sync2();
-                                                       } else if (node instanceof Equipment) {
-                                                               for (PipelineComponent pc : ((Equipment) node).getChild())
-                                                                       pc.sync2();
-                                                       }
-                                               }
-                                               for (INode node : rootNode.getChild()) {
-                                                       if (node instanceof PipeRun) {
-                                                               PipingRules.validate((PipeRun)node);
-                                                       }
-                                               }
-                                               PipingRules.setEnabled(true);
-                                               for (INode node : rootNode.getChild()) {
-                                                       if (node instanceof PipeRun) {
-                                                               PipeRun run = (PipeRun)node;
-                                                               for (PipeControlPoint pcp : run.getControlPoints())
-                                                                       PipingRules.positionUpdate(pcp);
-                                                                       
-                                                       }
-                                               }
-                                       } catch (Exception e) {
-                                               throw new DatabaseException(e);
-                                       }
-                                       nodeMap = createNodeMap(getSession(), mapping, panel,rootNode);
+                                           P3DUtil.finalizeDBLoad(rootNode);
+                                           nodeMap = createNodeMap(getSession(), mapping, panel,rootNode);
+                                          
+                    } catch (Exception e) {
+                        throw new DatabaseException(e);
+                    }
+                                       
+                                       System.out.println("END PLANT3D LOAD");
                                }
                        });
                        
@@ -213,12 +184,12 @@ public class Plant3DEditor extends ResourceEditorPart {
                                throw new RuntimeException("Scenegraph loading failed.");
                        populate();
                        
-                       selectionProvider = new NodeSelectionProvider2<Resource,Object>(this,mapping,nodeMap);
+                       selectionProvider = createSelectionProvider();
 
                        cameraAction.addSelectionChangedListener(selectionProvider);
 
-                       cameraAction.addHoverChangedListener(new HoverHighlighter(panel,nodeMap));
-                       selectionProvider.addSelectionChangedListener(new SelectionHighlighter(panel,nodeMap));
+                       cameraAction.addHoverChangedListener(createHoverHighlhighter());
+                       selectionProvider.addSelectionChangedListener(createSelectionHighlighter());
                        
                        getSite().setSelectionProvider(selectionProvider);
                        getSite().getPage().addPostSelectionListener(selectionProvider);
@@ -232,20 +203,12 @@ public class Plant3DEditor extends ResourceEditorPart {
                                public void widgetDisposed(DisposeEvent e) {
                                        getSite().getPage().removePostSelectionListener(selectionProvider);
                                        
-                                       ThreadUtils.asyncExec(AWTThread.getThreadAccess(), new Runnable() {
-                                               
-                                               @Override
-                                               public void run() {
-                                                       PipingRules.setEnabled(false);
-                                                       nodeMap.delete();
-                                                       PipingRules.setEnabled(true);
-                                                       vtkPanelUtil.unregisterPanel(panel);
-
-                                               }
-                                       });
+                                       PipingRules.setEnabled(false);
+                                       nodeMap.delete();
+                                       PipingRules.setEnabled(true);
                                        mapping.dispose();
-                                       component.dispose();
-                                       
+//                                     component.dispose();
+                                       //panel.getComponent().dispose();
                                        
                                }
                        });
@@ -254,49 +217,97 @@ public class Plant3DEditor extends ResourceEditorPart {
                        return;
                }
                
+               createActions();
+               
+       }
+       
+       protected vtkCameraAndSelectorAction createCameraAction() {
+           return new vtkCameraAndSelectorAction(panel); 
+       }
+       
+       protected NodeSelectionProvider2<Resource,INode> createSelectionProvider() {
+           return new NodeSelectionProvider2<Resource,INode>(this,mapping,nodeMap);
+       }
+       
+       protected HoverHighlighter<Resource> createHoverHighlhighter() {
+           return new HoverHighlighter<>(panel,nodeMap);
+       }
+       
+       protected SelectionHighlighter<Resource> createSelectionHighlighter() {
+           return new SelectionHighlighter<Resource>(panel,nodeMap);
+       }
+       
+       protected String getLibraryUri() {
+           return Plant3D.URIs.Builtin;
+       }
+       
+       protected void createActions() {
+           focusAction = new FocusAction(panel, cameraAction);
                translateAction = new TranslateAction(panel,nodeMap);
+               translateInlineAction = new TranslateInlineAction(panel, nodeMap);
+               translateFreeVariableLengthAction = new TranslateFreeVariableLengthAction(panel, getRootNode());
                rotateAction = new RotateAction(panel,nodeMap);
-               removeAction = new RemoveAction(nodeMap) {
-                       public void setNode(IG3DNode node) {
-                               super.setNode(node);
-                               
-                               
-                       }
-               };
+               removeAction = new RemoveAction(nodeMap);
+               removeSplitAction = new RemoveAndSplitAction(nodeMap);
                routePipeAction = new RoutePipeAction(panel,rootNode);
-               addComponentAction = new AddComponentAction(panel, rootNode);
-               
+               addComponentAction = new AddComponentAction(panel, rootNode, getLibraryUri());
        }
        
        public void populate() {
-               ThreadUtils.asyncExec(AWTThread.getThreadAccess(), new Runnable() {
+               ThreadUtils.asyncExec(panel.getThreadQueue(), new Runnable() {
                        
                        @Override
                        public void run() {
                                nodeMap.populate();
+                               panel.addListener(new RenderListener() {
+                    
+                    @Override
+                    public void preRender() {
+                   
+                    }
+                    
+                    @Override
+                    public void postRender() {
+                        try {
+                            P3DUtil.finalizeDBLoad2(rootNode);
+                            if (nodeMap.isRangeModified());
+                                nodeMap.commit("Load sync");
+                        } catch (Exception e) {
+                            //throw new DatabaseException(e);
+                        }
+                        panel.removeListener(this);  
+                        
+                    }
+                });
+                               
                        }
                });
                
        }
        
-       protected IMappingSchema<Resource, Object> getSchema(ReadGraph graph) throws DatabaseException {
-               IMappingSchema<Resource,Object> schema = SchemaBuilder.getSchema(graph);
+       protected IMappingSchema<Resource, INode> getSchema(ReadGraph graph) throws DatabaseException {
+               IMappingSchema<Resource,INode> schema = SchemaBuilder.getSchema(graph);
                return schema;
        }
        
-       protected P3DNodeMap createNodeMap(Session session, IMapping<Resource, Object> mapping, InteractiveVtkPanel panel, P3DRootNode rootNode) {
-                return new P3DNodeMap(session, mapping, panel,rootNode);
+       protected P3DNodeMap createNodeMap(Session session, IMapping<Resource, INode> mapping, VtkView panel, P3DRootNode rootNode) {
+               return new P3DNodeMap(session, mapping, panel,rootNode);
        }
        
        @Override
        public void setFocus() {
-               component.setFocus();
+               //component.setFocus();
+               panel.getComponent().setFocus();
        }
        
        private void createScene() {
-               vtkRenderer ren1 = panel.GetRenderer();
+               vtkRenderer ren1 = panel.getRenderer();
                
                boolean multiPass = false;
+               boolean blur = false;
+               boolean ssaa = false;
+               //boolean sobel = true;
+               boolean mblur = false;
                if (multiPass) {
                        
                        vtkLightsPass lightsPass = new vtkLightsPass();
@@ -310,13 +321,29 @@ public class Plant3DEditor extends ResourceEditorPart {
                        vtkSequencePass seq = new vtkSequencePass();
                        seq.SetPasses(passes);
                        
-               
-                       
                        vtkCameraPass cameraPass = new vtkCameraPass();
                        cameraPass.SetDelegatePass(seq);
                        
-                       ren1.SetPass(cameraPass);
-                       
+                       if (blur) {
+                           vtkGaussianBlurPass blurPass = new vtkGaussianBlurPass();
+                           blurPass.SetDelegatePass(cameraPass);
+                           ren1.SetPass(blurPass);
+                       } else if (ssaa) {
+                           vtkSSAAPass ssaaPass = new vtkSSAAPass();
+                           ssaaPass.SetDelegatePass(cameraPass);
+                           ren1.SetPass(ssaaPass);
+                       } else if (mblur) {
+                           vtkSimpleMotionBlurPass mBlurPass = new vtkSimpleMotionBlurPass();
+                           mBlurPass.SetDelegatePass(cameraPass);
+                ren1.SetPass(mBlurPass);
+//                     } else if (sobel) {
+//                         vtkSobelGradientMagnitudePass sobelPass = new vtkSobelGradientMagnitudePass();
+//                         sobelPass.SetDelegatePass(sobelPass);
+//                         ren1.SetPass(sobelPass);
+               } else {
+                   ren1.SetPass(cameraPass);
+               }
+                        
                }
 //             ren1.GetRenderWindow().LineSmoothingOn();
 //             ren1.GetRenderWindow().PointSmoothingOn();
@@ -329,62 +356,49 @@ public class Plant3DEditor 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);
-           
-           {
-                   vtkAxesActor axes = new vtkAxesActor();
-                   axes.GetXAxisCaptionActor2D().GetCaptionTextProperty().SetColor(0,0,0);
-                   axes.GetYAxisCaptionActor2D().GetCaptionTextProperty().SetColor(0,0,0);
-                   axes.GetZAxisCaptionActor2D().GetCaptionTextProperty().SetColor(0,0,0);
-                   axes.GetXAxisCaptionActor2D().GetCaptionTextProperty().SetShadow(0);
-                   axes.GetYAxisCaptionActor2D().GetCaptionTextProperty().SetShadow(0);
-                   axes.GetZAxisCaptionActor2D().GetCaptionTextProperty().SetShadow(0);
-                   axes.GetXAxisCaptionActor2D().GetCaptionTextProperty().ItalicOff();
-                   axes.GetYAxisCaptionActor2D().GetCaptionTextProperty().ItalicOff();
-                   axes.GetZAxisCaptionActor2D().GetCaptionTextProperty().ItalicOff();
-                   axes.GetXAxisCaptionActor2D().GetCaptionTextProperty().Delete();
-                   axes.GetYAxisCaptionActor2D().GetCaptionTextProperty().Delete();
-                   axes.GetZAxisCaptionActor2D().GetCaptionTextProperty().Delete();
-                   axes.GetXAxisCaptionActor2D().Delete();
-                   axes.GetYAxisCaptionActor2D().Delete();
-                   axes.GetZAxisCaptionActor2D().Delete();
-                   vtkOrientationMarkerWidget widget = new vtkOrientationMarkerWidget();
-                   widget.SetOutlineColor(0.9300, 0.5700, 0.1300 );
-                   widget.SetOrientationMarker(axes);
-                   widget.SetInteractor(panel.getRenderWindowInteractor());
-                   //widget.SetViewport(0.8, 0.0, 1.0, 0.2); // bottom right
-                   //widget.SetViewport(0.0, 0.0, 0.4, 0.4);
-                   widget.SetViewport(0.0, 0.0, 0.2, 0.2);  // bottom left
-                   widget.SetEnabled(1);
-                   widget.InteractiveOff();
-           }
-
+               // 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);
+               
+               AxesDisplay axesDisplay = new AxesDisplay(panel);
+               axesDisplay.show();
                
        }
        
        protected Menu contextMenu;
        
        protected void hookContextMenu() {
-        MenuManager menuMgr = new MenuManager("#PopupMenu");
-        menuMgr.setRemoveAllWhenShown(true);
-        menuMgr.addMenuListener(new IMenuListener() {
-            public void menuAboutToShow(IMenuManager manager) {                
-               createContextMenu(manager);
-            }
-        });
+               MenuManager menuMgr = new MenuManager("#PopupMenu");
+               menuMgr.setRemoveAllWhenShown(true);
+               menuMgr.addMenuListener(new IMenuListener() {
+                       public void menuAboutToShow(IMenuManager manager) {             
+                               createContextMenu(manager);
+                       }
+               });
 
-        contextMenu = menuMgr.createContextMenu(parent);
-    }
+               contextMenu = menuMgr.createContextMenu(parent);
+       }
        
        protected void createContextMenu(IMenuManager m) {
-               List<IG3DNode> selected = selectionProvider.getSelectedNodes();
+               List<INode> selected = selectionProvider.getSelectedNodes();
+               List<VTKSelectionItem<Resource>> selectedItems = selectionProvider.getSelectedItems();
+               if (selectedItems.size() > 0) {
+                   List<vtkProp> props = new ArrayList<>();
+                   for (VTKSelectionItem<Resource> i : selectedItems) {
+                       vtkProp p = (vtkProp)i.getAdapter(vtkProp.class);
+                       if (p != null)
+                           props.add(p);
+                   }
+                   if (props.size() > 0) {
+                       focusAction.setProps(props);
+                       m.add(focusAction);
+                   }
+               }
                try {
                        if (selected.size() == 0) {
-                               for (Item eq : P3DUtil.getEquipments()) {
+                               for (Item eq : P3DUtil.getEquipments(getLibraryUri())) {
                                        m.add(new AddEquipmentAction(rootNode, eq));
                                }
                        } else if (selected.size() == 1) {
@@ -392,20 +406,24 @@ public class Plant3DEditor extends ResourceEditorPart {
                                if (node instanceof Equipment) {
                                        m.add(translateAction);
                                        m.add(rotateAction);
-                                       for (Item eq : P3DUtil.getNozzles()) {
+                                       for (Item eq : P3DUtil.getNozzles(getLibraryUri())) {
                                                AddNozzleAction add = new AddNozzleAction(rootNode, eq);
                                                add.setEquipment((Equipment)node);
                                                m.add(add);
                                        }
+                                       m.add(removeAction);
                                } else if (node instanceof Nozzle) {
-                                       m.add(translateAction);
-                                       m.add(rotateAction);
                                        Nozzle nozzle = (Nozzle)node;
+                                       if (!nozzle.isFixed()) {
+                                               m.add(translateAction);
+                                               m.add(rotateAction);
+                                       }
                                        m.add(routePipeAction);
                                        routePipeAction.setComponent(nozzle);
                                        routePipeAction.setEnabled(nozzle.getNext() == null && nozzle.getPrevious() == null);
                                        m.add(addComponentAction);
                                        addComponentAction.setComponent(nozzle);
+                                       m.add(removeAction);
                                } else if (node instanceof TurnComponent) {
                                        m.add(translateAction);
                                        TurnComponent component = (TurnComponent)node;
@@ -414,28 +432,43 @@ public class Plant3DEditor extends ResourceEditorPart {
                                        routePipeAction.setEnabled(component.getNext() == null || component.getPrevious() == null);
                                        m.add(addComponentAction);
                                        addComponentAction.setComponent(component);
+                                       m.add(removeAction);
+                                       m.add(removeSplitAction);
+                                       removeSplitAction.setNode(node);
                                } else if (node instanceof EndComponent) {
                                        m.add(translateAction);
                                        m.add(addComponentAction);
                                        addComponentAction.setComponent((PipelineComponent)node);
+                                       m.add(removeAction);
                                } else if (node instanceof InlineComponent) {
                                        //m.add(translateInlineAction);
                                        InlineComponent component = (InlineComponent)node;
+                                       if (component.isVariableLength())
+                                           m.add(translateFreeVariableLengthAction);
+                                       else
+                                           m.add(translateInlineAction);
                                        m.add(routePipeAction);
                                        routePipeAction.setComponent(component);
                                        m.add(addComponentAction);
                                        addComponentAction.setComponent(component);
+                                       m.add(removeAction);
+                                       m.add(removeSplitAction);
+                                       removeSplitAction.setNode(node);
+                               } else {
+                                   m.add(removeAction);
                                }
                                
-                               m.add(removeAction);
+                               
                                translateAction.setNode(node);
+                               translateInlineAction.setNode(node);
+                               translateFreeVariableLengthAction.setNode(node);
                                rotateAction.setNode(node);
                                removeAction.setNode(node);
                                
                        } 
                } catch (DatabaseException e) {
-               ExceptionUtils.logAndShowError(e);
-       }
+                       ExceptionUtils.logAndShowError(e);
+               }
        }
        
        private IContentOutlinePage createOutline() {
@@ -457,28 +490,29 @@ public class Plant3DEditor extends ResourceEditorPart {
                return outlinePage;
        }
 
-       @SuppressWarnings("rawtypes")
        @Override
-       public Object getAdapter(Class adapter) {
-               if (IPropertyPage.class.equals(adapter))
-                       return new StandardPropertyPage(getSite(),getPropertyContexts());
-               if (IContentOutlinePage.class.equals(adapter)) {
-                       return createOutline();
+       public <T> T getAdapter(Class<T> adapter) {
+               if (adapter.isAssignableFrom(IPropertyPage.class))
+                       return adapter.cast(new StandardPropertyPage(getSite(),getPropertyContexts()));
+               if (adapter.isAssignableFrom(ISelectionProvider.class))
+                       return adapter.cast(selectionProvider);
+               if (adapter.isAssignableFrom(IContentOutlinePage.class)) {
+                       return adapter.cast(createOutline());
                }
-               if (NodeMap.class.equals(adapter)) {
-                       return nodeMap;
+               if (adapter.isAssignableFrom(NodeMap.class)) {
+                       return adapter.cast(nodeMap);
                }
-               if (INode.class.equals(adapter)) {
-                       return rootNode;
+               if (adapter.isAssignableFrom(INode.class)) {
+                       return adapter.cast(rootNode);
                }
-               if (IMapping.class.equals(adapter)) {
-                       return mapping;
+               if (adapter.isAssignableFrom(IMapping.class)) {
+                       return adapter.cast(mapping);
                }
-               if (InteractiveVtkPanel.class.equals(adapter)) {
-                       return panel;
-               }
-               if (ISelectionProvider.class.equals(adapter))
-                       return selectionProvider;
+//             if (adapter.isAssignableFrom(InteractiveVtkPanel.class)) {
+//                     return adapter.cast(panel);
+//             }
+               if (adapter.isAssignableFrom(VtkView.class))
+                       return adapter.cast(panel);
                return super.getAdapter(adapter);
        }
        
@@ -488,11 +522,19 @@ public class Plant3DEditor extends ResourceEditorPart {
                return result;
        }
        
+       public InteractiveVtkComposite getPanel() {
+        return panel;
+    }
+       
        public P3DRootNode getRootNode() {
                return rootNode;
        }
        
-       public IMapping<Resource, Object> getMapping() {
+       public IMapping<Resource, INode> getMapping() {
                return mapping;
        }
+       
+       public P3DNodeMap getNodeMap() {
+        return nodeMap;
+    }
 }