[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java,1.27,1.28 Entity.java,1.3,1.4

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

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

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

Index: Entity.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Entity.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Entity.java	25 Jan 2006 11:05:11 -0000	1.3
--- Entity.java	27 Jan 2006 11:30:56 -0000	1.4
***************
*** 48,52 ****
     */
    public void changed() {
-     Project.getInstance().makeDirty();
      Project.getInstance().changed(this);
    }
--- 48,51 ----

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Project.java	27 Jan 2006 11:20:59 -0000	1.27
--- Project.java	27 Jan 2006 11:30:56 -0000	1.28
***************
*** 102,105 ****
--- 102,106 ----
        current.update(entity);
      }
+     makeDirty();
    }
    
***************
*** 144,148 ****
      spaces.put(space.getId(), space);
      changed(this);
-     makeDirty();
    }
  
--- 145,148 ----
***************
*** 170,174 ****
      mesh.add(edge);
      changed(this);
-     makeDirty();
    }
  
--- 170,173 ----
***************
*** 178,193 ****
     */
    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());
!     }
!     makeDirty();
    }
    
--- 177,181 ----
     */
    public void delete(Edge edge) {
!     mesh.delete(edge);
    }
    
***************
*** 200,204 ****
      mesh.delete(edge);
      changed(this);
-     makeDirty();
    }
  
--- 188,191 ----
***************
*** 234,238 ****
      spaces.remove(space.getId());
      space.setId(null);
!     makeDirty();
    }
    
--- 221,225 ----
      spaces.remove(space.getId());
      space.setId(null);
!     changed(this);
    }
    
***************
*** 260,264 ****
      mesh.add(surface);
      changed(this);
-     makeDirty();
    }
  
--- 247,250 ----
***************
*** 270,274 ****
      mesh.remove(surface);
      changed(this);
-     makeDirty();
    }
    
--- 256,259 ----
***************
*** 278,295 ****
     */
    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);
!       }
!     }
!     makeDirty();
    }
  
--- 263,267 ----
     */
    public void delete(Surface surface) {
!     mesh.delete(surface);
    }
  
***************
*** 309,313 ****
      mesh.add(vertex);
      changed(this);
-     makeDirty();
    }
    
--- 281,284 ----
***************
*** 319,323 ****
      mesh.remove(vertex);
      changed(this);
-     makeDirty();
    }
    
--- 290,293 ----
***************
*** 328,332 ****
    public void delete(Vertex vertex) {
      mesh.delete(vertex);
-     makeDirty();
    }
  
--- 298,301 ----
***************
*** 347,351 ****
      cameras.put(c.getId(), c);
      changed(this);
-     makeDirty();
    }
  
--- 316,319 ----