[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool Tool.java,1.9,1.10 AbstractTool.java,1.25,1.26 PencilTool.java,1.31,1.32 MoveTool.java,1.15,1.16 ToolFactory.java,1.9,1.10 ExtrusionTool.java,1.24,1.25 ClipplaneTool.java,1.4,1.5 SelectTool.java,1.38,1.39

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

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

Modified Files:
	Tool.java AbstractTool.java PencilTool.java MoveTool.java 
	ToolFactory.java ExtrusionTool.java ClipplaneTool.java 
	SelectTool.java 
Log Message:
Cursor added (currently only pencil has a cursor)

Index: MoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MoveTool.java	27 Oct 2005 15:03:27 -0000	1.15
--- MoveTool.java	7 Nov 2005 07:21:21 -0000	1.16
***************
*** 16,19 ****
--- 16,20 ----
  import net.sourceforge.bprocessor.model.Surface;
  
+ import java.awt.Cursor;
  import java.awt.event.MouseEvent;
  import java.awt.event.KeyEvent;
***************
*** 61,67 ****
     * The Constructor
     * @param glv The 3D canvas
     */
!   public MoveTool(GLView glv) {
!     super(glv);
    }
  
--- 62,69 ----
     * The Constructor
     * @param glv The 3D canvas
+    * @param cursor The cursor
     */
!   public MoveTool(GLView glv, Cursor cursor) {
!     super(glv, cursor);
    }
  

Index: Tool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Tool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Tool.java	1 Nov 2005 07:36:09 -0000	1.9
--- Tool.java	7 Nov 2005 07:21:21 -0000	1.10
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.bprocessor.gl.tool;
  
+ import java.awt.Cursor;
  import java.awt.event.KeyListener;
  import java.awt.event.MouseListener;
***************
*** 32,34 ****
--- 33,43 ----
     */
    public Collection getSelection();
+   
+   /**
+    * Getter for cursor
+    * @return The cursor
+    */
+   public Cursor getCursor();
+   
+   
  }

Index: ClipplaneTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ClipplaneTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClipplaneTool.java	6 Nov 2005 16:33:44 -0000	1.4
--- ClipplaneTool.java	7 Nov 2005 07:21:21 -0000	1.5
***************
*** 13,16 ****
--- 13,17 ----
  import net.sourceforge.bprocessor.model.Vertex;
  
+ import java.awt.Cursor;
  import java.awt.event.MouseEvent;
  
***************
*** 28,34 ****
     * The Constructor
     * @param glv The 3D canvas
     */
!   public ClipplaneTool(GLView glv) {
!     super(glv);
    }
  
--- 29,36 ----
     * The Constructor
     * @param glv The 3D canvas
+    * @param cursor The cursor
     */
!   public ClipplaneTool(GLView glv, Cursor cursor) {
!     super(glv, cursor);
    }
  

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ToolFactory.java	1 Nov 2005 07:36:09 -0000	1.9
--- ToolFactory.java	7 Nov 2005 07:21:21 -0000	1.10
***************
*** 12,15 ****
--- 12,19 ----
  
  import java.net.URL;
+ import java.awt.Cursor;
+ import java.awt.Image;
+ import java.awt.Point;
+ import java.awt.Toolkit;
  import java.awt.event.ActionEvent;
  import javax.swing.AbstractAction;
***************
*** 50,58 ****
     */
    private ToolFactory(GLView glv) {
!     select = new SelectTool(glv);
!     pencil = new PencilTool(glv);
!     move = new MoveTool(glv);
!     extrusion = new ExtrusionTool(glv);
!     clipplane = new ClipplaneTool(glv);
  
      Toolbar tb = Toolbar.getInstance();
--- 54,64 ----
     */
    private ToolFactory(GLView glv) {
!     
!     ClassLoader cl = Thread.currentThread().getContextClassLoader();
!     URL url = cl.getResource("drawicon.png");
!     Image pencilimage = Toolkit.getDefaultToolkit().getImage(url);
!     Cursor pencilcursor 
!       = Toolkit.getDefaultToolkit().createCustomCursor(pencilimage, new Point(1, 15), "Pencil");
!     
  
      Toolbar tb = Toolbar.getInstance();
***************
*** 68,71 ****
--- 74,83 ----
      but.setToolTipText("Clipping");
      
+     select = new SelectTool(glv, null);
+     pencil = new PencilTool(glv, pencilcursor);
+     move = new MoveTool(glv, null);
+     extrusion = new ExtrusionTool(glv, null);
+     clipplane = new ClipplaneTool(glv, null);
+     
      Notifier.getInstance().addListener(select);
    }
***************
*** 205,208 ****
--- 217,224 ----
      /** The GLView */
      private GLView glv = null;
+     
+     /** The Cursor */
+     
+     private Cursor cursor = null;
    
      /** 
***************
*** 216,219 ****
--- 232,238 ----
        ImageIcon im = new ImageIcon(url);
        putValue(Action.SMALL_ICON, im);
+       Image image = Toolkit.getDefaultToolkit().getImage(url);
+       cursor = Toolkit.getDefaultToolkit().createCustomCursor(image, new Point(0, 0), "Pencil");
+       
      }
    

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** SelectTool.java	4 Nov 2005 09:38:55 -0000	1.38
--- SelectTool.java	7 Nov 2005 07:21:21 -0000	1.39
***************
*** 23,26 ****
--- 23,27 ----
  import net.sourceforge.bprocessor.model.Space;
  
+ import java.awt.Cursor;
  import java.awt.event.ActionListener;
  import java.awt.event.MouseEvent;
***************
*** 51,57 ****
     * The constructor
     * @param glv The 3D canvas
     */
!   public SelectTool(GLView glv) {
!     super(glv);
    }
  
--- 52,59 ----
     * The constructor
     * @param glv The 3D canvas
+    * @param cursor The cursor
     */
!   public SelectTool(GLView glv, Cursor cursor) {
!     super(glv, cursor);
    }
  

Index: ExtrusionTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ExtrusionTool.java	1 Nov 2005 16:22:26 -0000	1.24
--- ExtrusionTool.java	7 Nov 2005 07:21:21 -0000	1.25
***************
*** 22,25 ****
--- 22,26 ----
  import net.sourceforge.bprocessor.model.Plane;
  
+ import java.awt.Cursor;
  import java.awt.event.MouseEvent;
  
***************
*** 66,72 ****
     * The Constructor
     * @param glv The 3D canvas
     */
!   public ExtrusionTool(GLView glv) {
!     super(glv);
    }
  
--- 67,74 ----
     * The Constructor
     * @param glv The 3D canvas
+    * @param cursor The cursor
     */
!   public ExtrusionTool(GLView glv, Cursor cursor) {
!     super(glv, cursor);
    }
  

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** PencilTool.java	4 Nov 2005 09:38:55 -0000	1.31
--- PencilTool.java	7 Nov 2005 07:21:21 -0000	1.32
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.bprocessor.gl.tool;
  
+ import java.awt.Cursor;
  import java.awt.event.MouseEvent;
  import java.awt.event.KeyEvent;
***************
*** 73,79 ****
     * Constructor
     * @param glv The GLView
     */
!   public PencilTool(GLView glv) {
!     super(glv);
    }
  
--- 74,81 ----
     * Constructor
     * @param glv The GLView
+    * @param cursor The cursor
     */
!   public PencilTool(GLView glv, Cursor cursor) {
!     super(glv, cursor);
    }
  

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** AbstractTool.java	1 Nov 2005 16:23:49 -0000	1.25
--- AbstractTool.java	7 Nov 2005 07:21:21 -0000	1.26
***************
*** 14,17 ****
--- 14,18 ----
  import net.sourceforge.bprocessor.gl.GLView;
  
+ import java.awt.Cursor;
  import java.awt.event.ActionListener;
  import java.awt.event.KeyEvent;
***************
*** 70,73 ****
--- 71,79 ----
    /** the object corresponding to the mouse */
    protected Object target;
+   
+   /** The cursor associated with this tool */
+   
+   protected Cursor cursor;
+   
   
    static {
***************
*** 79,88 ****
     * KeyListener for the GL Canvas
     * @param glv The 3D canvas
     */
!   public AbstractTool(GLView glv) {
      this.glv = glv;
      timer.start();
      moveAction = new CameraMoveTimer(this, glv);
    }
  
    /**
--- 85,104 ----
     * KeyListener for the GL Canvas
     * @param glv The 3D canvas
+    * @param cursor The cursor
     */
!   public AbstractTool(GLView glv, Cursor cursor) {
      this.glv = glv;
+     this.cursor = cursor;
      timer.start();
      moveAction = new CameraMoveTimer(this, glv);
    }
+   
+   /**
+    * Getter for cursor
+    * @return The cursor
+    */
+   public Cursor getCursor() {
+     return cursor;
+   }
  
    /**