[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Geometry.java, 1.21, 1.22

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

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

Modified Files:
	Geometry.java 
Log Message:
Improved finish/continue logic in Pencil

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Geometry.java	12 Jul 2006 14:30:36 -0000	1.21
--- Geometry.java	19 Jul 2006 12:04:13 -0000	1.22
***************
*** 176,181 ****
     * surfaces etc.
     * @param edges The list of edges
     */
!   public static void insert(List edges) {
      
      Edge first = (Edge) edges.get(0);
--- 176,182 ----
     * surfaces etc.
     * @param edges The list of edges
+    * @return Whether a new surface was added
     */
!   public static boolean insert(List edges) {
      
      Edge first = (Edge) edges.get(0);
***************
*** 184,187 ****
--- 185,189 ----
      Vertex to = last.getTo();
      Surface exterior = null;
+     boolean closed = false;
      {
        Set fromSurfaces = from.getSurfaces();
***************
*** 238,246 ****
            siblings = node.insert(siblings);
            node.sort();
!           findSurfaces(node, lastEdgeNode, edges, exterior);
          } 
        }
      }
!     
    }
  
--- 240,248 ----
            siblings = node.insert(siblings);
            node.sort();
!           closed = findSurfaces(node, lastEdgeNode, edges, exterior);
          } 
        }
      }
!     return closed;
    }
  
***************
*** 252,257 ****
     * @param edges The edges
     * @param exterior The exterior
     */
!   private static void findSurfaces(VertexNode vertex, EdgeNode last, List edges, Surface exterior) {
      int count = 0;
      List surfaces = new LinkedList();
--- 254,261 ----
     * @param edges The edges
     * @param exterior The exterior
+    * @return Whether a surface was found
     */
!   private static boolean findSurfaces(VertexNode vertex, EdgeNode last, 
!       List edges, Surface exterior) {
      int count = 0;
      List surfaces = new LinkedList();
***************
*** 298,301 ****
--- 302,306 ----
        }
      }
+     return !surfaces.isEmpty();
    }