[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.111, 1.112 Geometry.java, 1.28, 1.29 Space.java, 1.72, 1.73

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

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

Modified Files:
	Surface.java Geometry.java Space.java 
Log Message:
Removed usage of Space.insert()

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** Surface.java	18 Sep 2006 14:10:07 -0000	1.111
--- Surface.java	6 Oct 2006 11:45:49 -0000	1.112
***************
*** 423,427 ****
      }
      surface.setEdges(edges);
!     mesh.insert(surface);
      return surface;
    }
--- 423,427 ----
      }
      surface.setEdges(edges);
!     mesh.add(surface);
      return surface;
    }
***************
*** 532,536 ****
          facemap[i] = new Surface(newEdges);
          e2s.put(b, facemap[i]);
!         getOwner().insert(facemap[i]);
        }
        sides.add(facemap[i]);
--- 532,536 ----
          facemap[i] = new Surface(newEdges);
          e2s.put(b, facemap[i]);
!         getOwner().add(facemap[i]);
        }
        sides.add(facemap[i]);
***************
*** 543,547 ****
        }
        top = new Surface(newEdges);
!       getOwner().insert(top);
      }
      
--- 543,547 ----
        }
        top = new Surface(newEdges);
!       getOwner().add(top);
      }
      
***************
*** 735,739 ****
            facemap[i] = new Surface(newEdges);
            e2s.put(b, facemap[i]);
!           getOwner().insert(facemap[i]);
            sides.add(facemap[i]);
          }
--- 735,739 ----
            facemap[i] = new Surface(newEdges);
            e2s.put(b, facemap[i]);
!           getOwner().add(facemap[i]);
            sides.add(facemap[i]);
          }
***************
*** 747,751 ****
        }
        top = new Surface(newEdges);
!       getOwner().insert(top);
      } else {
        top = this;
--- 747,751 ----
        }
        top = new Surface(newEdges);
!       getOwner().add(top);
      } else {
        top = this;

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** Space.java	5 Oct 2006 07:46:23 -0000	1.72
--- Space.java	6 Oct 2006 11:45:49 -0000	1.73
***************
*** 684,688 ****
            edges1.addAll(edges2);
            Surface surface = new Surface(edges1);
!           insert(surface);
            if (s1.getExterior() != null) {
              s1.getExterior().addHole(surface);
--- 684,688 ----
            edges1.addAll(edges2);
            Surface surface = new Surface(edges1);
!           add(surface);
            if (s1.getExterior() != null) {
              s1.getExterior().addHole(surface);
***************
*** 1666,1681 ****
      Vertex p2 = new Vertex(xmax, ymax, zmin);
      Vertex p1 = new Vertex(xmax, ymin, zmin);
!     getOwner().insert(p1);
!     getOwner().insert(p2);
!     getOwner().insert(p3);
!     getOwner().insert(p4);
      Edge e1 = new Edge(p1, p2);
      Edge e2 = new Edge(p2, p3);
      Edge e3 = new Edge(p3, p4);
      Edge e4 = new Edge(p4, p1);
!     getOwner().insert(e1);
!     getOwner().insert(e2);
!     getOwner().insert(e3);
!     getOwner().insert(e4);
      List edges = new LinkedList();
      edges.add(e1);
--- 1666,1681 ----
      Vertex p2 = new Vertex(xmax, ymax, zmin);
      Vertex p1 = new Vertex(xmax, ymin, zmin);
!     getOwner().add(p1);
!     getOwner().add(p2);
!     getOwner().add(p3);
!     getOwner().add(p4);
      Edge e1 = new Edge(p1, p2);
      Edge e2 = new Edge(p2, p3);
      Edge e3 = new Edge(p3, p4);
      Edge e4 = new Edge(p4, p1);
!     getOwner().add(e1);
!     getOwner().add(e2);
!     getOwner().add(e3);
!     getOwner().add(e4);
      List edges = new LinkedList();
      edges.add(e1);
***************
*** 1684,1688 ****
      edges.add(e4);
      Surface bottom = new Surface(edges);
!     getOwner().insert(bottom);
      bottom.setFrontDomain(this);
      bottom.extrude(zmax - zmin, new HashSet());
--- 1684,1688 ----
      edges.add(e4);
      Surface bottom = new Surface(edges);
!     getOwner().add(bottom);
      bottom.setFrontDomain(this);
      bottom.extrude(zmax - zmin, new HashSet());

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Geometry.java	29 Sep 2006 13:39:03 -0000	1.28
--- Geometry.java	6 Oct 2006 11:45:49 -0000	1.29
***************
*** 260,269 ****
      int count = 0;
      List surfaces = new LinkedList();
!     Space mesh = ((Edge) edges.iterator().next()).getOwner();
      {
        Surface clockwise = clockwiseSurface(vertex, last, edges);
        if (clockwise != null) {        
          if (clockwise.angle(vertex.system()) < 0) {
!           mesh.insert(clockwise);
            holeAnalysis(clockwise);
            surfaces.add(clockwise);
--- 260,269 ----
      int count = 0;
      List surfaces = new LinkedList();
!     Space space = ((Edge) edges.iterator().next()).getOwner();
      {
        Surface clockwise = clockwiseSurface(vertex, last, edges);
        if (clockwise != null) {        
          if (clockwise.angle(vertex.system()) < 0) {
!           space.add(clockwise);
            holeAnalysis(clockwise);
            surfaces.add(clockwise);
***************
*** 276,280 ****
        if (counterclockwise != null) {
          if (counterclockwise.angle(vertex.system()) > 0) {
!           mesh.insert(counterclockwise);
            holeAnalysis(counterclockwise);
            surfaces.add(counterclockwise);
--- 276,280 ----
        if (counterclockwise != null) {
          if (counterclockwise.angle(vertex.system()) > 0) {
!           space.add(counterclockwise);
            holeAnalysis(counterclockwise);
            surfaces.add(counterclockwise);
***************
*** 297,301 ****
            current.setFrontDomain(exterior.getFrontDomain());
          }
!         mesh.remove(exterior);
        }
      }
--- 297,301 ----
            current.setFrontDomain(exterior.getFrontDomain());
          }
!         space.remove(exterior);
        }
      }
***************
*** 855,859 ****
            Surface surface = new Surface(actual);
            result.add(surface);
!           Project.getInstance().getActiveSpace().insert(surface);
            holeAnalysis(surface);
          }
--- 855,859 ----
            Surface surface = new Surface(actual);
            result.add(surface);
!           Project.getInstance().getActiveSpace().add(surface);
            holeAnalysis(surface);
          }