[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java, 1.93, 1.94 Surface.java, 1.170, 1.171 Space.java, 1.161, 1.162

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

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

Modified Files:
	Edge.java Surface.java Space.java 
Log Message:
Refactored Surface erase/delete/remove

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** Surface.java	18 Jul 2007 14:03:38 -0000	1.170
--- Surface.java	20 Jul 2007 13:33:26 -0000	1.171
***************
*** 321,333 ****
    public void delete() {
      if (getOwner() != null) {
!       for (Edge edge : getEdges()) {
!         if (edge.getSurfaces().size() < 1) {
!           edge.delete();
!         }
!       }
        getOwner().remove(this);
      }
    }
    
    /**
     * Remove references to this Surface in the rest of the model
--- 321,340 ----
    public void delete() {
      if (getOwner() != null) {
!       unlink();
        getOwner().remove(this);
      }
    }
    
+   /** {@inheritDoc} */
+   @Override
+   public void erase() {
+     delete();
+     for (Edge edge : getEdges()) {
+       if (edge.getSurfaces().size() < 1) {
+         edge.delete();
+       }
+     }
+   }
+   
    /**
     * Remove references to this Surface in the rest of the model

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** Space.java	18 Jul 2007 14:07:57 -0000	1.161
--- Space.java	20 Jul 2007 13:33:26 -0000	1.162
***************
*** 799,803 ****
     */
    public void remove(Surface surface) {
-     surface.unlink();
      surfaces.remove(surface.getId());
      surface.setId(null);
--- 799,802 ----

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** Edge.java	18 Jul 2007 14:03:37 -0000	1.93
--- Edge.java	20 Jul 2007 13:33:26 -0000	1.94
***************
*** 202,208 ****
    public void delete() {
      if (getOwner() != null) {
        Set<Surface> surfaces = getSurfaces();      
        Vertex to = getTo();
!       Vertex from = getFrom(); 
  
        // Merge two adjacant surface.
--- 202,214 ----
    public void delete() {
      if (getOwner() != null) {
+       Space owner = getOwner();
+       
        Set<Surface> surfaces = getSurfaces();      
        Vertex to = getTo();
!       Vertex from = getFrom();
!       
!       owner.remove(this);
!       
!       
  
        // Merge two adjacant surface.
***************
*** 223,227 ****
              edges1.addAll(edges2);
              Surface surface = new Surface(edges1);
!             getOwner().add(surface);            
              if (s1.getExterior() != null) {
                s1.getExterior().addHole(surface);
--- 229,233 ----
              edges1.addAll(edges2);
              Surface surface = new Surface(edges1);
!             owner.add(surface);            
              if (s1.getExterior() != null) {
                s1.getExterior().addHole(surface);
***************
*** 241,259 ****
  
        for (Surface surface : surfaces) {
!         // Here the surface need to be unlinked
!         getOwner().remove(surface);  
        }
  
        if (to.getOwner() != null) {
          if (to.getEdges().size() == 0) {
!           getOwner().remove(to);
          }
        }
        if (from.getOwner() != null) {
          if (from.getEdges().size() == 0) {
!           getOwner().remove(from);
          }
        }
-       getOwner().remove(this);
      }
    }
--- 247,263 ----
  
        for (Surface surface : surfaces) {
!         surface.delete();
        }
  
        if (to.getOwner() != null) {
          if (to.getEdges().size() == 0) {
!           owner.remove(to);
          }
        }
        if (from.getOwner() != null) {
          if (from.getEdges().size() == 0) {
!           owner.remove(from);
          }
        }
      }
    }