[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Geometry.java, 1.61, 1.62

[rimestad <rim...@us...>]

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

Modified Files:
	Geometry.java 
Log Message:
java generic add

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Geometry.java	2 Oct 2007 06:41:57 -0000	1.61
--- Geometry.java	3 Oct 2007 10:02:18 -0000	1.62
***************
*** 55,74 ****
     * @return The collection of edges
     */
!   public static Collection getActiveEdges(Space s) {
      if (s.getElements().size() == 1) {
!       Collection e = new ArrayList();
        e.addAll(s.getEdges());
!       Iterator iter = s.getEnvelope().iterator();
!       while (iter.hasNext()) {
!         e.addAll(((Surface)iter.next()).getEdges());
        }
        return e;
      } else {
!       ArrayList edges = new ArrayList();
!       Iterator iter = s.getElements().iterator();
!       while (iter.hasNext()) {
!         Space cur = (Space)iter.next();
          if (cur != s.getEmpty()) {
!           Collection c = getActiveEdges(cur);
            edges.addAll(c);
          }
--- 55,71 ----
     * @return The collection of edges
     */
!   public static Collection<Edge> getActiveEdges(Space s) {
      if (s.getElements().size() == 1) {
!       Collection<Edge> e = new ArrayList<Edge>();
        e.addAll(s.getEdges());
!       for (Surface envelope : s.getEnvelope()) {
!         e.addAll(envelope.getEdges());
        }
        return e;
      } else {
!       ArrayList<Edge> edges = new ArrayList<Edge>();
!       for (Space cur : s.getElements()) {
          if (cur != s.getEmpty()) {
!           Collection<Edge> c = getActiveEdges(cur);
            edges.addAll(c);
          }