[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool Tool.java,1.5,1.6 AbstractTool.java,1.14,1.15 ToolFactory.java,1.5,1.6

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

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

Modified Files:
	Tool.java AbstractTool.java ToolFactory.java 
Log Message:
Removed two of the three pencils from the toolbar

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ToolFactory.java	30 Aug 2005 12:54:55 -0000	1.5
--- ToolFactory.java	9 Sep 2005 12:32:26 -0000	1.6
***************
*** 30,35 ****
    private static ToolFactory factory;
  
!   /** draw tool */
!   private DrawTool draw;
  
    /** select tool */
--- 30,34 ----
    private static ToolFactory factory;
  
!   
  
    /** select tool */
***************
*** 42,50 ****
    private ExtrusionTool extrusion;
    
!   /** debug tool */
!   private PencilTool debug;
    
!   /** hole tool */
!   private HoleTool hole;
  
    /**
--- 41,48 ----
    private ExtrusionTool extrusion;
    
!   /** pencil tool */
!   private PencilTool pencil;
    
!  
  
    /**
***************
*** 53,76 ****
     */
    private ToolFactory(GLView glv) {
-     draw = new DrawTool(glv);
      select = new SelectTool(glv);
      move = new MoveTool(glv);
      extrusion = new ExtrusionTool(glv);
-     debug = new PencilTool(glv);
-     hole = new HoleTool(glv);
  
      Toolbar tb = Toolbar.getInstance();
      JButton but = tb.registerAction(new SelectAction(glv));
      but.setToolTipText("Select");
!     but = tb.registerAction(new DrawAction(glv));
!     but.setToolTipText("Draw");
      but = tb.registerAction(new MoveAction(glv));
      but.setToolTipText("Move");
      but = tb.registerAction(new ExtrudeAction(glv));
      but.setToolTipText("Extrude");
!     but = tb.registerAction(new DebugAction(glv));
!     but.setToolTipText("Debug");
!     but = tb.registerAction(new HoleAction(glv));
!     but.setToolTipText("Hole");
      Notifier.getInstance().addListener(select);
    }
--- 51,69 ----
     */
    private ToolFactory(GLView glv) {
      select = new SelectTool(glv);
+     pencil = new PencilTool(glv);
      move = new MoveTool(glv);
      extrusion = new ExtrusionTool(glv);
  
      Toolbar tb = Toolbar.getInstance();
      JButton but = tb.registerAction(new SelectAction(glv));
      but.setToolTipText("Select");
!     but = tb.registerAction(new PencilAction(glv));
!     but.setToolTipText("Pencil");
      but = tb.registerAction(new MoveAction(glv));
      but.setToolTipText("Move");
      but = tb.registerAction(new ExtrudeAction(glv));
      but.setToolTipText("Extrude");
!     
      Notifier.getInstance().addListener(select);
    }
***************
*** 104,117 ****
      if (i == Tool.SELECT_TOOL) {
        return select;
-     } else if (i == Tool.DRAW_TOOL) {
-       return draw;
      } else if (i == Tool.MOVE_TOOL) {
        return move;
      } else if (i == Tool.EXTRUSION_TOOL) {
        return extrusion;
!     } else if (i == Tool.DEBUG_TOOL) {
!       return debug;
!     } else if (i == Tool.HOLE_TOOL)  {
!       return hole;
      } else {
        log.error("[get] No such tool " + i);
--- 97,106 ----
      if (i == Tool.SELECT_TOOL) {
        return select;
      } else if (i == Tool.MOVE_TOOL) {
        return move;
      } else if (i == Tool.EXTRUSION_TOOL) {
        return extrusion;
!     } else if (i == Tool.PENCIL_TOOL) {
!       return pencil;
      } else {
        log.error("[get] No such tool " + i);
***************
*** 148,178 ****
    }
  
!   /**
!    * The draw action inner class
!    */
!   class DrawAction extends AbstractAction {
!     /** The GLView */
!     private GLView glv = null;
! 
!     /** 
!      * Constructor 
!      * @param glv TheGLView
!      */
!     DrawAction(GLView glv) {
!       this.glv = glv;
!       ClassLoader cl = Thread.currentThread().getContextClassLoader();
!       URL url = cl.getResource("drawicon.png");
!       ImageIcon im = new ImageIcon(url);
!       putValue(Action.SMALL_ICON, im);
!     }
! 
!     /**
!      * Called when the button is pressed
!      * @param e The ActionEvent
!      */
!     public void actionPerformed(ActionEvent e) {
!       glv.changeTool(Tool.DRAW_TOOL);
!     }
!   }
  
    /**
--- 137,141 ----
    }
  
!   
  
    /**
***************
*** 232,267 ****
    }
    
!   /**
!    * The hole action inner class
!    */
!   class HoleAction extends AbstractAction {
!     /** The GLView */
!     private GLView glv = null;
! 
!     /** 
!      * Constructor 
!      * @param glv TheGLView
!      */
!     HoleAction(GLView glv) {
!       this.glv = glv;
!       ClassLoader cl = Thread.currentThread().getContextClassLoader();
!       URL url = cl.getResource("drawicon.png");
!       ImageIcon im = new ImageIcon(url);
!       putValue(Action.SMALL_ICON, im);
!     }
! 
!     /**
!      * Called when the button is pressed
!      * @param e The ActionEvent
!      */
!     public void actionPerformed(ActionEvent e) {
!       glv.changeTool(Tool.HOLE_TOOL);
!     }
!   }
  }
  /**
   * The debug action inner class
   */
! class DebugAction extends AbstractAction {
    /** The GLView */
    private GLView glv = null;
--- 195,204 ----
    }
    
!   
  }
  /**
   * The debug action inner class
   */
! class PencilAction extends AbstractAction {
    /** The GLView */
    private GLView glv = null;
***************
*** 271,275 ****
     * @param glv TheGLView
     */
!   DebugAction(GLView glv) {
      this.glv = glv;
      ClassLoader cl = Thread.currentThread().getContextClassLoader();
--- 208,212 ----
     * @param glv TheGLView
     */
!   PencilAction(GLView glv) {
      this.glv = glv;
      ClassLoader cl = Thread.currentThread().getContextClassLoader();
***************
*** 284,288 ****
     */
    public void actionPerformed(ActionEvent e) {
!     glv.changeTool(Tool.DEBUG_TOOL);
    }
  }
--- 221,225 ----
     */
    public void actionPerformed(ActionEvent e) {
!     glv.changeTool(Tool.PENCIL_TOOL);
    }
  }

Index: Tool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Tool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Tool.java	7 Sep 2005 11:30:34 -0000	1.5
--- Tool.java	9 Sep 2005 12:32:26 -0000	1.6
***************
*** 18,31 ****
    /** The select tool */
    public static final int SELECT_TOOL = 0;
-   /** The draw tool */
-   public static final int DRAW_TOOL = 1;
    /** The move tool */
    public static final int MOVE_TOOL = 2;
    /** The extrude tool */
    public static final int EXTRUSION_TOOL = 3;
!   /** The debug tool */
!   public static final int DEBUG_TOOL = 4;
!   /** The hole tool */
!   public static final int HOLE_TOOL = 5;
  
    /**
--- 18,27 ----
    /** The select tool */
    public static final int SELECT_TOOL = 0;
    /** The move tool */
    public static final int MOVE_TOOL = 2;
    /** The extrude tool */
    public static final int EXTRUSION_TOOL = 3;
!   /** The pencil tool */
!   public static final int PENCIL_TOOL = 4;
  
    /**

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AbstractTool.java	7 Sep 2005 11:30:34 -0000	1.14
--- AbstractTool.java	9 Sep 2005 12:32:26 -0000	1.15
***************
*** 109,113 ****
        glv.changeTool(Tool.SELECT_TOOL);
      } else if (e.getKeyCode() == KeyEvent.VK_W) {
!       glv.changeTool(Tool.DRAW_TOOL);
      } else if (e.getKeyCode() == KeyEvent.VK_E) {
        glv.changeTool(Tool.MOVE_TOOL);
--- 109,113 ----
        glv.changeTool(Tool.SELECT_TOOL);
      } else if (e.getKeyCode() == KeyEvent.VK_W) {
!       glv.changeTool(Tool.PENCIL_TOOL);
      } else if (e.getKeyCode() == KeyEvent.VK_E) {
        glv.changeTool(Tool.MOVE_TOOL);