[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.20, 1.21 WallPartingModellor.java, 1.2, 1.3 InnerWallModellor.java, 1.8, 1.9 ModelBathModellor2.java, 1.8, 1.9

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

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

Modified Files:
	TileModellor.java WallPartingModellor.java 
	InnerWallModellor.java ModelBathModellor2.java 
Log Message:
Another step in elliminating Net

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TileModellor.java	2 Nov 2007 11:17:28 -0000	1.20
--- TileModellor.java	2 Nov 2007 12:11:17 -0000	1.21
***************
*** 24,28 ****
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Material;
- import net.sourceforge.bprocessor.model.Net;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selector;
--- 24,27 ----
***************
*** 210,214 ****
    private void updateOutline() {
      if (outline == null) {
!       outline = new Net("Tile-outline");
      }
      outline.clear();
--- 209,213 ----
    private void updateOutline() {
      if (outline == null) {
!       outline = Space.createNet("Tile-outline");
      }
      outline.clear();
***************
*** 239,243 ****
    private void updateNet(CoordinateSystem cs) {
      if (net == null) {
!       net = new Net("strip");
      }
      net.clear();
--- 238,242 ----
    private void updateNet(CoordinateSystem cs) {
      if (net == null) {
!       net = Space.createNet("strip");
      }
      net.clear();

Index: WallPartingModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WallPartingModellor.java	2 Nov 2007 11:17:28 -0000	1.2
--- WallPartingModellor.java	2 Nov 2007 12:11:17 -0000	1.3
***************
*** 17,21 ****
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometry;
- import net.sourceforge.bprocessor.model.Net;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selector;
--- 17,20 ----
***************
*** 53,57 ****
    private Space calcNet() {
      //find bottom surface and copy outer contour from it into a new net
!     Space tmpNet = new Net("Contour");
      space.getSurfaces().iterator().next().copy(tmpNet);
      return tmpNet;
--- 52,56 ----
    private Space calcNet() {
      //find bottom surface and copy outer contour from it into a new net
!     Space tmpNet = Space.createNet("Contour");
      space.getSurfaces().iterator().next().copy(tmpNet);
      return tmpNet;

Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** InnerWallModellor.java	2 Nov 2007 11:17:28 -0000	1.8
--- InnerWallModellor.java	2 Nov 2007 12:11:17 -0000	1.9
***************
*** 20,24 ****
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometry;
- import net.sourceforge.bprocessor.model.Net;
  import net.sourceforge.bprocessor.model.Plane;
  import net.sourceforge.bprocessor.model.Project;
--- 20,23 ----
***************
*** 351,355 ****
    private Space buildNet() {
      if (space != null && !space.getEnvelope().isEmpty()) {
!       Space net = new Net("net");
        space.add(net);
        surface = findSurface();
--- 350,354 ----
    private Space buildNet() {
      if (space != null && !space.getEnvelope().isEmpty()) {
!       Space net = Space.createNet("net");
        space.add(net);
        surface = findSurface();

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ModelBathModellor2.java	2 Nov 2007 11:17:28 -0000	1.8
--- ModelBathModellor2.java	2 Nov 2007 12:11:17 -0000	1.9
***************
*** 20,24 ****
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Geometry;
- import net.sourceforge.bprocessor.model.Net;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selector;
--- 20,23 ----
***************
*** 118,122 ****
      Surface s = new Surface(edges);
      
!     net = new Net("Boundary");
      net.add(v1);
      net.add(v2);
--- 117,121 ----
      Surface s = new Surface(edges);
      
!     net = Space.createNet("Boundary");
      net.add(v1);
      net.add(v2);