[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.31, 1.32

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

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

Modified Files:
	Command.java 
Log Message:
some refactoring

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Command.java	18 Nov 2007 19:14:40 -0000	1.31
--- Command.java	18 Nov 2007 20:25:33 -0000	1.32
***************
*** 914,918 ****
      public static List<Edge> order(List<Edge> edges) {
        LinkedList<Edge> ordered = new LinkedList();
!       {
          Set<Edge> mark = new HashSet();
          Edge first = edges.get(0);
--- 914,918 ----
      public static List<Edge> order(List<Edge> edges) {
        LinkedList<Edge> ordered = new LinkedList();
!       if (edges.size() > 0) {
          Set<Edge> mark = new HashSet();
          Edge first = edges.get(0);
***************
*** 1061,1065 ****
        }
        
!       {
          List<Vertex> vertices = Offset.vertices(boundary);
          Vertex normal = Surface.normalOf(boundary);
--- 1061,1065 ----
        }
        
!       if (boundary.size() > 0) {
          List<Vertex> vertices = Offset.vertices(boundary);
          Vertex normal = Surface.normalOf(boundary);
***************
*** 1073,1084 ****
        
        Space union = new Space("Union", Space.CONSTRUCTION, true);
-       List<Edge> offset = Offset.offset(boundary, inside + outside - (delta / 2));
        
!       Surface exterior = new Surface(offset);
        List<Surface> interior = new LinkedList();
        for (Surface current : surfaces) {
          interior.add(new Surface(Offset.offset(current.getEdges(), -delta / 2)));
        }
!       union.insert(exterior);
        for (Surface current : interior) {
          union.insert(current);
--- 1073,1088 ----
        
        Space union = new Space("Union", Space.CONSTRUCTION, true);
        
!       if (boundary.size() > 0) {
!         List<Edge> offset = Offset.offset(boundary, inside + outside - (delta / 2));
!         Surface exterior = new Surface(offset);
!         union.insert(exterior);
!       }
! 
        List<Surface> interior = new LinkedList();
        for (Surface current : surfaces) {
          interior.add(new Surface(Offset.offset(current.getEdges(), -delta / 2)));
        }
!       
        for (Surface current : interior) {
          union.insert(current);