[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.22,1.23 PencilTool.java,1.26,1.27 SelectTool.java,1.31,1.32

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

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

Modified Files:
	AbstractTool.java PencilTool.java SelectTool.java 
Log Message:
Changed feedback in PencilTool to hilite target

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** SelectTool.java	11 Oct 2005 12:05:15 -0000	1.31
--- SelectTool.java	21 Oct 2005 11:57:10 -0000	1.32
***************
*** 8,12 ****
  
  import net.sourceforge.bprocessor.gl.GLView;
- import net.sourceforge.bprocessor.gl.view.View;
  
  import net.sourceforge.bprocessor.kernel.notification.Notification;
--- 8,11 ----
***************
*** 52,58 ****
    protected int viewType;
    
-   /** the object corresponding to the mouse */
-   protected Object target;
-   
    /**
     * The constructor
--- 51,54 ----
***************
*** 63,77 ****
    }
  
-   /**
-    * Find the object under the mouse and set target
-    * @param event The MouseEvent
-    */
-   protected void findTarget(MouseEvent event) {
-     int x = event.getX();
-     int y = event.getY();
-     View view = glv.getView();
-     target = view.getObjectAtPoint(x, y);
-   }
-   
    /** 
     * Invoked when the mouse cursor has been moved
--- 59,62 ----

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** PencilTool.java	21 Oct 2005 08:43:56 -0000	1.26
--- PencilTool.java	21 Oct 2005 11:57:10 -0000	1.27
***************
*** 33,37 ****
   * The DebugTool
   */
! public class PencilTool extends SelectTool {
    /** The logger */
    private static Logger log = Logger.getLogger(PencilTool.class);
--- 33,37 ----
   * The DebugTool
   */
! public class PencilTool extends AbstractTool {
    /** The logger */
    private static Logger log = Logger.getLogger(PencilTool.class);
***************
*** 317,321 ****
     */
    protected void pressed(MouseEvent e) {
!     super.pressed(e);
      boolean legal = findVertex(e);
      if (legal) {
--- 317,322 ----
     */
    protected void pressed(MouseEvent e) {
!     findTarget(e);
!     glv.getView().makeTarget(target);
      boolean legal = findVertex(e);
      if (legal) {
***************
*** 328,332 ****
     */
    protected void moved(MouseEvent e) {
!     super.moved(e);
      findVertex(e);
      
--- 329,334 ----
     */
    protected void moved(MouseEvent e) {
!     findTarget(e);
!     glv.getView().makeTarget(target);
      findVertex(e);
      
***************
*** 358,361 ****
--- 360,365 ----
     */
    protected void released(MouseEvent e) {
+     findTarget(e);
+     glv.getView().makeTarget(null);
      int x = e.getX();
      int y = e.getY();

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** AbstractTool.java	2 Oct 2005 14:48:22 -0000	1.22
--- AbstractTool.java	21 Oct 2005 11:57:10 -0000	1.23
***************
*** 67,70 ****
--- 67,73 ----
    /** The 3DView */
    protected GLView glv = null;
+   
+   /** the object corresponding to the mouse */
+   protected Object target;
   
    static {
***************
*** 149,154 ****
      int y = e.getY();
  
!     this.dx = x - pressPos[0];
!     this.dy = y - pressPos[1];
  
      dragged(e);
--- 152,157 ----
      int y = e.getY();
  
!     AbstractTool.dx = x - pressPos[0];
!     AbstractTool.dy = y - pressPos[1];
  
      dragged(e);
***************
*** 211,216 ****
  
      timer.removeActionListener(moveAction);
!     this.dx = 0;
!     this.dy = 0;
  
      released(e);
--- 214,219 ----
  
      timer.removeActionListener(moveAction);
!     AbstractTool.dx = 0;
!     AbstractTool.dy = 0;
  
      released(e);
***************
*** 439,441 ****
--- 442,455 ----
     */
    protected abstract void released(MouseEvent e);
+ 
+   /**
+    * Find the object under the mouse and set target
+    * @param event The MouseEvent
+    */
+   protected void findTarget(MouseEvent event) {
+     int x = event.getX();
+     int y = event.getY();
+     View view = glv.getView();
+     target = view.getObjectAtPoint(x, y);
+   }
  }