[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java,1.22,1.23

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

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

Modified Files:
	Project.java 
Log Message:
code cleanup

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Project.java	24 Jan 2006 14:10:42 -0000	1.22
--- Project.java	25 Jan 2006 10:02:13 -0000	1.23
***************
*** 187,190 ****
--- 187,209 ----
  
    /**
+    * Delete an Edge
+    * @param edge The edge
+    */
+   public void delete(Edge edge) {
+     if (edge.getId() != null) {
+       Set surfaces = edge.getSurfaces();
+       remove(edge);
+       Iterator it = surfaces.iterator();
+       while (it.hasNext()) {
+         Surface surface = (Surface)it.next();
+         remove(surface);
+       }
+       delete(edge.getTo());
+       delete(edge.getFrom());
+     }
+   }
+   
+   
+   /**
     * Remove an edge
     * @param e The edge
***************
*** 239,242 ****
--- 258,269 ----
    
    /**
+    * Delete a space
+    * @param space The space to delete
+    */
+   public void delete(Space space) {
+     
+   }
+   
+   /**
     * Find all functional spaces
     * @return The functional spaces
***************
*** 275,278 ****
--- 302,325 ----
      changed(this);
    }
+   
+   /**
+    * Delete a surface
+    * @param surface The surface to delete
+    */
+   public void delete(Surface surface) {
+     if (surface.getExterior() != null) {
+       Surface exterior = surface.getExterior();
+       exterior.removeHole(surface);
+     }
+     remove(surface);
+     List edges = surface.getEdges();
+     Iterator it = edges.iterator();
+     while (it.hasNext()) {
+       Edge edge = (Edge)it.next();
+       if (edge.getSurfaces().size() < 1) {
+         delete(edge);
+       }
+     }
+   }
  
    /**
***************
*** 312,315 ****
--- 359,375 ----
      changed(this);
    }
+   
+   /**
+    * Delete a vertex
+    * @param vertex The vertex to delete
+    */
+   public void delete(Vertex vertex) {
+     if (vertex.getId() != null) {
+       Set edges = vertex.getEdges();
+       if (edges.size() < 1) {
+         Project.getInstance().remove(vertex);
+       }
+     }
+   }
  
    /**