[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ToolFactory.java, 1.113, 1.114

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16253/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	ToolFactory.java 
Log Message:
Clean up

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** ToolFactory.java	31 May 2013 08:01:07 -0000	1.113
--- ToolFactory.java	31 May 2013 16:07:09 -0000	1.114
***************
*** 47,52 ****
    private List<JComponent> modellingset;
    
-   private List<JComponent> viewingset;
- 
    /** glv */
    private Editor editor;
--- 47,50 ----
***************
*** 68,73 ****
    private AbstractTool select;
    private AbstractTool assign;
-   private AbstractTool spaceselect;
-   private AbstractTool four;
   
    private Pencil pencil;
--- 66,69 ----
***************
*** 82,89 ****
    private RectTool rectangle;
    private ArcTool arc;
-   private ExtendTool extend;
    
    private ConstructorTool constructor;
-   private RelationTool relation;
    
    private FocusTool focus;
--- 78,83 ----
***************
*** 104,108 ****
    private ToolFactory(Editor editor) {
      modellingset = new LinkedList();
-     viewingset = new LinkedList();
      tools = new HashMap();
      buttons = new HashMap();
--- 98,101 ----
***************
*** 112,117 ****
      ClassLoader cl = Thread.currentThread().getContextClassLoader();
      
-     
-     
      URL url = cl.getResource("Bcursorpen1.gif");
      Image pencilimage = Toolkit.getDefaultToolkit().getImage(url);
--- 105,108 ----
***************
*** 143,147 ****
      select = new SelectTool(editor, null);
      assign = new SpaceTool(editor, null);
-     spaceselect = new SpaceSelectTool(editor, null);
      
      pencil = new Pencil(editor, pencilcursor);
--- 134,137 ----
***************
*** 150,158 ****
      rotation = new RotationTool(editor, null);
      extrude = new ExtrusionTool(editor, pencilcursor);
-     extend = new ExtendTool(editor, pencilcursor);
      clipplane = new ClipplaneTool(editor, pencilcursor);
      ruler = new TapeMeasure(editor, pencilcursor);
      protractor = new Protractor(editor, pencilcursor);
-     relation = new RelationTool(editor, arrowAddCursor);
      orbit = new CameraTool(editor, rotationCursor);
      constructor = new ConstructorTool(editor, pencilcursor);
--- 140,146 ----
***************
*** 163,170 ****
      pan = new PanTool(editor, panCursor);
      zoom = new ZoomTool(editor, zoomCursor);
!     
!     viewingset.add(registerTool(Tool.SPACE_SELECT, spaceselect, 
!       "Biconselecttool2.gif", "Sensor Select"));
!         
      modellingset.add(registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select"));
      modellingset.add(registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign"));
--- 151,155 ----
      pan = new PanTool(editor, panCursor);
      zoom = new ZoomTool(editor, zoomCursor);
!             
      modellingset.add(registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select"));
      modellingset.add(registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign"));
***************
*** 178,183 ****
      
      modellingset.add(registerTool(Tool.TAPE_MEASURE_TOOL, ruler, "ruler-icon.png", "Ruler"));
!     modellingset.add(registerTool(Tool.PROTRACTOR_TOOL, protractor,
!       "protractor-icon.png", "Protractor"));
      
      modellingset.add(addSeparator(2));
--- 163,167 ----
      
      modellingset.add(registerTool(Tool.TAPE_MEASURE_TOOL, ruler, "ruler-icon.png", "Ruler"));
!     modellingset.add(registerTool(Tool.PROTRACTOR_TOOL, protractor, "protractor-icon.png", "Protractor"));
      
      modellingset.add(addSeparator(2));
***************
*** 197,209 ****
      
      modellingset.add(addSeparator(2));
!     
!     modellingset.add(registerTool(Tool.EXTEND_TOOL, extend, "Biconextrudetool2.gif", "Extend"));
!    
      modellingset.add(addSeparator(10));
      
!     modellingset.add(registerTool(Tool.CONSTRUCTOR_TOOL, constructor,
!       "constructor-icon.png", "Constructor"));
!     modellingset.add(registerTool(Tool.RELATION_TOOL, relation, "chaintool.gif", "Relate"));
!     
      modellingset.add(addSeparator(10));
      
--- 181,192 ----
      
      modellingset.add(addSeparator(2));
!        
      modellingset.add(addSeparator(10));
      
!     modellingset.add(registerTool(Tool.CONSTRUCTOR_TOOL, 
!         constructor, 
!         "constructor-icon.png", 
!         "Constructor"));
!         
      modellingset.add(addSeparator(10));
      
***************
*** 285,339 ****
      perspBut.setSelected(true);
      
-     {
-       ButtonGroup group = new ButtonGroup();
-       JToggleButton modelling;
-       JToggleButton viewing;
-       {
-         Action action = new ToolAction(editor, "modelling", "modellingicon.gif") {
-           public void actionPerformed(ActionEvent event) {
-             modelling();
-           }
-         };
-         modelling = Toolbar.getInstance().registerAction(action);
-         group.add(modelling);
-         modellingset.add(modelling);
-         viewingset.add(modelling);
-       }
-       {
-         Action action = new ToolAction(editor, "viewing", "viewingicon.gif") {
-           public void actionPerformed(ActionEvent event) {
-             viewing();
-           }
-         };
-         viewing = Toolbar.getInstance().registerAction(action);
-         group.add(viewing);
-         modellingset.add(viewing);
-         viewingset.add(viewing);
-       }
-       modelling.setSelected(true);
-     }
-     
      setup();
!   }
!   
!   private void modelling() {
!     Toolbar toolbar = Toolbar.getInstance();
!     toolbar.clear();
!     for (JComponent current : modellingset) {
!       toolbar.addButton(current);
!     }
!     ViewToolbarFactory.instance().setup();
!     Editor.setViewing(false);
!   }
!   
!   private void viewing() {
!     Toolbar toolbar = Toolbar.getInstance();
!     toolbar.clear();
!     for (JComponent current : viewingset) {
!       toolbar.addButton(current);
!     }
!     ViewToolbarFactory.instance().setup();
!     Editor.setViewing(true);
!   }
    
    
--- 268,273 ----
      perspBut.setSelected(true);
      
      setup();
!   }