[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool Tool.java, 1.33, 1.34 AbstractTool.java, 1.127, 1.128 Pencil.java, 1.17, 1.18 EraserTool.java, 1.9, 1.10

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

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

Modified Files:
	Tool.java AbstractTool.java Pencil.java EraserTool.java 
Log Message:
Fixed eraser to delete constructors. 
Clears selection when starting pencil or eraser

Index: Pencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Pencil.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Pencil.java	19 Jun 2007 20:10:24 -0000	1.17
--- Pencil.java	31 Aug 2007 12:47:48 -0000	1.18
***************
*** 19,22 ****
--- 19,23 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Edge;
+ import net.sourceforge.bprocessor.model.Selection;
  
  /**
***************
*** 107,110 ****
--- 108,117 ----
    }
    
+   /**
+    * {@inheritDoc}
+    */
+   public void prepare() {
+     Selection.primary().clear();
+   }
    
    /**

Index: EraserTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/EraserTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EraserTool.java	19 Jul 2007 12:23:32 -0000	1.9
--- EraserTool.java	31 Aug 2007 12:47:48 -0000	1.10
***************
*** 14,20 ****
--- 14,22 ----
  import net.sourceforge.bprocessor.gl.GLView;
  import net.sourceforge.bprocessor.model.ClippingPlane;
+ import net.sourceforge.bprocessor.model.Constructor;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Selection;
  
  /**
***************
*** 38,42 ****
    protected void moved(MouseEvent e) {
      findTarget(e);
!     glv.getView().makeTarget(target);
    }
    
--- 40,55 ----
    protected void moved(MouseEvent e) {
      findTarget(e);
!     if (relevant(target)) {
!       glv.getView().makeTarget(target);
!     } else {
!       glv.getView().makeTarget(null);
!     }
!   }
!   
!   
!   private boolean relevant(Object geometric) {
!     return target instanceof Edge 
!       || target instanceof  ClippingPlane
!       || target instanceof Constructor;
    }
    
***************
*** 47,51 ****
    protected void pressed(MouseEvent e) {   
      findTarget(e);
!     if (target instanceof Edge || target instanceof  ClippingPlane) {
        ((Geometric) target).erase();
        Project.getInstance().changed(target);
--- 60,64 ----
    protected void pressed(MouseEvent e) {   
      findTarget(e);
!     if (relevant(target)) {
        ((Geometric) target).erase();
        Project.getInstance().changed(target);
***************
*** 69,72 ****
--- 82,92 ----
    
    /**
+    * {@inheritDoc}
+    */
+   public void prepare() {
+     Selection.primary().clear();
+   }
+   
+   /**
     * Tip on how to set the first click
     * @return short describtion of what to do 

Index: Tool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Tool.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Tool.java	19 Jun 2007 16:11:06 -0000	1.33
--- Tool.java	31 Aug 2007 12:47:48 -0000	1.34
***************
*** 88,91 ****
--- 88,96 ----
    public void cleanUp();
    
+   /**
+    * Prepare
+    */
+   public void prepare();
+   
    /** 
     *  Gives a tip on how to use the tool 

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** AbstractTool.java	9 Jul 2007 13:30:40 -0000	1.127
--- AbstractTool.java	31 Aug 2007 12:47:48 -0000	1.128
***************
*** 696,699 ****
--- 696,706 ----
    
    /**
+    * {@inheritDoc}
+    */
+   public void prepare() {
+     
+   }
+   
+   /**
     * Builtin function
     */