[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Geometry.java, 1.59, 1.60 Geometric.java, 1.18, 1.19

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

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

Modified Files:
	Geometry.java Geometric.java 
Log Message:
Introduced an erase operation performs a delete + some extra stuff

Index: Geometric.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometric.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Geometric.java	14 Jun 2007 09:36:13 -0000	1.18
--- Geometric.java	19 Jul 2007 12:23:39 -0000	1.19
***************
*** 175,178 ****
--- 175,187 ----
    
    /**
+    * Erases this Geometric object by deleting this
+    * object as well as merging/deleting neighbouring
+    * objects.
+    */
+   public void erase() {
+     delete();
+   }
+   
+   /**
     * Update after move
     */

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Geometry.java	31 May 2007 12:41:55 -0000	1.59
--- Geometry.java	19 Jul 2007 12:23:38 -0000	1.60
***************
*** 287,293 ****
        Collection<Surface> candidates = new LinkedList<Surface>();
        Collection<Surface> surfaces = surface.getOwner().getSurfaces();
-       Collection<Surface> envelope = surface.getOwner().getEnvelope();
-       candidates.addAll(envelope);
        candidates.addAll(surfaces);
        
        for (Surface current : candidates) {
--- 287,300 ----
        Collection<Surface> candidates = new LinkedList<Surface>();
        Collection<Surface> surfaces = surface.getOwner().getSurfaces();
        candidates.addAll(surfaces);
+       if (surface.getOwner().isUnion()) {
+         Collection<Surface> surrounding = surface.getOwner().getOwner().getSurfaces();
+         candidates.addAll(surrounding);
+       } else {
+         Collection<Surface> envelope = surface.getOwner().getEnvelope();
+         candidates.addAll(envelope);
+       }
+       
+       
        
        for (Surface current : candidates) {