[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool OffsetTool.java, 1.27, 1.28 Extrusion
Status: Pre-Alpha
Brought to you by:
henryml
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26364/src/net/sourceforge/bprocessor/gl/tool Modified Files: OffsetTool.java ExtrusionTool.java ConstructorTool.java FinalMoveTool.java AbstractPencil.java TapeMeasure.java ExtendTool.java Protractor.java AbstractTool.java RotationTool.java ArcTool.java RectTool.java Pencil.java EraserTool.java Removed Files: MoveTool.java EdgeMoveTool.java AltMoveTool.java ControlledMoveTool.java Log Message: length label --- EdgeMoveTool.java DELETED --- Index: RectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RectTool.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** RectTool.java 11 Dec 2007 14:49:11 -0000 1.29 --- RectTool.java 22 Dec 2009 13:51:51 -0000 1.30 *************** *** 203,206 **** --- 203,207 ---- public void prepare() { Selection.primary().clear(); + setLabel("Length:"); } Index: OffsetTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OffsetTool.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** OffsetTool.java 11 Dec 2007 14:49:11 -0000 1.27 --- OffsetTool.java 22 Dec 2009 13:51:51 -0000 1.28 *************** *** 360,364 **** @Override public void prepare() { ! super.prepare(); finalEdgeList.clear(); Selection selection = getSelection(); --- 360,364 ---- @Override public void prepare() { ! setLabel("Length:"); finalEdgeList.clear(); Selection selection = getSelection(); --- ControlledMoveTool.java DELETED --- Index: ConstructorTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ConstructorTool.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ConstructorTool.java 30 Dec 2007 23:24:32 -0000 1.19 --- ConstructorTool.java 22 Dec 2009 13:51:51 -0000 1.20 *************** *** 131,134 **** --- 131,142 ---- /** + * {@inheritDoc} + */ + public void prepare() { + super.prepare(); + } + + + /** * Process click * @param e MouseEvent Index: ExtrusionTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** ExtrusionTool.java 25 Jun 2009 22:17:40 -0000 1.76 --- ExtrusionTool.java 22 Dec 2009 13:51:51 -0000 1.77 *************** *** 478,481 **** --- 478,482 ---- public void prepare() { cleanSelection(); + setLabel("Length:"); } Index: TapeMeasure.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasure.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TapeMeasure.java 11 Dec 2007 14:49:11 -0000 1.11 --- TapeMeasure.java 22 Dec 2009 13:51:51 -0000 1.12 *************** *** 190,193 **** --- 190,200 ---- /** + * {@inheritDoc} + */ + public void prepare() { + setLabel("Length:"); + } + + /** * Tip on how to set the first click * @return short describtion of what to do Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** AbstractTool.java 17 Nov 2009 13:43:59 -0000 1.152 --- AbstractTool.java 22 Dec 2009 13:51:51 -0000 1.153 *************** *** 244,247 **** --- 244,254 ---- editor.setTip(tip); } + + /** + * Clears the tip-panel + */ + public void clearTip() { + editor.setTip(""); + } /** *************** *** 264,273 **** /** ! * Clears the tip-panel */ ! public void clearTip() { ! editor.setTip(""); } /** * See if surface has become a hole in a surface in --- 271,283 ---- /** ! * Sets the label for the parameter ! * @param label Label */ ! public void setLabel(String label) { ! editor.setLengthLabel(label); } + + /** * See if surface has become a hole in a surface in *************** *** 688,692 **** */ public void prepare() { ! } --- 698,702 ---- */ public void prepare() { ! setLabel(">"); } Index: ArcTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ArcTool.java 13 Dec 2007 08:21:40 -0000 1.25 --- ArcTool.java 22 Dec 2009 13:51:51 -0000 1.26 *************** *** 240,243 **** --- 240,244 ---- public void prepare() { Selection.primary().clear(); + setLabel("Length:"); } Index: ExtendTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtendTool.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExtendTool.java 25 Jun 2009 22:17:40 -0000 1.5 --- ExtendTool.java 22 Dec 2009 13:51:51 -0000 1.6 *************** *** 15,19 **** import java.util.Map; - import org.apache.log4j.Logger; import net.sourceforge.bprocessor.gl.Editor; --- 15,18 ---- *************** *** 35,39 **** */ public class ExtendTool extends AbstractPencil { - private static Logger log = Logger.getLogger(ExtendTool.class); private HashSet<Surface> extrusion; private Map<Vertex, Direction> v2dir; --- 34,37 ---- *************** *** 261,268 **** @Override public void prepare() { ! super.prepare(); ! if (!getSelection().isEmpty()) { ! Selection.primary().clear(); ! } } --- 259,264 ---- @Override public void prepare() { ! Selection.primary().clear(); ! setLabel("Length:"); } Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** FinalMoveTool.java 26 Jun 2009 20:41:55 -0000 1.54 --- FinalMoveTool.java 22 Dec 2009 13:51:51 -0000 1.55 *************** *** 594,597 **** --- 594,605 ---- } + + /** + * {@inheritDoc} + */ + public void prepare() { + setLabel("Length:"); + } + /** * Tip on how to set the first click Index: EraserTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/EraserTool.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** EraserTool.java 7 Dec 2007 12:48:31 -0000 1.13 --- EraserTool.java 22 Dec 2009 13:51:51 -0000 1.14 *************** *** 86,89 **** --- 86,90 ---- public void prepare() { Selection.primary().clear(); + setLabel("#"); } Index: AbstractPencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** AbstractPencil.java 18 Sep 2009 09:09:09 -0000 1.110 --- AbstractPencil.java 22 Dec 2009 13:51:51 -0000 1.111 *************** *** 782,785 **** --- 782,792 ---- * {@inheritDoc} */ + public void prepare() { + setLabel("# "); + } + + /** + * {@inheritDoc} + */ public Object evaluate(String value) { Stack stack = evaluateString("echo (" + value + ")"); Index: Pencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Pencil.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Pencil.java 7 Dec 2007 12:48:31 -0000 1.23 --- Pencil.java 22 Dec 2009 13:51:51 -0000 1.24 *************** *** 121,124 **** --- 121,125 ---- public void prepare() { Selection.primary().clear(); + setLabel("Length:"); } --- MoveTool.java DELETED --- --- AltMoveTool.java DELETED --- Index: Protractor.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Protractor.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Protractor.java 22 Nov 2007 10:25:57 -0000 1.20 --- Protractor.java 22 Dec 2009 13:51:51 -0000 1.21 *************** *** 241,244 **** --- 241,245 ---- public void prepare() { Selection.primary().clear(); + setLabel("Angle:"); } Index: RotationTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** RotationTool.java 13 Dec 2007 08:21:40 -0000 1.34 --- RotationTool.java 22 Dec 2009 13:51:51 -0000 1.35 *************** *** 263,266 **** --- 263,273 ---- updateFeedback(); } + + /** + * {@inheritDoc} + */ + public void prepare() { + setLabel("Angle:"); + } /** |