[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.29,1.30 ToolFactory.java,1.14,1.15

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

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

Modified Files:
	AbstractTool.java ToolFactory.java 
Log Message:
- Changed cursor to 32x32, which is only supported size on windows.
- Fixed error when using escape while drawing with pencil

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ToolFactory.java	18 Nov 2005 01:27:56 -0000	1.14
--- ToolFactory.java	22 Nov 2005 13:40:22 -0000	1.15
***************
*** 68,72 ****
      Cursor pencilcursor 
        = Toolkit.getDefaultToolkit().createCustomCursor(pencilimage, new Point(7, 8), "Pencil");
!     url = cl.getResource("Biconrotcam.gif");
      Image rotationImage = Toolkit.getDefaultToolkit().getImage(url);
      Cursor rotationCursor =
--- 68,72 ----
      Cursor pencilcursor 
        = Toolkit.getDefaultToolkit().createCustomCursor(pencilimage, new Point(7, 8), "Pencil");
!     url = cl.getResource("Bcursorrotcam.gif");
      Image rotationImage = Toolkit.getDefaultToolkit().getImage(url);
      Cursor rotationCursor =

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** AbstractTool.java	18 Nov 2005 12:31:26 -0000	1.29
--- AbstractTool.java	22 Nov 2005 13:40:22 -0000	1.30
***************
*** 447,454 ****
     */
    protected void deleteEdge(Edge edge) {
!     Set surfaces = edge.getSurfaces();
!     if (surfaces.size() < 1) {
!       removeEdge(edge);
!       glv.repaint();
        deleteVertex(edge.getTo());
        deleteVertex(edge.getFrom());
--- 447,459 ----
     */
    protected void deleteEdge(Edge edge) {
!     if (edge.getId() != null) {
!       Set surfaces = edge.getSurfaces();
!       if (surfaces.size() < 1) {
!         removeEdge(edge);
!         glv.repaint();
!         deleteVertex(edge.getTo());
!         deleteVertex(edge.getFrom());
!       }
!     } else {
        deleteVertex(edge.getTo());
        deleteVertex(edge.getFrom());
***************
*** 461,468 ****
     */ 
    protected void deleteVertex(Vertex vertex) {
!     Set edges = vertex.getEdges();
!     if (edges.size() < 1) {
!       removeVertex(vertex);
!       glv.repaint();
      }
    } 
--- 466,475 ----
     */ 
    protected void deleteVertex(Vertex vertex) {
!     if (vertex.getId() != null) {
!       Set edges = vertex.getEdges();
!       if (edges.size() < 1) {
!         removeVertex(vertex);
!         glv.repaint();
!       }
      }
    }