[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.45,1.46 PasteActio
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2006-01-04 14:30:17
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21783/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java PasteActionListener.java ShiftActionListener.java ExtrusionTool.java DomainPopupListener.java CreateSpaceActionListener.java Log Message: Replaced created/remove/modified from Notifier with changed/update Index: CreateSpaceActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CreateSpaceActionListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CreateSpaceActionListener.java 12 Dec 2005 20:19:54 -0000 1.4 --- CreateSpaceActionListener.java 4 Jan 2006 14:29:50 -0000 1.5 *************** *** 89,95 **** } space.addSurface(surface); ! Project.getInstance().update(space); if (old != null) { ! Project.getInstance().update(old); } } --- 89,95 ---- } space.addSurface(surface); ! space.changed(); if (old != null) { ! old.changed(); } } Index: PasteActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PasteActionListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PasteActionListener.java 11 Dec 2005 17:50:58 -0000 1.3 --- PasteActionListener.java 4 Jan 2006 14:29:50 -0000 1.4 *************** *** 9,17 **** import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; - import net.sourceforge.bprocessor.model.Project; import org.apache.log4j.Logger; --- 9,15 ---- *************** *** 58,69 **** surface.setFrontDomain(nonFacing); } ! Project.getInstance().update(surface); if (facing != null) { facing.addSurface(surface); ! Project.getInstance().update(facing); } if (nonFacing != null) { nonFacing.addSurface(surface); ! Project.getInstance().update(nonFacing); } } --- 56,67 ---- surface.setFrontDomain(nonFacing); } ! surface.changed(); if (facing != null) { facing.addSurface(surface); ! facing.changed(); } if (nonFacing != null) { nonFacing.addSurface(surface); ! nonFacing.changed(); } } Index: DomainPopupListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/DomainPopupListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DomainPopupListener.java 11 Dec 2005 17:50:58 -0000 1.3 --- DomainPopupListener.java 4 Jan 2006 14:29:50 -0000 1.4 *************** *** 9,15 **** import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - - - import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; --- 9,12 ---- *************** *** 58,62 **** } if (oldFront != null) { ! Project.getInstance().update(oldFront); } } else { --- 55,59 ---- } if (oldFront != null) { ! oldFront.changed(); } } else { *************** *** 67,78 **** } if (oldBack != null) { ! Project.getInstance().update(oldBack); } } if (domain != null) { ! Project.getInstance().update(domain); } ! ! Project.getInstance().update(surface); } } --- 64,74 ---- } if (oldBack != null) { ! oldBack.changed(); } } if (domain != null) { ! domain.changed(); } ! surface.changed(); } } Index: ExtrusionTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ExtrusionTool.java 20 Dec 2005 13:55:51 -0000 1.36 --- ExtrusionTool.java 4 Jan 2006 14:29:50 -0000 1.37 *************** *** 384,388 **** Surface hole = createSurface(edges); surface.addHole(hole); ! Project.getInstance().update(surface); } } --- 384,388 ---- Surface hole = createSurface(edges); surface.addHole(hole); ! surface.changed(); } } *************** *** 478,485 **** Surface surf = (Surface)surfIt.next(); surf.setBackDomain(back); ! Project.getInstance().update(surf); if (back != null) { back.addSurface(surf); ! Project.getInstance().update(back); } } --- 478,485 ---- Surface surf = (Surface)surfIt.next(); surf.setBackDomain(back); ! surf.changed(); if (back != null) { back.addSurface(surf); ! back.changed(); } } *************** *** 495,502 **** Surface surf = (Surface)surfIt.next(); surf.setFrontDomain(front); ! Project.getInstance().update(surf); if (front != null) { front.addSurface(surf); ! Project.getInstance().update(front); } } --- 495,502 ---- Surface surf = (Surface)surfIt.next(); surf.setFrontDomain(front); ! surf.changed(); if (front != null) { front.addSurface(surf); ! front.changed(); } } Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** AbstractTool.java 29 Dec 2005 15:06:48 -0000 1.45 --- AbstractTool.java 4 Jan 2006 14:29:50 -0000 1.46 *************** *** 441,446 **** v.setY(coord[1]); v.setZ(coord[2]); ! ! Project.getInstance().update(v); } else { log.error("[updateVertex] wrong argument length was: " + coord.length); --- 441,445 ---- v.setY(coord[1]); v.setZ(coord[2]); ! v.changed(); } else { log.error("[updateVertex] wrong argument length was: " + coord.length); *************** *** 483,487 **** */ protected void updateEdge(Edge e) { ! Project.getInstance().update(e); } --- 482,486 ---- */ protected void updateEdge(Edge e) { ! e.changed(); } Index: ShiftActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ShiftActionListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ShiftActionListener.java 11 Dec 2005 17:50:58 -0000 1.3 --- ShiftActionListener.java 4 Jan 2006 14:29:50 -0000 1.4 *************** *** 12,16 **** import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; - import net.sourceforge.bprocessor.model.Project; import org.apache.log4j.Logger; --- 12,15 ---- *************** *** 49,60 **** surface.setBackDomain(front); ! Project.getInstance().update(surface); if (back != null) { back.addSurface(surface); ! Project.getInstance().update(back); } if (front != null) { front.addSurface(surface); ! Project.getInstance().update(front); } } --- 48,59 ---- surface.setBackDomain(front); ! surface.changed(); if (back != null) { back.addSurface(surface); ! back.changed(); } if (front != null) { front.addSurface(surface); ! front.changed(); } } |