bprocessor-commit

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

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

Modified Files:
	Geometry.java 
Log Message:
Moved the collect method from AbstractTool to Geometry

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Geometry.java	7 Sep 2006 11:36:30 -0000	1.24
--- Geometry.java	7 Sep 2006 15:49:52 -0000	1.25
***************
*** 878,882 ****
      return closed;
    }
!   
!   
  }
--- 878,938 ----
      return closed;
    }
! 
!   /**
!    * Collect all vertices from a collection of geometrics
!    * @param geometrics Collection of objects
!    * @return Set of vertices
!    */
!   public static 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
!    */
!   public static 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
!    */
!   public static 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());
!     }
!   } 
  }