[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ZoomTool.java, 1.1, 1.2 FocusTool.jav
Status: Pre-Alpha
Brought to you by:
henryml
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25490/src/net/sourceforge/bprocessor/gl/tool Modified Files: ZoomTool.java FocusTool.java RelationTool.java ExtrusionTool.java ConstructorTool.java AbstractPencil.java OrbitStrategy.java PanTool.java CameraFlyTool.java ToolFactory.java SelectStrategy.java RotationTool.java RectTool.java EraserTool.java Pencil.java SelectTool.java CameraWalkTool.java ControlledMoveTool.java PanStrategy.java MoveTool.java OffsetTool.java SpaceTool.java ClipplaneTool.java EdgeMoveTool.java FinalMoveTool.java TapeMeasure.java CameraTool.java ControlledExtrudeTool.java AbstractTool.java Protractor.java ArcTool.java AltMoveTool.java Log Message: Renamed GLView to Editor Index: PanTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PanTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PanTool.java 3 Sep 2007 13:36:52 -0000 1.1 --- PanTool.java 18 Nov 2007 20:32:47 -0000 1.2 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import java.awt.Cursor; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import java.awt.Cursor; *************** *** 25,29 **** * @param cursor The cursor */ ! public PanTool(GLView glv, Cursor cursor) { super(glv, cursor); dragDelay = 0; --- 25,29 ---- * @param cursor The cursor */ ! public PanTool(Editor glv, Cursor cursor) { super(glv, cursor); dragDelay = 0; Index: OffsetTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OffsetTool.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** OffsetTool.java 13 Nov 2007 12:19:21 -0000 1.23 --- OffsetTool.java 18 Nov 2007 20:32:47 -0000 1.24 *************** *** 21,25 **** import java.util.HashMap; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.model.CoordinateSystem; --- 21,25 ---- import java.util.HashMap; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.model.CoordinateSystem; *************** *** 75,79 **** * @param cursor The Cursor */ ! public OffsetTool(GLView glv, Cursor cursor) { super(glv, cursor); guide = new Edge(new Vertex(0, 0, 0), new Vertex(0, 0, 0)); --- 75,79 ---- * @param cursor The Cursor */ ! public OffsetTool(Editor glv, Cursor cursor) { super(glv, cursor); guide = new Edge(new Vertex(0, 0, 0), new Vertex(0, 0, 0)); Index: ClipplaneTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ClipplaneTool.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ClipplaneTool.java 13 Nov 2007 12:19:22 -0000 1.13 --- ClipplaneTool.java 18 Nov 2007 20:32:47 -0000 1.14 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.gl.view.View; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.gl.view.View; *************** *** 39,43 **** * @param cursor The cursor */ ! public ClipplaneTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 39,43 ---- * @param cursor The cursor */ ! public ClipplaneTool(Editor 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.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** ToolFactory.java 14 Nov 2007 10:34:29 -0000 1.90 --- ToolFactory.java 18 Nov 2007 20:32:47 -0000 1.91 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gui.Toolbar; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gui.Toolbar; *************** *** 42,46 **** /** glv */ ! private GLView glv; /** tools */ --- 42,46 ---- /** glv */ ! private Editor glv; /** tools */ *************** *** 138,142 **** * @param glv the GLView */ ! private ToolFactory(GLView glv) { tools = new HashMap(); buttons = new HashMap(); --- 138,142 ---- * @param glv the GLView */ ! private ToolFactory(Editor glv) { tools = new HashMap(); buttons = new HashMap(); *************** *** 318,322 **** * @return The factory */ ! public static synchronized ToolFactory getFactory(GLView glv) { if (factory == null) { factory = new ToolFactory(glv); --- 318,322 ---- * @return The factory */ ! public static synchronized ToolFactory getFactory(Editor glv) { if (factory == null) { factory = new ToolFactory(glv); *************** *** 401,405 **** /** glv */ ! protected GLView glv; /** key */ --- 401,405 ---- /** glv */ ! protected Editor glv; /** key */ *************** *** 412,416 **** * @param iconname Iconname */ ! public ToolAction(GLView glv, int key, String iconname) { this.glv = glv; this.key = key; --- 412,416 ---- * @param iconname Iconname */ ! public ToolAction(Editor glv, int key, String iconname) { this.glv = glv; this.key = key; Index: SelectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** SelectTool.java 24 Sep 2007 13:02:17 -0000 1.66 --- SelectTool.java 18 Nov 2007 20:32:47 -0000 1.67 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import java.awt.Cursor; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import java.awt.Cursor; *************** *** 25,29 **** * @param cursor The cursor */ ! public SelectTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 25,29 ---- * @param cursor The cursor */ ! public SelectTool(Editor 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.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** ExtrusionTool.java 13 Nov 2007 12:19:22 -0000 1.70 --- ExtrusionTool.java 18 Nov 2007 20:32:47 -0000 1.71 *************** *** 18,22 **** import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.Transformation; --- 18,22 ---- import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.Transformation; *************** *** 79,83 **** * @param cursor Cursor */ ! public ExtrusionTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 79,83 ---- * @param cursor Cursor */ ! public ExtrusionTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: AbstractPencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** AbstractPencil.java 13 Nov 2007 12:19:22 -0000 1.98 --- AbstractPencil.java 18 Nov 2007 20:32:47 -0000 1.99 *************** *** 22,26 **** import javax.swing.Timer; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.EdgeAttributes; import net.sourceforge.bprocessor.gl.model.Intersection; --- 22,26 ---- import javax.swing.Timer; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.EdgeAttributes; import net.sourceforge.bprocessor.gl.model.Intersection; *************** *** 137,141 **** * @param cursor Cursor */ ! public AbstractPencil(GLView glv, Cursor cursor) { super(glv, cursor); timer = new Timer(500, new TargetAction()); --- 137,141 ---- * @param cursor Cursor */ ! public AbstractPencil(Editor glv, Cursor cursor) { super(glv, cursor); timer = new Timer(500, new TargetAction()); Index: EraserTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/EraserTool.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** EraserTool.java 31 Aug 2007 12:47:48 -0000 1.10 --- EraserTool.java 18 Nov 2007 20:32:47 -0000 1.11 *************** *** 12,16 **** import java.awt.event.MouseEvent; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.ClippingPlane; import net.sourceforge.bprocessor.model.Constructor; --- 12,16 ---- import java.awt.event.MouseEvent; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.ClippingPlane; import net.sourceforge.bprocessor.model.Constructor; *************** *** 30,34 **** * @param cursor The Cursor */ ! public EraserTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 30,34 ---- * @param cursor The Cursor */ ! public EraserTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** MoveTool.java 28 Nov 2006 10:53:11 -0000 1.74 --- MoveTool.java 18 Nov 2007 20:32:47 -0000 1.75 *************** *** 16,20 **** import java.util.Set; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.View; --- 16,20 ---- import java.util.Set; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.View; *************** *** 56,60 **** * @param cursor The Cursor */ ! public MoveTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 56,60 ---- * @param cursor The Cursor */ ! public MoveTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: RotationTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** RotationTool.java 15 Nov 2007 13:07:41 -0000 1.30 --- RotationTool.java 18 Nov 2007 20:32:47 -0000 1.31 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.GlObject; import net.sourceforge.bprocessor.gl.model.Intersection; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.GlObject; import net.sourceforge.bprocessor.gl.model.Intersection; *************** *** 68,72 **** * @param cursor The cursor */ ! public RotationTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 68,72 ---- * @param cursor The cursor */ ! public RotationTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: ArcTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ArcTool.java 13 Nov 2007 12:19:22 -0000 1.20 --- ArcTool.java 18 Nov 2007 20:32:47 -0000 1.21 *************** *** 14,18 **** import java.util.List; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.model.CoordinateSystem; --- 14,18 ---- import java.util.List; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.model.CoordinateSystem; *************** *** 170,174 **** * @param cursor Cursor */ ! public ArcTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 170,174 ---- * @param cursor Cursor */ ! public ArcTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: ControlledMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ControlledMoveTool.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ControlledMoveTool.java 13 Nov 2007 12:19:22 -0000 1.10 --- ControlledMoveTool.java 18 Nov 2007 20:32:47 -0000 1.11 *************** *** 18,22 **** import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.gl.view.View; --- 18,22 ---- import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.gl.view.View; *************** *** 47,51 **** * @param cursor Cursor */ ! public ControlledMoveTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 47,51 ---- * @param cursor Cursor */ ! public ControlledMoveTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: TapeMeasure.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasure.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TapeMeasure.java 13 Nov 2007 12:19:22 -0000 1.5 --- TapeMeasure.java 18 Nov 2007 20:32:47 -0000 1.6 *************** *** 13,17 **** import java.util.List; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometry; --- 13,17 ---- import java.util.List; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometry; *************** *** 40,44 **** * @param cursor Cursor */ ! public TapeMeasure(GLView glv, Cursor cursor) { super(glv, cursor); } --- 40,44 ---- * @param cursor Cursor */ ! public TapeMeasure(Editor glv, Cursor cursor) { super(glv, cursor); } Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** SpaceTool.java 12 Nov 2007 08:05:34 -0000 1.91 --- SpaceTool.java 18 Nov 2007 20:32:47 -0000 1.92 *************** *** 24,28 **** import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gui.PopupMenu; import net.sourceforge.bprocessor.gui.actions.SpaceMenuAction; --- 24,28 ---- import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gui.PopupMenu; import net.sourceforge.bprocessor.gui.actions.SpaceMenuAction; *************** *** 50,54 **** * @param cursor The cursor */ ! public SpaceTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 50,54 ---- * @param cursor The cursor */ ! public SpaceTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: CameraFlyTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraFlyTool.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CameraFlyTool.java 13 Nov 2007 12:19:22 -0000 1.11 --- CameraFlyTool.java 18 Nov 2007 20:32:47 -0000 1.12 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Project; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Project; *************** *** 30,34 **** * @param cursor the cursor */ ! public CameraFlyTool(GLView glv, Cursor cursor) { super(glv, cursor); dragDelay = 0; --- 30,34 ---- * @param cursor the cursor */ ! public CameraFlyTool(Editor glv, Cursor cursor) { super(glv, cursor); dragDelay = 0; Index: AltMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AltMoveTool.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AltMoveTool.java 13 Nov 2007 12:19:22 -0000 1.13 --- AltMoveTool.java 18 Nov 2007 20:32:47 -0000 1.14 *************** *** 16,20 **** import java.util.Map; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.Transformation; --- 16,20 ---- import java.util.Map; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.Transformation; *************** *** 46,50 **** * @param cursor Cursor */ ! public AltMoveTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 46,50 ---- * @param cursor Cursor */ ! public AltMoveTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: RelationTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RelationTool.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RelationTool.java 7 May 2007 13:29:48 -0000 1.5 --- RelationTool.java 18 Nov 2007 20:32:47 -0000 1.6 *************** *** 18,22 **** import java.util.List; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Constructor; import net.sourceforge.bprocessor.model.CoordinateSystem; --- 18,22 ---- import java.util.List; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Constructor; import net.sourceforge.bprocessor.model.CoordinateSystem; *************** *** 38,42 **** * @param cursor Cursor */ ! public RelationTool(GLView glv, Cursor cursor) { super(glv, cursor); ClassLoader cl = Thread.currentThread().getContextClassLoader(); --- 38,42 ---- * @param cursor Cursor */ ! public RelationTool(Editor glv, Cursor cursor) { super(glv, cursor); ClassLoader cl = Thread.currentThread().getContextClassLoader(); Index: PanStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PanStrategy.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PanStrategy.java 1 Mar 2007 14:53:56 -0000 1.3 --- PanStrategy.java 18 Nov 2007 20:32:47 -0000 1.4 *************** *** 10,14 **** import java.awt.event.MouseEvent; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.Camera; --- 10,14 ---- import java.awt.event.MouseEvent; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.Camera; *************** *** 23,27 **** /** The GLView */ ! private GLView glv; /** The x */ --- 23,27 ---- /** The GLView */ ! private Editor glv; /** The x */ *************** *** 36,40 **** * @param glv GLView */ ! public PanStrategy(GLView glv) { this.glv = glv; } --- 36,40 ---- * @param glv GLView */ ! public PanStrategy(Editor glv) { this.glv = glv; } Index: ControlledExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ControlledExtrudeTool.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ControlledExtrudeTool.java 8 Oct 2007 11:56:27 -0000 1.8 --- ControlledExtrudeTool.java 18 Nov 2007 20:32:47 -0000 1.9 *************** *** 17,21 **** import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.Transformation; --- 17,21 ---- import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.Transformation; *************** *** 59,63 **** * @param cursor The cursor to use */ ! public ControlledExtrudeTool(GLView glv, Cursor cursor) { super(glv, cursor); extrusion = new HashSet<Surface>(); --- 59,63 ---- * @param cursor The cursor to use */ ! public ControlledExtrudeTool(Editor glv, Cursor cursor) { super(glv, cursor); extrusion = new HashSet<Surface>(); Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** AbstractTool.java 13 Nov 2007 12:19:22 -0000 1.136 --- AbstractTool.java 18 Nov 2007 20:32:47 -0000 1.137 *************** *** 31,35 **** import net.sourceforge.bprocessor.gl.model.Widget; import net.sourceforge.bprocessor.gl.view.View; ! import net.sourceforge.bprocessor.gl.GLView; --- 31,35 ---- import net.sourceforge.bprocessor.gl.model.Widget; import net.sourceforge.bprocessor.gl.view.View; ! import net.sourceforge.bprocessor.gl.Editor; *************** *** 123,127 **** /** The 3DView */ ! protected GLView glv = null; /** the object corresponding to the mouse */ --- 123,127 ---- /** The 3DView */ ! protected Editor glv = null; /** the object corresponding to the mouse */ *************** *** 163,167 **** * @param cursor The cursor */ ! public AbstractTool(GLView glv, Cursor cursor) { this.glv = glv; this.cursor = cursor; --- 163,167 ---- * @param cursor The cursor */ ! public AbstractTool(Editor glv, Cursor cursor) { this.glv = glv; this.cursor = cursor; Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** FinalMoveTool.java 13 Nov 2007 12:19:22 -0000 1.32 --- FinalMoveTool.java 18 Nov 2007 20:32:47 -0000 1.33 *************** *** 18,22 **** import java.util.Stack; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.gui.GUI; --- 18,22 ---- import java.util.Stack; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.gui.GUI; *************** *** 55,59 **** * @param cursor Cursor */ ! public FinalMoveTool(GLView glv, Cursor cursor) { super(glv, cursor); // TODO Auto-generated constructor stub --- 55,59 ---- * @param cursor Cursor */ ! public FinalMoveTool(Editor glv, Cursor cursor) { super(glv, cursor); // TODO Auto-generated constructor stub Index: SelectStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** SelectStrategy.java 5 Nov 2007 09:45:00 -0000 1.20 --- SelectStrategy.java 18 Nov 2007 20:32:47 -0000 1.21 *************** *** 15,19 **** import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.GlCamera; import net.sourceforge.bprocessor.gl.view.Transformation; --- 15,19 ---- import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.GlCamera; import net.sourceforge.bprocessor.gl.view.Transformation; *************** *** 37,41 **** /** The GLView **/ ! private GLView glv; /** Tempoary edges for multiple selection */ --- 37,41 ---- /** The GLView **/ ! private Editor glv; /** Tempoary edges for multiple selection */ *************** *** 72,76 **** * @param glv GLView */ ! public SelectStrategy(GLView glv) { super(); this.glv = glv; --- 72,76 ---- * @param glv GLView */ ! public SelectStrategy(Editor glv) { super(); this.glv = glv; Index: FocusTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FocusTool.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FocusTool.java 27 Sep 2007 10:39:16 -0000 1.5 --- FocusTool.java 18 Nov 2007 20:32:47 -0000 1.6 *************** *** 10,14 **** import java.awt.event.MouseEvent; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.ClippingPlane; --- 10,14 ---- import java.awt.event.MouseEvent; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.ClippingPlane; *************** *** 26,30 **** * @param cursor Cursor */ ! public FocusTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 26,30 ---- * @param cursor Cursor */ ! public FocusTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: RectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RectTool.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** RectTool.java 13 Nov 2007 12:19:22 -0000 1.25 --- RectTool.java 18 Nov 2007 20:32:47 -0000 1.26 *************** *** 16,20 **** import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometry; --- 16,20 ---- import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometry; *************** *** 57,61 **** * @param cursor Cursor */ ! public RectTool(GLView glv, Cursor cursor) { super(glv, cursor); rectangle = new LinkedList<Edge>(); --- 57,61 ---- * @param cursor Cursor */ ! public RectTool(Editor glv, Cursor cursor) { super(glv, cursor); rectangle = new LinkedList<Edge>(); Index: EdgeMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/EdgeMoveTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EdgeMoveTool.java 13 Nov 2007 12:19:22 -0000 1.4 --- EdgeMoveTool.java 18 Nov 2007 20:32:47 -0000 1.5 *************** *** 18,22 **** import java.util.Set; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.Transformation; --- 18,22 ---- import java.util.Set; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.Transformation; *************** *** 52,56 **** * @param cursor Cursor */ ! public EdgeMoveTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 52,56 ---- * @param cursor Cursor */ ! public EdgeMoveTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: ConstructorTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ConstructorTool.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ConstructorTool.java 20 Jun 2007 13:17:56 -0000 1.15 --- ConstructorTool.java 18 Nov 2007 20:32:47 -0000 1.16 *************** *** 13,17 **** import java.util.List; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.model.Edge; --- 13,17 ---- import java.util.List; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.model.Edge; *************** *** 38,42 **** * @param cursor The Cursor */ ! public ConstructorTool(GLView glv, Cursor cursor) { super(glv, cursor); } --- 38,42 ---- * @param cursor The Cursor */ ! public ConstructorTool(Editor glv, Cursor cursor) { super(glv, cursor); } Index: CameraTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraTool.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CameraTool.java 20 Jun 2007 13:17:55 -0000 1.13 --- CameraTool.java 18 Nov 2007 20:32:47 -0000 1.14 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; //import java.awt.event.KeyEvent; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; //import java.awt.event.KeyEvent; *************** *** 39,43 **** * @param cursor1 The Mouse cursor for rotation */ ! public CameraTool(GLView glv, Cursor cursor1) { super(glv, cursor1); orbit = new OrbitStrategy(glv); --- 39,43 ---- * @param cursor1 The Mouse cursor for rotation */ ! public CameraTool(Editor glv, Cursor cursor1) { super(glv, cursor1); orbit = new OrbitStrategy(glv); Index: OrbitStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OrbitStrategy.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OrbitStrategy.java 31 Oct 2006 13:30:30 -0000 1.3 --- OrbitStrategy.java 18 Nov 2007 20:32:47 -0000 1.4 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.Camera; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.Camera; *************** *** 35,39 **** /** GLView */ ! protected GLView glv; /** The x position */ --- 35,39 ---- /** GLView */ ! protected Editor glv; /** The x position */ *************** *** 47,51 **** * @param glv The 3D canvas */ ! public OrbitStrategy(GLView glv) { this.glv = glv; } --- 47,51 ---- * @param glv The 3D canvas */ ! public OrbitStrategy(Editor glv) { this.glv = glv; } Index: ZoomTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ZoomTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZoomTool.java 3 Sep 2007 13:36:52 -0000 1.1 --- ZoomTool.java 18 Nov 2007 20:32:47 -0000 1.2 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Project; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Project; *************** *** 28,32 **** * @param cursor The cursor */ ! public ZoomTool(GLView glv, Cursor cursor) { super(glv, cursor); dragDelay = 0; --- 28,32 ---- * @param cursor The cursor */ ! public ZoomTool(Editor glv, Cursor cursor) { super(glv, cursor); dragDelay = 0; Index: CameraWalkTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraWalkTool.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CameraWalkTool.java 13 Nov 2007 12:19:22 -0000 1.9 --- CameraWalkTool.java 18 Nov 2007 20:32:47 -0000 1.10 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Project; --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Project; *************** *** 30,34 **** * @param cursor the cursor */ ! public CameraWalkTool(GLView glv, Cursor cursor) { super(glv, cursor); dragDelay = 0; --- 30,34 ---- * @param cursor the cursor */ ! public CameraWalkTool(Editor glv, Cursor cursor) { super(glv, cursor); dragDelay = 0; Index: Pencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Pencil.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Pencil.java 9 Nov 2007 09:45:32 -0000 1.20 --- Pencil.java 18 Nov 2007 20:32:47 -0000 1.21 *************** *** 14,18 **** import java.util.List; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.model.Geometry; --- 14,18 ---- import java.util.List; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.model.Geometry; *************** *** 31,35 **** * @param cursor Cursor */ ! public Pencil(GLView glv, Cursor cursor) { super(glv, cursor); dragging = false; --- 31,35 ---- * @param cursor Cursor */ ! public Pencil(Editor glv, Cursor cursor) { super(glv, cursor); dragging = false; Index: Protractor.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Protractor.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Protractor.java 15 Nov 2007 13:07:41 -0000 1.14 --- Protractor.java 18 Nov 2007 20:32:47 -0000 1.15 *************** *** 15,19 **** import javax.media.opengl.GL; ! import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.GlObject; import net.sourceforge.bprocessor.gl.model.Intersection; --- 15,19 ---- import javax.media.opengl.GL; ! import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gl.model.GlObject; import net.sourceforge.bprocessor.gl.model.Intersection; *************** *** 46,50 **** * @param cursor Cursor */ ! public Protractor(GLView glv, Cursor cursor) { super(glv, cursor); } --- 46,50 ---- * @param cursor Cursor */ ! public Protractor(Editor glv, Cursor cursor) { super(glv, cursor); } |