[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.79, 1.80 ExtrudeTool.java, 1.19, 1.20 AbstractPencil.java, 1.33, 1.34

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

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

Modified Files:
	AbstractTool.java ExtrudeTool.java AbstractPencil.java 
Log Message:
Key event refactoring

Index: ExtrudeTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ExtrudeTool.java	7 Jun 2006 08:22:34 -0000	1.19
--- ExtrudeTool.java	28 Jun 2006 13:26:02 -0000	1.20
***************
*** 455,463 ****
     * @param e The KeyEvent
     */
!   public void keyPressed(KeyEvent e) {
      /*a length can only be typed in if some surface is selected 
       for extrusion, and if the "number"-variable has been initialised
       */
-     super.keyPressed(e);
      if (extrudeSurface != null && number != null) {
        if (e.getKeyCode() == KeyEvent.VK_1) {
--- 455,462 ----
     * @param e The KeyEvent
     */
!   public void key(KeyEvent e) {
      /*a length can only be typed in if some surface is selected 
       for extrusion, and if the "number"-variable has been initialised
       */
      if (extrudeSurface != null && number != null) {
        if (e.getKeyCode() == KeyEvent.VK_1) {
***************
*** 512,516 ****
        }
      }
-     super.keyPressed(e);
    }
    
--- 511,514 ----

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** AbstractPencil.java	19 Jun 2006 13:15:12 -0000	1.33
--- AbstractPencil.java	28 Jun 2006 13:26:02 -0000	1.34
***************
*** 687,694 ****
    
    /**
     * Invoked when a key has been pressed.
     * @param e The KeyEvent
     */
!   public void keyPressed(KeyEvent e) {
      boolean changed = false;
      if (number == null) {
--- 687,701 ----
    
    /**
+    * Escape
+    */
+   public void escape() {
+     cleanUp();
+   }
+   
+   /**
     * Invoked when a key has been pressed.
     * @param e The KeyEvent
     */
!   public void key(KeyEvent e) {
      boolean changed = false;
      if (number == null) {

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** AbstractTool.java	23 Jun 2006 13:00:17 -0000	1.79
--- AbstractTool.java	28 Jun 2006 13:26:02 -0000	1.80
***************
*** 208,211 ****
--- 208,212 ----
        log.info("meta-pressed");
        glv.setCursor(null);
+       return;
      }
      
***************
*** 213,220 ****
--- 214,223 ----
        log.info("control-pressed");
        glv.setCursor(null);
+       return;
      }
      
      if (e.getKeyCode() == KeyEvent.VK_SPACE) {
        log.info("space-pressed");
+       return;
      }
      
***************
*** 266,269 ****
--- 269,274 ----
          } else if (e.getKeyCode() == KeyEvent.VK_F7) {
            glv.getView().changeDrawMode(View.LIGHTING_MODE);
+         } else {
+           key(e);
          }
        }