[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.167, 1.168 Space.java, 1.149, 1.150

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

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

Modified Files:
	Surface.java Space.java 
Log Message:
Removed some code that caused a problem for net-facade modellor
Fixed a problem with clearing spaces that gave duplicate entries in the envelope

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** Surface.java	4 Jun 2007 20:38:32 -0000	1.167
--- Surface.java	7 Jun 2007 07:04:40 -0000	1.168
***************
*** 345,354 ****
      if (back != null) {
        back.removeSurface(this);
!       // setBackDomain(null);
      }
      Space front = getFrontDomain();
      if (front != null) {
        front.removeSurface(this);
!       // setFrontDomain(null);
      }
    }
--- 345,354 ----
      if (back != null) {
        back.removeSurface(this);
!       setBackDomain(null);
      }
      Space front = getFrontDomain();
      if (front != null) {
        front.removeSurface(this);
!       setFrontDomain(null);
      }
    }
***************
*** 575,588 ****
        }
        copy.setEdges(edges);
!       Space front = (Space) map.get(frontDomain);
!       if (front == null) {
!         front = frontDomain;
!       }
!       copy.setFrontDomain(front);
!       Space back = (Space) map.get(backDomain);
!       if (back == null) {
!         back = backDomain;
!       }
!       copy.setBackDomain(back);
      }
      return copy;
--- 575,588 ----
        }
        copy.setEdges(edges);
!       // Space front = (Space) map.get(frontDomain);
!       // if (front == null) {
!       //  front = frontDomain;
!       // }
!       // copy.setFrontDomain(front);
!       // Space back = (Space) map.get(backDomain);
!       // if (back == null) {
!       //  back = backDomain;
!       // }
!       // copy.setBackDomain(back);
      }
      return copy;

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** Space.java	31 May 2007 12:52:14 -0000	1.149
--- Space.java	7 Jun 2007 07:04:40 -0000	1.150
***************
*** 35,39 ****
    private static final long serialVersionUID = 1L;
    
!   private static final boolean DELETE_EDGES = false;
    
    private static Logger log = Logger.getLogger(Space.class);
--- 35,39 ----
    private static final long serialVersionUID = 1L;
    
!   private static final boolean DELETE_EDGES = true;
    
    private static Logger log = Logger.getLogger(Space.class);
***************
*** 459,462 ****
--- 459,464 ----
            exterior.removeHole(surface);
          }
+         surface.setBackDomain(null);
+         surface.setFrontDomain(null);
        }
        vertices.clear();