[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model SurfaceAnalysis.java, 1.9, 1.10 Space.java, 1.164, 1.165

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

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

Modified Files:
	SurfaceAnalysis.java Space.java 
Log Message:
Bugfix: surface-analysis should delete instead of remove surfaces

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** Space.java	25 Jul 2007 12:44:33 -0000	1.164
--- Space.java	26 Jul 2007 09:52:32 -0000	1.165
***************
*** 2829,2831 ****
--- 2829,2844 ----
      return a;
    }
+   
+   /**
+    * Verify that everything is OK
+    */
+   public void verify() {
+     for (Space space : getElements()) {
+       for (Surface surface : space.getEnvelope()) {
+         if (surface.getOwner() == null) {
+           System.out.println("   NOT OK");
+         }
+       }
+     }
+   }
  }

Index: SurfaceAnalysis.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SurfaceAnalysis.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SurfaceAnalysis.java	2 May 2007 11:39:50 -0000	1.9
--- SurfaceAnalysis.java	26 Jul 2007 09:52:32 -0000	1.10
***************
*** 159,163 ****
      Collection<Surface> surfaces = new LinkedList(space.getSurfaces());
      for (Surface current : surfaces) {
!       space.remove(current);
      }
    }
--- 159,163 ----
      Collection<Surface> surfaces = new LinkedList(space.getSurfaces());
      for (Surface current : surfaces) {
!       current.delete();
      }
    }
***************
*** 274,278 ****
      }
      for (Surface current : removed) {
!       space.remove(current);
      }
      for (Surface current : added) {
--- 274,278 ----
      }
      for (Surface current : removed) {
!       current.delete();
      }
      for (Surface current : added) {