bprocessor-commit

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

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

Modified Files:
	AbstractTool.java SpaceTool.java AbstractPencil.java 
	SelectTool.java 
Log Message:
Some cleanup of keypressed code

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SpaceTool.java	24 May 2006 13:43:39 -0000	1.21
--- SpaceTool.java	19 Jun 2006 13:15:12 -0000	1.22
***************
*** 11,16 ****
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
- import java.awt.event.KeyEvent;
  import java.awt.event.MouseEvent;
  import java.util.Arrays;
  import java.util.Collection;
--- 11,16 ----
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import java.awt.event.MouseEvent;
+ import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collection;
***************
*** 27,30 ****
--- 27,31 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
+ import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.LayerModellor;
***************
*** 505,520 ****
    }
    
    /**
!    * Invoked when a key has been pressed. Lets user delete what is selected.
!    * @param e The KeyEvent
     */
!   public void keyPressed(KeyEvent e) {
!     if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
!       selection.clear();
!       glv.getView().makeTarget(null);
!       Project.getInstance().setActiveSpace(null);
!     } else {
!       super.keyPressed(e);
      }
    }
  }
--- 506,545 ----
    }
    
+   
    /**
!    * Delete
     */
!   public void delete() {
!     Iterator it = selection.iterator();
!     List edges = new ArrayList();
!     List vertices = new ArrayList();
!     List surfaces = new ArrayList();
!     while (it.hasNext()) {
!       Object selected = it.next();
!       if (selected instanceof Surface) {
!         surfaces.add((Surface)selected);
!       } else if (selected instanceof Edge) {
!         edges.add((Edge)selected);
!       } else if (selected instanceof Vertex) {
!         vertices.add((Vertex) selected);
!       } else if (selected instanceof ClippingPlane) {
!         Project.getInstance().getCurrentCamera().removeClipplane((ClippingPlane)selected);
!       }
      }
+     selection.clear();
+     glv.getView().makeTarget(null);
+     Project.getInstance().delete(surfaces);
+     Project.getInstance().delete(edges);
+     Project.getInstance().delete(vertices);
+     Project.getInstance().checkpoint();
+   }
+   
+   /**
+    * Escape
+    */
+   public void escape() {
+     selection.clear();
+     glv.getView().makeTarget(null);
+     Project.getInstance().setActiveSpace(null);
    }
  }

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** SelectTool.java	6 Jun 2006 09:22:25 -0000	1.58
--- SelectTool.java	19 Jun 2006 13:15:12 -0000	1.59
***************
*** 11,17 ****
  import net.sourceforge.bprocessor.gl.view.View;
  
- import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Edge;
- import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.Surface;
--- 11,15 ----
***************
*** 19,27 ****
  import java.awt.Cursor;
  import java.awt.event.MouseEvent;
- import java.awt.event.KeyEvent;
  
- import java.util.ArrayList;
  import java.util.HashSet;
- import java.util.Iterator;
  import java.util.List;
  
--- 17,22 ----
***************
*** 180,215 ****
    }
    
-   /**
-    * Invoked when a key has been pressed. Lets user delete what is selected.
-    * @param e The KeyEvent
-    */
-   public void keyPressed(KeyEvent e) {
-     if (e.getKeyCode() == KeyEvent.VK_DELETE ||
-         e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
-       Iterator it = selection.iterator();
-       List edges = new ArrayList();
-       List vertices = new ArrayList();
-       List surfaces = new ArrayList();
-       while (it.hasNext()) {
-         Object selected = it.next();
-         if (selected instanceof Surface) {
-           surfaces.add((Surface)selected);
-         } else if (selected instanceof Edge) {
-           edges.add((Edge)selected);
-         } else if (selected instanceof Vertex) {
-           vertices.add((Vertex) selected);
-         } else if (selected instanceof ClippingPlane) {
-           Project.getInstance().getCurrentCamera().removeClipplane((ClippingPlane)selected);
-         }
-       }
-       selection.clear();
-       glv.getView().makeTarget(null);
-       Project.getInstance().delete(surfaces);
-       Project.getInstance().delete(edges);
-       Project.getInstance().delete(vertices);
-       Project.getInstance().checkpoint();
-     } else {
-       super.keyPressed(e);
-     }
-   }
  }
--- 175,177 ----

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** AbstractPencil.java	14 Jun 2006 14:36:56 -0000	1.32
--- AbstractPencil.java	19 Jun 2006 13:15:12 -0000	1.33
***************
*** 695,719 ****
        number = "";
      }
!     if (e.getKeyCode() == KeyEvent.VK_SPACE) {
!       Collection deletion = new LinkedList();
!       {
!         Collection edges = Project.getInstance().getEdges();
!         Iterator iter = edges.iterator();
!         while (iter.hasNext()) {
!           Edge current = (Edge) iter.next();
!           if (current.getConstructor()) {
!             deletion.add(current);
!           }
!         }
!       }
!       {
!         Iterator iter = deletion.iterator();
!         while (iter.hasNext()) {
!           Edge current = (Edge) iter.next();
!           Project.getInstance().remove(current);
!         }
!       }
!       glv.repaint();
!     } else if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
        if (start != null && current != null) {
          locked = start.vertex().minus(current.vertex());
--- 695,699 ----
        number = "";
      }
!     if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
        if (start != null && current != null) {
          locked = start.vertex().minus(current.vertex());

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** AbstractTool.java	16 Jun 2006 09:56:51 -0000	1.71
--- AbstractTool.java	19 Jun 2006 13:15:12 -0000	1.72
***************
*** 189,192 ****
--- 189,202 ----
      sidewards.scale(2 / sidewards.length());
      up.scale(2 / up.length());
+     
+     if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE || e.getKeyCode() == KeyEvent.VK_DELETE) {
+       delete();
+       return;
+     }
+     if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+       escape();
+       return;
+     }
+     
      if ((e.getModifiersEx() & KeyEvent.SHIFT_DOWN_MASK) == KeyEvent.SHIFT_DOWN_MASK) {
        // IF SHIFT IS PRESSED AS MODIFIER
***************
*** 595,598 ****
--- 605,632 ----
     */
    protected abstract void released(MouseEvent e);
+   
+   /**
+    * Invoked when a key has been pressed
+    * @param e KeyEvent
+    */
+   protected void key(KeyEvent e) {
+     
+   }
+   
+   /**
+    * A delete key has been pressed
+    *
+    */
+   protected void delete() {
+     
+   }
+   
+   /**
+    * The escape key has been pressed
+    *
+    */
+   protected void escape() {
+     
+   }
  
    /**