[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions ToolsJoinActionListener.java,1.2,
Status: Pre-Alpha
Brought to you by:
henryml
From: Nordholt <nor...@us...> - 2005-10-02 17:29:30
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23086/actions Modified Files: ToolsJoinActionListener.java Log Message: made temporary changes to prevent crashes Index: ToolsJoinActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsJoinActionListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ToolsJoinActionListener.java 28 Jul 2005 06:54:41 -0000 1.2 --- ToolsJoinActionListener.java 30 Sep 2005 18:02:22 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.SurfaceFacade; + import net.sourceforge.bprocessor.model.Domain; import java.awt.BorderLayout; *************** *** 374,377 **** --- 375,385 ---- fs.setSurfaces(new HashSet()); } + //this is temporary until front and back domains are supported better. + //this will set the front domain to this domain + Domain front = s.getFrontDomain(); + if (front != null) { + front.removeSurface(s); + } + s.setFrontDomain(fs); fs.getSurfaces().add(s); fsf.update(fs); *************** *** 383,386 **** --- 391,401 ---- cs.setSurfaces(new HashSet()); } + //this is temporary until front and back domains are supported better. + //this will set the front domain to this domain + Domain front = s.getFrontDomain(); + if (front != null) { + front.removeSurface(s); + } + s.setFrontDomain(cs); cs.getSurfaces().add(s); csf.update(cs); *************** *** 392,395 **** --- 407,417 ---- e.setSurfaces(new HashSet()); } + //this is temporary until front and back domains are supported better. + //this will set the front domain to this domain + Domain front = s.getFrontDomain(); + if (front != null) { + front.removeSurface(s); + } + s.setFrontDomain(e); e.getSurfaces().add(s); ef.update(e); *************** *** 401,404 **** --- 423,433 ---- p.setSurfaces(new HashSet()); } + //this is temporary until front and back domains are supported better. + //this will set the front domain to this domain + Domain front = s.getFrontDomain(); + if (front != null) { + front.removeSurface(s); + } + s.setFrontDomain(p); p.getSurfaces().add(s); pf.update(p); |