[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.165, 1.166 Space.java, 1.148, 1.149

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8739/src/net/sourceforge/bprocessor/model

Modified Files:
	Surface.java Space.java 
Log Message:
Refactored Surface remove Ð a part of remove is now called unlink

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -d -r1.165 -r1.166
*** Surface.java	31 May 2007 12:41:55 -0000	1.165
--- Surface.java	31 May 2007 12:52:14 -0000	1.166
***************
*** 331,335 ****
     */
    public void unlink() {
!     
    }
    
--- 331,355 ----
     */
    public void unlink() {
!     for (Surface current : getHoles()) {
!       if (getExterior() != null) {
!         getExterior().addHole(current);
!       } else {
!         current.setExterior(null);
!       }
!     }
!     if (getExterior() != null) {
!       Surface exterior = getExterior();
!       exterior.removeHole(this);
!     }
!     Space back = getBackDomain();
!     if (back != null) {
!       back.removeSurface(this);
!       setBackDomain(null);
!     }
!     Space front = getFrontDomain();
!     if (front != null) {
!       front.removeSurface(this);
!       setFrontDomain(null);
!     }
    }
    

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** Space.java	31 May 2007 12:41:55 -0000	1.148
--- Space.java	31 May 2007 12:52:14 -0000	1.149
***************
*** 913,937 ****
     */
    public void remove(Surface surface) {
!     for (Surface current : surface.getHoles()) {
!       if (surface.getExterior() != null) {
!         surface.getExterior().addHole(current);
!       } else {
!         current.setExterior(null);
!       }
!     }
!     if (surface.getExterior() != null) {
!       Surface exterior = surface.getExterior();
!       exterior.removeHole(surface);
!     }
!     Space back = surface.getBackDomain();
!     if (back != null) {
!       back.removeSurface(surface);
!       surface.setBackDomain(null);
!     }
!     Space front = surface.getFrontDomain();
!     if (front != null) {
!       front.removeSurface(surface);
!       surface.setFrontDomain(null);
!     }
      surfaces.remove(surface.getId());
      surface.setId(null);
--- 913,917 ----
     */
    public void remove(Surface surface) {
!     surface.unlink();
      surfaces.remove(surface.getId());
      surface.setId(null);