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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13919/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	ToolFactory.java 
Log Message:
New icons and reorganized toolbar

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** ToolFactory.java	21 Dec 2007 12:06:55 -0000	1.101
--- ToolFactory.java	27 Dec 2007 23:14:24 -0000	1.102
***************
*** 59,139 ****
    private static ToolFactory factory;

!   /** select tool */
!   private AbstractTool select;

    private AbstractTool assign;

-   /** Alternate Move Tool */
-   private AbstractTool alternate;
-   
-   /** Alternate Move Tool */
-   private AbstractTool controlled;
-   
-   /** Extrusion tool */
-   private ExtrusionTool extrude;
-   
-   /** pencil tool */
    private Pencil pencil;
- 
-   /** eraser tool */
    private EraserTool eraser;
!   
!   /** arc tool */
!   private ArcTool arc;
! 
!   /** pencil tool */
!   private ClipplaneTool clipplane;  
! 
!   /** rotation tool */
!   private CameraTool camera;  
! 
!   /** Camera fly tool  */
!   private CameraFlyTool fly;  
!   
!   /** Camera walktool  */
!   private CameraWalkTool walk;  
!   
!   /** Tape measure tool  */
!   private AbstractPencil tapeMeasure;
!   
    private AbstractTool protractor;
!   
!   /** Constructor tool */
!   private ConstructorTool constructor;
!   
!   /** The previous tool */
!   private Tool previousTool;
! 
!   /** The current tool */
!   private Tool currentTool;
!   
!   /** The Offset tool */
    private OffsetTool offset;

!   /** The Alternative Rect tool */
!   private RectTool altRect;
! 
!   /** The Rotation tool */
!   private RotationTool rotation;

!   /** The tool for binding constructors and geometry together */
    private RelationTool relation;

!   /** The tool for focusing on objects */
!   private FocusTool focusTool;
!   
!   /** The tool for moving alternatively */
!   private AltMoveTool altMoveTool;
!   private FinalMoveTool finalMoveTool;
!   
!   /** The tool for moving edges alternatively */
!   private EdgeMoveTool edgeMoveTool;
! 
!   /** Tool for navigating in the model */
!   private PanTool panTool;

!   private ZoomTool zoomTool;
! 
!   private ExtendTool extendTool;

    protected static Cursor errorCursor;
--- 59,91 ----
    private static ToolFactory factory;

!   private Tool previousTool;
!   private Tool currentTool;

+   private AbstractTool select;
    private AbstractTool assign;

    private Pencil pencil;
    private EraserTool eraser;
!   private AbstractPencil ruler;
    private AbstractTool protractor;
!   private FinalMoveTool moving;
!   private RotationTool rotation;
    private OffsetTool offset;
+   private ExtrusionTool extrude;

!   private RectTool rectangle;
!   private ArcTool arc;
!   private ExtendTool extend;

!   private ConstructorTool constructor;
    private RelationTool relation;

!   private FocusTool focus;
!   private ClipplaneTool clipplane;

!   private CameraTool orbit;
!   private PanTool pan;
!   private ZoomTool zoom;
!  

    protected static Cursor errorCursor;
***************
*** 164,176 ****
      Cursor rotationCursor =
        Toolkit.getDefaultToolkit().createCustomCursor(rotationImage, new Point(7, 8), "Rotation");
!     /*url = cl.getResource("Biconfly.gif");
!     Image flyImage = Toolkit.getDefaultToolkit().getImage(url);
!     Cursor flyCursor =
!       Toolkit.getDefaultToolkit().createCustomCursor(flyImage, new Point(7, 8), "Fly");
!     url = cl.getResource("Biconwalk.gif");
!     Image walkImage = Toolkit.getDefaultToolkit().getImage(url);
!     Cursor walkCursor =
!       Toolkit.getDefaultToolkit().createCustomCursor(walkImage, new Point(7, 8), "Walk");
!     url = cl.getResource("Bcursoradd.gif");*/
      Image arrowAddImage = Toolkit.getDefaultToolkit().getImage(url);
      Cursor arrowAddCursor =
--- 116,120 ----
      Cursor rotationCursor =
        Toolkit.getDefaultToolkit().createCustomCursor(rotationImage, new Point(7, 8), "Rotation");
!     
      Image arrowAddImage = Toolkit.getDefaultToolkit().getImage(url);
      Cursor arrowAddCursor =
***************
*** 184,187 ****
--- 128,132 ----
      Cursor zoomCursor = 
        Toolkit.getDefaultToolkit().createCustomCursor(zoomImage, new Point(7, 8), "Zoom");
+     
      select = new SelectTool(editor, null);
      assign = new SpaceTool(editor, null);
***************
*** 191,259 ****
      rotation = new RotationTool(editor, null);
      extrude = new ExtrusionTool(editor, pencilcursor);
!     extendTool = new ExtendTool(editor, pencilcursor);
      clipplane = new ClipplaneTool(editor, pencilcursor);
!     tapeMeasure = new TapeMeasure(editor, pencilcursor);
      protractor = new Protractor(editor, pencilcursor);
      relation = new RelationTool(editor, arrowAddCursor);
!     camera = new CameraTool(editor, rotationCursor);
      constructor = new ConstructorTool(editor, pencilcursor);
      offset = new OffsetTool(editor, pencilcursor);
!     altRect = new RectTool(editor, pencilcursor);
!     focusTool = new FocusTool(editor, null);
!     finalMoveTool = new FinalMoveTool(editor, pencilcursor);
!     panTool = new PanTool(editor, panCursor);
!     zoomTool = new ZoomTool(editor, zoomCursor);
      Toolbar tb = Toolbar.getInstance();

!     JToggleButton selBut = 
!       this.registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select");
!     selBut.setMnemonic(KeyEvent.VK_Q);
      registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign");
-     JToggleButton pencilBut = 
-       this.registerTool(Tool.PENCIL_TOOL, pencil, "Biconpentool.gif", "Pencil");
-     pencilBut.setMnemonic(KeyEvent.VK_W);
-     JToggleButton rect = 
-       this.registerTool(Tool.ALT_RECT_TOOL, altRect, "Biconaltrect.gif", "Rectangle");
-     rect.setMnemonic(KeyEvent.VK_S);
-     JToggleButton arcb = this.registerTool(Tool.ARC_TOOL, arc, "Barc.gif", "Arc");
-     arcb.setMnemonic(KeyEvent.VK_Z);
-     JToggleButton eraserBut = 
-       this.registerTool(Tool.ERASER_TOOL, eraser, "Biconeraser.gif", "Eraser");
-     eraserBut.setMnemonic(KeyEvent.VK_A);
-     tb.addSeparator(5);
-     JToggleButton offBut = 
-       this.registerTool(Tool.OFFSET_TOOL, offset, "Biconoffset.gif", "Offset");
-     JToggleButton extrudeBut = 
-       registerTool(Tool.EXTRUSION_TOOL, extrude, "Biconextrudetool.gif", "Extrude");
-     extrudeBut.setMnemonic(KeyEvent.VK_V);
-     registerTool(Tool.EXTEND_TOOL, extendTool, 
-         "Biconextrudetool2.gif", "Extend");

!     JToggleButton moveBut = 
!       registerTool(Tool.FINAL_MOVE_TOOL, finalMoveTool, "Bmovetool.gif", "Final Move");
!     moveBut.setMnemonic(KeyEvent.VK_M);
!     JToggleButton rotationBut = 
!       this.registerTool(Tool.ROTATION_TOOL, rotation, "Biconrotate.png", "Rotate");

!     tb.addSeparator(5);
!     registerTool(Tool.TAPE_MEASURE_TOOL, tapeMeasure, "Bicontapemes.gif", "Tape Measure");
!     registerTool(Tool.PROTRACTOR_TOOL, protractor, "Bprotrac.gif", "Protractor");
!     registerTool(Tool.CONSTRUCTOR_TOOL, constructor, "Biconconstructor.gif", "Constructor");
!     registerTool(Tool.RELATION_TOOL, relation, "chaintool.gif", "Create relation");
!     tb.addSeparator(5);

!     JToggleButton cRotBut = 
!       this.registerTool(Tool.CAMERA_TOOL, camera, "Biconrotcam.png", "Orbit (Space)");
!     this.registerTool(Tool.PAN_TOOL, panTool, "Bicondrag.gif", "Pan");
!     this.registerTool(Tool.ZOOM_TOOL, zoomTool, "Biconzomeinout.gif", "Zoom in/out");
!     //flyBut = this.registerTool(Tool.FLY_TOOL, fly, "Biconfly.gif", "Fly");
!     //walkBut = this.registerTool(Tool.WALK_TOOL, walk, "Biconwalk.gif", "Walk");

!     this.registerTool(Tool.FOCUS_TOOL, focusTool, "Biconzomeselect.gif", "Focus on surface");

-     JToggleButton clipBut = this.registerTool(Tool.CLIP_TOOL, clipplane, 
-         "Bclip.gif", "Clipping");
      tb.addSeparator(10);

--- 136,202 ----
      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);
      offset = new OffsetTool(editor, pencilcursor);
!     rectangle = new RectTool(editor, pencilcursor);
!     focus = new FocusTool(editor, null);
!     moving = new FinalMoveTool(editor, pencilcursor);
!     pan = new PanTool(editor, panCursor);
!     zoom = new ZoomTool(editor, zoomCursor);
      Toolbar tb = Toolbar.getInstance();

!     registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select");
      registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign");

!     tb.addSeparator(10);

!     registerTool(Tool.PENCIL_TOOL, pencil, "pen-icon.png", "Pencil");
!     registerTool(Tool.ERASER_TOOL, eraser, "eraser-icon.png", "Eraser");

!     tb.addSeparator(2);

+     registerTool(Tool.TAPE_MEASURE_TOOL, ruler, "ruler-icon.png", "Ruler");
+     registerTool(Tool.PROTRACTOR_TOOL, protractor, "protractor-icon.png", "Protractor");

!     tb.addSeparator(2);
!     
!     registerTool(Tool.FINAL_MOVE_TOOL, moving, "Biconmovetool.gif", "Move");
!     registerTool(Tool.ROTATION_TOOL, rotation, "rotation-icon.png", "Rotate");

+     tb.addSeparator(2);
+     
+     registerTool(Tool.OFFSET_TOOL, offset, "offset-icon.png", "Offset");
+     registerTool(Tool.EXTRUSION_TOOL, extrude, "Biconextrudetool.gif", "Extrude");
+     
+     tb.addSeparator(10);
+     
+     registerTool(Tool.ALT_RECT_TOOL, rectangle, "Biconaltrect.gif", "Rectangle");
+     registerTool(Tool.ARC_TOOL, arc, "Barc.gif", "Arc");
+     
+     tb.addSeparator(2);
+     
+     registerTool(Tool.EXTEND_TOOL, extend, "Biconextrudetool2.gif", "Extend");
+    
+     tb.addSeparator(10);
+     
+     registerTool(Tool.CONSTRUCTOR_TOOL, constructor, "constructor-icon.png", "Constructor");
+     registerTool(Tool.RELATION_TOOL, relation, "chaintool.gif", "Relate");
+     
+     tb.addSeparator(10);
+     
+     registerTool(Tool.FOCUS_TOOL, focus, "Biconzomeselect.gif", "Focus");
+     registerTool(Tool.CLIP_TOOL, clipplane, "Bclip.gif", "Section");
+     
+     tb.addSeparator(10);
+     
+     registerTool(Tool.CAMERA_TOOL, orbit, "Biconrotcam.png", "Orbit");
+     registerTool(Tool.PAN_TOOL, pan, "Bicondrag.gif", "Pan");
+     registerTool(Tool.ZOOM_TOOL, zoom, "Biconzomeinout.gif", "Zoom");

      tb.addSeparator(10);

***************
*** 290,294 ****
        }
      };
!     Toolbar.getInstance().registerPushButtonAction(topAction, "See from above");
      Action zoomAction = new ToolAction(editor, 0, "Biconzomeall.gif") {
        public void actionPerformed(ActionEvent agr0) {
--- 233,237 ----
        }
      };
!     Toolbar.getInstance().registerPushButtonAction(topAction, "Top");
      Action zoomAction = new ToolAction(editor, 0, "Biconzomeall.gif") {
        public void actionPerformed(ActionEvent agr0) {
***************
*** 307,311 ****

!     tb.addSeparator(5);
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);
--- 250,254 ----

!     tb.addSeparator(10);
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);