[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java,1.25,1.26 Mesh.java,1.2,1.3

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

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

Modified Files:
	Project.java Mesh.java 
Log Message:
Clean up

Index: Mesh.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Mesh.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Mesh.java	24 Jan 2006 09:41:54 -0000	1.2
--- Mesh.java	27 Jan 2006 10:54:36 -0000	1.3
***************
*** 10,13 ****
--- 10,16 ----
  import java.util.Collection;
  import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Set;
  
  /**
***************
*** 78,81 ****
--- 81,90 ----
     */
    public void delete(Vertex vertex) {
+     if (vertex.getId() != null) {
+       Set edges = vertex.getEdges();
+       if (edges.size() < 1) {
+         remove(vertex);
+       }
+     }
      remove(vertex);
    }
***************
*** 132,135 ****
--- 141,154 ----
     */
    public void delete(Edge edge) {
+     if (edge.getId() != null) {
+       Set surfaces = edge.getSurfaces();
+       Iterator it = surfaces.iterator();
+       while (it.hasNext()) {
+         Surface surface = (Surface)it.next();
+         remove(surface);
+       }
+       delete(edge.getTo());
+       delete(edge.getFrom());
+     }
      remove(edge);
    }
***************
*** 186,189 ****
--- 205,220 ----
     */
    public void delete(Surface surface) {
+     if (surface.getExterior() != null) {
+       Surface exterior = surface.getExterior();
+       exterior.removeHole(surface);
+     }
+     List edges = surface.getEdges();
+     Iterator it = edges.iterator();
+     while (it.hasNext()) {
+       Edge edge = (Edge)it.next();
+       if (edge.getSurfaces().size() < 1) {
+         delete(edge);
+       }
+     }
      remove(surface);
    }

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Project.java	25 Jan 2006 14:46:01 -0000	1.25
--- Project.java	27 Jan 2006 10:54:36 -0000	1.26
***************
*** 34,37 ****
--- 34,40 ----
    private List observers;
    
+   /** The Mesh */
+   private Mesh mesh;
+   
    /** The vertices */
    private HashMap vertices = new HashMap();
***************
*** 85,88 ****
--- 88,92 ----
      addCams(); // To do camera initializasation (MAYBE IT SHOULD NOT BE HERE)
      observers = new LinkedList();
+     mesh = new Mesh();
    }
    
***************
*** 275,279 ****
     */
    public void delete(Space space) {
!     
    }
    
--- 279,283 ----
     */
    public void delete(Space space) {
!     remove(space);
    }
    
***************
*** 386,390 ****
        Set edges = vertex.getEdges();
        if (edges.size() < 1) {
!         Project.getInstance().remove(vertex);
        }
      }
--- 390,394 ----
        Set edges = vertex.getEdges();
        if (edges.size() < 1) {
!         remove(vertex);
        }
      }