[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PasteActionListener.java, 1.6, 1.7 Pe
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-serv32587/src/net/sourceforge/bprocessor/gl/tool Modified Files: PasteActionListener.java Pencil.java ArcTool.java EraserTool.java OffsetTool.java TapeMeasure.java CameraWalkTool.java RectTool.java ShiftActionListener.java RelationTool.java CreateSpaceActionListener.java CameraFlyTool.java AbstractTool.java ExtrusionTool.java ClipplaneTool.java ConstructorTool.java DomainPopupListener.java ExtendTool.java Log Message: Changed a lot of calls to changed() Index: CreateSpaceActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CreateSpaceActionListener.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** CreateSpaceActionListener.java 25 Jun 2009 22:17:40 -0000 1.25 --- CreateSpaceActionListener.java 20 May 2010 10:58:51 -0000 1.26 *************** *** 59,65 **** surface.assignBack(space, Editor.isMulti()); } - surface.changed(); AttributeView.instance().display(space); ! Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); } --- 59,64 ---- surface.assignBack(space, Editor.isMulti()); } AttributeView.instance().display(space); ! Project.getInstance().changed(); Project.getInstance().checkpoint(); } Index: RelationTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RelationTool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RelationTool.java 18 Nov 2007 21:30:17 -0000 1.7 --- RelationTool.java 20 May 2010 10:58:51 -0000 1.8 *************** *** 117,121 **** CoordinateSystem.relate(geometrics); } ! Project.getInstance().changed(source); Project.getInstance().checkpoint(); cleanUp(); --- 117,121 ---- CoordinateSystem.relate(geometrics); } ! Project.getInstance().changed(); Project.getInstance().checkpoint(); cleanUp(); Index: PasteActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PasteActionListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PasteActionListener.java 25 Jun 2009 22:17:39 -0000 1.6 --- PasteActionListener.java 20 May 2010 10:58:51 -0000 1.7 *************** *** 10,13 **** --- 10,14 ---- import java.awt.event.ActionListener; import net.sourceforge.bprocessor.gl.view.View; + import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; *************** *** 56,68 **** surface.setFrontDomain(nonFacing); } - surface.changed(); if (facing != null) { facing.addSurface(surface); - facing.changed(); } if (nonFacing != null) { nonFacing.addSurface(surface); ! nonFacing.changed(); ! } } } --- 57,67 ---- surface.setFrontDomain(nonFacing); } if (facing != null) { facing.addSurface(surface); } if (nonFacing != null) { nonFacing.addSurface(surface); ! } ! Project.getInstance().changed(); } } Index: OffsetTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OffsetTool.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** OffsetTool.java 22 Dec 2009 13:51:51 -0000 1.28 --- OffsetTool.java 20 May 2010 10:58:51 -0000 1.29 *************** *** 291,295 **** private void endOffset() { Geometry.insertEdges(contour); ! Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); cleanUp(); --- 291,295 ---- private void endOffset() { Geometry.insertEdges(contour); ! Project.getInstance().changed(); Project.getInstance().checkpoint(); cleanUp(); Index: ClipplaneTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ClipplaneTool.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ClipplaneTool.java 11 Dec 2007 14:49:11 -0000 1.16 --- ClipplaneTool.java 20 May 2010 10:58:51 -0000 1.17 *************** *** 67,71 **** editor.getView().getMaxClipPlanes()) { Project.getInstance().getCurrentCamera().addClipplane(cp); ! Project.getInstance().changed(Project.getInstance().getCurrentCamera()); } --- 67,71 ---- editor.getView().getMaxClipPlanes()) { Project.getInstance().getCurrentCamera().addClipplane(cp); ! Project.getInstance().changed(); } Index: ConstructorTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ConstructorTool.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ConstructorTool.java 22 Dec 2009 13:51:51 -0000 1.20 --- ConstructorTool.java 20 May 2010 10:58:51 -0000 1.21 *************** *** 50,54 **** Project.getInstance().getActiveSpace().add(point); Project.getInstance().checkpoint(); ! Project.getInstance().changed(Project.getInstance()); } --- 50,54 ---- Project.getInstance().getActiveSpace().add(point); Project.getInstance().checkpoint(); ! Project.getInstance().changed(); } *************** *** 62,66 **** Project.getInstance().getActiveSpace().add(line); Project.getInstance().checkpoint(); ! Project.getInstance().changed(Project.getInstance()); } --- 62,66 ---- Project.getInstance().getActiveSpace().add(line); Project.getInstance().checkpoint(); ! Project.getInstance().changed(); } *************** *** 79,83 **** Project.getInstance().getActiveSpace().add(cs); Project.getInstance().checkpoint(); ! Project.getInstance().changed(Project.getInstance()); } --- 79,83 ---- Project.getInstance().getActiveSpace().add(cs); Project.getInstance().checkpoint(); ! Project.getInstance().changed(); } Index: ExtrusionTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** ExtrusionTool.java 5 Feb 2010 13:32:59 -0000 1.78 --- ExtrusionTool.java 20 May 2010 10:58:51 -0000 1.79 *************** *** 92,96 **** Mesh mesh = new Mesh(extrusion, edges, vertices); space.insert(mesh); ! space.changed(); } --- 92,96 ---- Mesh mesh = new Mesh(extrusion, edges, vertices); space.insert(mesh); ! Project.getInstance().changed(); } Index: TapeMeasure.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasure.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TapeMeasure.java 22 Dec 2009 14:33:34 -0000 1.13 --- TapeMeasure.java 20 May 2010 10:58:51 -0000 1.14 *************** *** 108,112 **** private void insert(Line line) { Geometry.insertConstructor(line); ! Project.getInstance().changed(line); Project.getInstance().checkpoint(); } --- 108,112 ---- private void insert(Line line) { Geometry.insertConstructor(line); ! Project.getInstance().changed(); Project.getInstance().checkpoint(); } Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.153 retrieving revision 1.154 diff -C2 -d -r1.153 -r1.154 *** AbstractTool.java 22 Dec 2009 13:51:51 -0000 1.153 --- AbstractTool.java 20 May 2010 10:58:51 -0000 1.154 *************** *** 628,632 **** Selection.primary().clear(); editor.getView().makeTarget(null); ! Project.getInstance().changed(Project.getInstance().getActiveSpace()); Project.getInstance().checkpoint(); } --- 628,632 ---- Selection.primary().clear(); editor.getView().makeTarget(null); ! Project.getInstance().changed(); Project.getInstance().checkpoint(); } *************** *** 650,654 **** Project p = Project.getInstance(); p.setActiveSpace(p.world()); ! p.changed(p); editor.repaint(); } --- 650,654 ---- Project p = Project.getInstance(); p.setActiveSpace(p.world()); ! p.changed(); editor.repaint(); } *************** *** 916,920 **** Project.getInstance().getGlobals().define(globals); ! Project.getInstance().changed(Project.getInstance().getGlobals()); return stack; --- 916,920 ---- Project.getInstance().getGlobals().define(globals); ! Project.getInstance().changed(); return stack; Index: ArcTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ArcTool.java 22 Dec 2009 13:51:51 -0000 1.26 --- ArcTool.java 20 May 2010 10:58:51 -0000 1.27 *************** *** 191,195 **** public void onVertex() { Geometry.insertEdges(createArc(first.vertex(), current.vertex(), end.vertex(), false)); ! Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); first = null; --- 191,195 ---- public void onVertex() { Geometry.insertEdges(createArc(first.vertex(), current.vertex(), end.vertex(), false)); ! Project.getInstance().changed(); Project.getInstance().checkpoint(); first = null; Index: CameraWalkTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraWalkTool.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CameraWalkTool.java 11 Dec 2007 14:49:11 -0000 1.12 --- CameraWalkTool.java 20 May 2010 10:58:51 -0000 1.13 *************** *** 54,58 **** Camera.rotateHorizontallyEye(c, -angleX); Camera.rotateVerticallyEye(c, angleY); ! Project.getInstance().changed(c); } } --- 54,58 ---- Camera.rotateHorizontallyEye(c, -angleX); Camera.rotateVerticallyEye(c, angleY); ! Project.getInstance().changed(); } } *************** *** 98,102 **** super.keyPressed(e); } ! Project.getInstance().changed(c); } --- 98,102 ---- super.keyPressed(e); } ! Project.getInstance().changed(); } Index: CameraFlyTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraFlyTool.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CameraFlyTool.java 11 Dec 2007 14:49:11 -0000 1.14 --- CameraFlyTool.java 20 May 2010 10:58:51 -0000 1.15 *************** *** 54,58 **** Camera.rotateHorizontallyEye(c, -angleX); Camera.rotateVerticallyEye(c, angleY); ! Project.getInstance().changed(c); } } --- 54,58 ---- Camera.rotateHorizontallyEye(c, -angleX); Camera.rotateVerticallyEye(c, angleY); ! Project.getInstance().changed(); } } *************** *** 99,103 **** super.keyPressed(e); } ! Project.getInstance().changed(c); } --- 99,103 ---- super.keyPressed(e); } ! Project.getInstance().changed(); } Index: ExtendTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtendTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ExtendTool.java 22 Dec 2009 13:51:51 -0000 1.6 --- ExtendTool.java 20 May 2010 10:58:51 -0000 1.7 *************** *** 250,254 **** } } ! owner.changed(); Project.getInstance().checkpoint(); } --- 250,254 ---- } } ! Project.getInstance().changed(); Project.getInstance().checkpoint(); } Index: ShiftActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ShiftActionListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ShiftActionListener.java 25 Jun 2009 22:17:40 -0000 1.6 --- ShiftActionListener.java 20 May 2010 10:58:51 -0000 1.7 *************** *** 10,13 **** --- 10,14 ---- import java.awt.event.ActionListener; + import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; *************** *** 48,60 **** surface.setBackDomain(front); - surface.changed(); if (back != null) { back.addSurface(surface); - back.changed(); } if (front != null) { front.addSurface(surface); - front.changed(); } } --- 49,59 ---- surface.setBackDomain(front); if (back != null) { back.addSurface(surface); } if (front != null) { front.addSurface(surface); } + Project.getInstance().changed(); } Index: Pencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Pencil.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Pencil.java 22 Dec 2009 13:51:51 -0000 1.24 --- Pencil.java 20 May 2010 10:58:51 -0000 1.25 *************** *** 82,86 **** if (start.vertex().equalEps(current.vertex())) { Project.getInstance().getActiveSpace().insert(current.vertex()); ! Project.getInstance().changed(Project.getInstance().getActiveSpace()); Project.getInstance().checkpoint(); cleanUp(); --- 82,86 ---- if (start.vertex().equalEps(current.vertex())) { Project.getInstance().getActiveSpace().insert(current.vertex()); ! Project.getInstance().changed(); Project.getInstance().checkpoint(); cleanUp(); *************** *** 101,105 **** boolean finish = !Geometry.insertEdges(edges).isEmpty() || exsGeometry; ! Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); --- 101,105 ---- boolean finish = !Geometry.insertEdges(edges).isEmpty() || exsGeometry; ! Project.getInstance().changed(); Project.getInstance().checkpoint(); Index: EraserTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/EraserTool.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** EraserTool.java 22 Dec 2009 13:51:51 -0000 1.14 --- EraserTool.java 20 May 2010 10:58:51 -0000 1.15 *************** *** 62,66 **** if (relevant(target)) { ((Geometric) target).erase(); ! Project.getInstance().changed(target); target = null; editor.getView().makeTarget(null); --- 62,66 ---- if (relevant(target)) { ((Geometric) target).erase(); ! Project.getInstance().changed(); target = null; editor.getView().makeTarget(null); Index: RectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RectTool.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** RectTool.java 22 Dec 2009 13:51:51 -0000 1.30 --- RectTool.java 20 May 2010 10:58:51 -0000 1.31 *************** *** 103,107 **** movingEdge.move(direction.getX(), direction.getY(), direction.getZ()); Geometry.insertEdges(rectangle); ! Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); cleanUp(); --- 103,107 ---- movingEdge.move(direction.getX(), direction.getY(), direction.getZ()); Geometry.insertEdges(rectangle); ! Project.getInstance().changed(); Project.getInstance().checkpoint(); cleanUp(); *************** *** 189,193 **** } } ! Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); } --- 189,193 ---- } } ! Project.getInstance().changed(); Project.getInstance().checkpoint(); } Index: DomainPopupListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/DomainPopupListener.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DomainPopupListener.java 25 Jun 2009 22:17:40 -0000 1.10 --- DomainPopupListener.java 20 May 2010 10:58:51 -0000 1.11 *************** *** 48,67 **** public void actionPerformed(ActionEvent arg0) { if (front) { - Space oldFront = surface.getFrontDomain(); surface.assignFront(domain, Editor.isMulti()); - if (oldFront != null) { - oldFront.changed(); - } } else { - Space oldBack = surface.getBackDomain(); surface.assignBack(domain, Editor.isMulti()); - if (oldBack != null) { - oldBack.changed(); - } - } - if (domain != null) { - domain.changed(); } ! surface.changed(); Project.getInstance().checkpoint(); } --- 48,56 ---- public void actionPerformed(ActionEvent arg0) { if (front) { surface.assignFront(domain, Editor.isMulti()); } else { surface.assignBack(domain, Editor.isMulti()); } ! Project.getInstance().changed(); Project.getInstance().checkpoint(); } |