Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17033/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
PencilTool.java ToolFactory.java SelectTool.java
Log Message:
Moved PencilAction inside ToolFactory
Fixed bug wrt naming vertices in PencilTool
Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ToolFactory.java 14 Sep 2005 14:09:38 -0000 1.7
--- ToolFactory.java 29 Sep 2005 21:02:34 -0000 1.8
***************
*** 193,224 ****
}
-
- }
- /**
- * The debug action inner class
- */
- class PencilAction extends AbstractAction {
- /** The GLView */
- private GLView glv = null;
-
- /**
- * Constructor
- * @param glv TheGLView
- */
- PencilAction(GLView glv) {
- this.glv = glv;
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- URL url = cl.getResource("drawicon.png");
- ImageIcon im = new ImageIcon(url);
- putValue(Action.SMALL_ICON, im);
- }
-
/**
! * Called when the button is pressed
! * @param e The ActionEvent
*/
! public void actionPerformed(ActionEvent e) {
! glv.changeTool(Tool.PENCIL_TOOL);
}
}
-
--- 193,222 ----
}
/**
! * The debug action inner class
*/
! class PencilAction extends AbstractAction {
! /** The GLView */
! private GLView glv = null;
!
! /**
! * Constructor
! * @param glv TheGLView
! */
! PencilAction(GLView glv) {
! this.glv = glv;
! ClassLoader cl = Thread.currentThread().getContextClassLoader();
! URL url = cl.getResource("drawicon.png");
! ImageIcon im = new ImageIcon(url);
! putValue(Action.SMALL_ICON, im);
! }
!
! /**
! * Called when the button is pressed
! * @param e The ActionEvent
! */
! public void actionPerformed(ActionEvent e) {
! glv.changeTool(Tool.PENCIL_TOOL);
! }
}
}
Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** SelectTool.java 21 Sep 2005 14:05:55 -0000 1.24
--- SelectTool.java 29 Sep 2005 21:02:34 -0000 1.25
***************
*** 76,79 ****
--- 76,80 ----
protected void moved(MouseEvent e) {
//findTarget(e);
+ target = null;
}
***************
*** 84,87 ****
--- 85,89 ----
protected void dragged(MouseEvent e) {
//findTarget(e);
+ target = null;
}
Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** PencilTool.java 23 Sep 2005 10:47:13 -0000 1.22
--- PencilTool.java 29 Sep 2005 21:02:34 -0000 1.23
***************
*** 83,86 ****
--- 83,87 ----
protected void intern(Vertex vertex) {
if (vertex.getId() == null) {
+ vertex.setName("V" + vertexNum++);
VertexFacade.getInstance().create(vertex);
}
***************
*** 268,272 ****
Plane plane = surface.plane();
Vertex vertex = plane.intersection(ray);
! vertex.setName("V" + vertexNum++);
current = vertex;
if (active != null) {
--- 269,273 ----
Plane plane = surface.plane();
Vertex vertex = plane.intersection(ray);
! vertex.setName("current");
current = vertex;
if (active != null) {
***************
*** 283,287 ****
Edge intersection = edge.intersection(ray);
Vertex vertex = intersection.getFrom();
! vertex.setName("V" + vertexNum++);
current = vertex;
}
--- 284,288 ----
Edge intersection = edge.intersection(ray);
Vertex vertex = intersection.getFrom();
! vertex.setName("current");
current = vertex;
}
***************
*** 291,295 ****
snap = true;
if (vertex != null) {
! vertex.setName("V" + vertexNum++);
current = vertex;
}
--- 292,296 ----
snap = true;
if (vertex != null) {
! vertex.setName("current");
current = vertex;
}
|