[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ExtrusionTool.java, 1.40, 1.41

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2961/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	ExtrusionTool.java 
Log Message:
Moved removeProtected/addProtected to Space from new ExtrusionTool

Index: ExtrusionTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ExtrusionTool.java	22 Oct 2006 14:32:55 -0000	1.40
--- ExtrusionTool.java	23 Oct 2006 06:48:50 -0000	1.41
***************
*** 66,132 ****
    }
    
-   
-   /**
-    * Remove extrusion to active space
-    * @param space Space
-    * @param extrusion Collection of surface
-    */
-   public void remove(Space space, Collection extrusion) {
-     Iterator surfaces = extrusion.iterator();
-     while (surfaces.hasNext()) {
-       Surface surface = (Surface) surfaces.next();
-       if (surface.getOwner() == space) {
-         space.remove(surface);
-       }
-       Iterator edges = surface.getEdges().iterator();
-       while (edges.hasNext()) {
-         Edge edge = (Edge) edges.next();
-         if (!extrudesurface.contains(edge)) {
-           if (edge.getOwner() == space) {
-             space.remove(edge);
-           }
-           Vertex from = edge.getFrom();
-           if (from.getOwner() == space) {
-             space.remove(from);
-           }
-           Vertex to = edge.getTo();
-           if (to.getOwner() == space) {
-             space.remove(to);
-           }
-         }
-       }
-     }
-   }
-   
-   /**
-    * Add extrusion from space
-    * @param space Space
-    * @param extrusion Collection of surfaces
-    */
-   public void add(Space space, Collection extrusion) {
-     Iterator surfaces = extrusion.iterator();
-     while (surfaces.hasNext()) {
-       Surface surface = (Surface) surfaces.next();
-       Iterator edges = surface.getEdges().iterator();
-       while (edges.hasNext()) {
-         Edge edge = (Edge) edges.next();
-         Vertex from = edge.getFrom();
-         if (from.getOwner() == null) {
-           space.add(from);
-         }
-         Vertex to = edge.getTo();
-         if (to.getOwner() == null) {
-           space.add(to);
-         }
-         if (edge.getOwner() == null) {
-           space.add(edge);
-         }
-       }
-       if (surface.getOwner() == null) {
-         space.add(surface);
-       }
-     }
-   }
-   
    /**
     * Insert extrusion into space
--- 66,69 ----
***************
*** 151,155 ****
      Space space = Project.getInstance().getActiveSpace();
      if (extrusion != null) {
!       remove(space, extrusion);
        extrusion = null;
      }
--- 88,92 ----
      Space space = Project.getInstance().getActiveSpace();
      if (extrusion != null) {
!       space.removeProtected(extrusion);
        extrusion = null;
      }
***************
*** 169,173 ****
        insert(space, extrusion);
      } else {
!       add(space, extrusion);
      }
    }
--- 106,110 ----
        insert(space, extrusion);
      } else {
!       space.addProtected(extrusion);
      }
    }
***************
*** 280,284 ****
      to = null;
      if (extrusion != null) {
!       remove(Project.getInstance().getActiveSpace(), extrusion);
        extrusion = null;
      }
--- 217,221 ----
      to = null;
      if (extrusion != null) {
!       Project.getInstance().getActiveSpace().removeProtected(extrusion);
        extrusion = null;
      }