[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.95, 1.96 OffsetTool.java, 1.4, 1.5 MoveTool.java, 1.68, 1.69 AbstractPencil.java, 1.61, 1.62

[Nordholt <nor...@us...>]

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

Modified Files:
	AbstractTool.java OffsetTool.java MoveTool.java 
	AbstractPencil.java 
Log Message:
Moved collect method from AbstractTool to Geometry

Index: MoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** MoveTool.java	7 Sep 2006 11:38:41 -0000	1.68
--- MoveTool.java	7 Sep 2006 15:54:47 -0000	1.69
***************
*** 23,26 ****
--- 23,27 ----
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometric;
+ import net.sourceforge.bprocessor.model.Geometry;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
***************
*** 194,198 ****
          updateFeedback();
          affected = getAffected(entities);
!         vertices = collect(entities);
        }
      } else {
--- 195,199 ----
          updateFeedback();
          affected = getAffected(entities);
!         vertices = Geometry.collect(entities);
        }
      } else {

Index: OffsetTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OffsetTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OffsetTool.java	7 Sep 2006 11:38:41 -0000	1.4
--- OffsetTool.java	7 Sep 2006 15:54:47 -0000	1.5
***************
*** 107,111 ****
     */
    private void moveContour(double length) {
!     Iterator it = collect(contour).iterator();
      while (it.hasNext()) {
        Vertex v = (Vertex)it.next();
--- 107,111 ----
     */
    private void moveContour(double length) {
!     Iterator it = Geometry.collect(contour).iterator();
      while (it.hasNext()) {
        Vertex v = (Vertex)it.next();

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** AbstractPencil.java	7 Sep 2006 11:38:41 -0000	1.61
--- AbstractPencil.java	7 Sep 2006 15:54:47 -0000	1.62
***************
*** 29,32 ****
--- 29,33 ----
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometric;
+ import net.sourceforge.bprocessor.model.Geometry;
  import net.sourceforge.bprocessor.model.Line;
  import net.sourceforge.bprocessor.model.Plane;
***************
*** 784,788 ****
      HashSet affected = new HashSet();
      
!     Set vertices = collect(moveElements);
      Set edges = Vertex.edges(vertices);
      Set surfaces = Edge.surfaces(edges);
--- 785,789 ----
      HashSet affected = new HashSet();
      
!     Set vertices = Geometry.collect(moveElements);
      Set edges = Vertex.edges(vertices);
      Set surfaces = Edge.surfaces(edges);

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** AbstractTool.java	7 Sep 2006 11:38:41 -0000	1.95
--- AbstractTool.java	7 Sep 2006 15:54:47 -0000	1.96
***************
*** 8,12 ****
  
  import net.sourceforge.bprocessor.model.Camera;
- import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometry;
--- 8,11 ----
***************
*** 33,37 ****
  import java.util.Iterator;
  import java.util.Set;
- import java.util.HashSet;
  import java.util.Collection;
  
--- 32,35 ----
***************
*** 513,573 ****
      return;
    }
-   
-   /**
-    * Collect all vertices from a collection of geometrics
-    * @param geometrics Collection of objects
-    * @return Set of vertices
-    */
-   protected Set collect(Collection geometrics) {
-     Iterator it = geometrics.iterator();
-     Set result = new  HashSet();
-     while (it.hasNext()) {
-       Object o = it.next();
-       if (o instanceof Geometric) {
-         result.addAll(((Geometric)o).collect());
-       }
-     }
-     return result;
-   }
- 
-   /**
-    * Collect all vertices from a collection of objects
-    * @param objects Collection of objects
-    * @param vertices Set of vertices
-    */
-   protected void collect(Collection objects, Set vertices) {
-     Iterator iter = objects.iterator();
-     while (iter.hasNext()) {
-       Object current = iter.next();
-       collect(current, vertices);
-     }
-   }
- 
-   /**
-    * Collect vertices from object
-    * @param o The object
-    * @param vertices The vertices
-    */
-   protected void collect(Object o, Set vertices) {
-     if (o instanceof Vertex) {
-       vertices.add(o);
-     } else if (o instanceof Edge) {
-       Edge edge = (Edge) o;
-       vertices.add(edge.getFrom());
-       vertices.add(edge.getTo());
-     } else if (o instanceof Surface) {
-       Surface surface = (Surface) o;
-       vertices.addAll(surface.getVertices());
-       if (surface.getHoles() != null) {
-         Iterator iter = surface.getHoles().iterator();
-         while (iter.hasNext()) {
-           Surface current = (Surface) iter.next();
-           collect(current, vertices);
-         }
-       }
-     } else if (o instanceof ClippingPlane) {
-       ClippingPlane plane = (ClippingPlane) o;
-       vertices.add(plane.center());
-     }
-   }
  }
--- 511,513 ----