[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.24, 1.25 WallPartingModellor.java, 1.6, 1.7 InnerWallModellor.java, 1.14, 1.15 ModelBathModellor2.java, 1.13, 1.14

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

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

Modified Files:
	TileModellor.java WallPartingModellor.java 
	InnerWallModellor.java ModelBathModellor2.java 
Log Message:
Instance/Container instantiated as appropriately

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** TileModellor.java	11 Dec 2007 14:49:03 -0000	1.24
--- TileModellor.java	12 Dec 2007 12:48:22 -0000	1.25
***************
*** 21,24 ****
--- 21,25 ----
  
  import net.sourceforge.bprocessor.model.Attribute;
+ import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 177,181 ****
          outer.addHole(newS);
          space.addAll(newS);
!         Space sp = new Space("Tile", Space.CONSTRUCTION,  true);
          if (sign == -1) {
            newS.setBackDomain(sp);
--- 178,182 ----
          outer.addHole(newS);
          space.addAll(newS);
!         Space sp = new Container("Tile", Space.CONSTRUCTION,  true);
          if (sign == -1) {
            newS.setBackDomain(sp);
***************
*** 189,193 ****
      }
  
!     Space joint = new Space("Tile", Space.CONSTRUCTION, true);
      if (sign == -1) {
        outer.setBackDomain(joint);
--- 190,194 ----
      }
  
!     Space joint = new Container("Tile", Space.CONSTRUCTION, true);
      if (sign == -1) {
        outer.setBackDomain(joint);

Index: WallPartingModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WallPartingModellor.java	11 Dec 2007 14:49:03 -0000	1.6
--- WallPartingModellor.java	12 Dec 2007 12:48:22 -0000	1.7
***************
*** 14,17 ****
--- 14,18 ----
  
  import net.sourceforge.bprocessor.model.Attribute;
+ import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 162,166 ****
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = new Space("Concrete", Space.CONSTRUCTION, true);
        space.add(concrete);
        if (s.normal().getZ() == 1.0) {
--- 163,167 ----
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = new Container("Concrete", Space.CONSTRUCTION, true);
        space.add(concrete);
        if (s.normal().getZ() == 1.0) {
***************
*** 181,185 ****
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = new Space("Tile", Space.CONSTRUCTION,  true);
        space.add(tile);
        if (s.normal().getZ() == 1.0) {
--- 182,186 ----
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = new Container("Tile", Space.CONSTRUCTION,  true);
        space.add(tile);
        if (s.normal().getZ() == 1.0) {

Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** InnerWallModellor.java	11 Dec 2007 14:49:03 -0000	1.14
--- InnerWallModellor.java	12 Dec 2007 12:48:22 -0000	1.15
***************
*** 17,20 ****
--- 17,21 ----
  import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.Classification;
+ import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 216,220 ****
        Surface base = joistBase();
        space.add(base);
!       Space joist = new Space("joist", Space.CONSTRUCTION, true);
        Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
        joist.setClassificationType(c.getPossibleTypes().getChildren().get(0));
--- 217,221 ----
        Surface base = joistBase();
        space.add(base);
!       Space joist = new Container("joist", Space.CONSTRUCTION, true);
        Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
        joist.setClassificationType(c.getPossibleTypes().getChildren().get(0));
***************
*** 268,274 ****
        Surface sheet1 = new Surface(outlineCopy1);
        Surface sheet2 = new Surface(outlineCopy2);
!       Space sheetSpace1 = new Space("sheet1", Space.CONSTRUCTION, true);
        sheetSpace1.setClassification(woodSheet());
!       Space sheetSpace2 = new Space("sheet2", Space.CONSTRUCTION, true);
        sheetSpace2.setClassification(woodSheet());
        Vertex j = cs.getJ().copy();
--- 269,275 ----
        Surface sheet1 = new Surface(outlineCopy1);
        Surface sheet2 = new Surface(outlineCopy2);
!       Space sheetSpace1 = new Container("sheet1", Space.CONSTRUCTION, true);
        sheetSpace1.setClassification(woodSheet());
!       Space sheetSpace2 = new Container("sheet2", Space.CONSTRUCTION, true);
        sheetSpace2.setClassification(woodSheet());
        Vertex j = cs.getJ().copy();

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ModelBathModellor2.java	11 Dec 2007 14:49:03 -0000	1.13
--- ModelBathModellor2.java	12 Dec 2007 12:48:23 -0000	1.14
***************
*** 16,19 ****
--- 16,20 ----
  
  import net.sourceforge.bprocessor.model.Attribute;
+ import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 156,166 ****
     */
    private void generateBath() {
!     floor = new Space("Floor", Space.CONSTRUCTION, true);
      space.add(floor);
!     bath = new Space("Bath cabin", Space.FUNCTIONAL, true);
      space.add(bath);
!     walls = new Space("Walls", Space.CONSTRUCTION, true);
      space.add(walls);
!     ceiling = new Space("Ceiling", Space.CONSTRUCTION, true);
      space.add(ceiling);
      makeFloor();
--- 157,167 ----
     */
    private void generateBath() {
!     floor = new Container("Floor", Space.CONSTRUCTION, true);
      space.add(floor);
!     bath = new Container("Bath cabin", Space.FUNCTIONAL, true);
      space.add(bath);
!     walls = new Container("Walls", Space.CONSTRUCTION, true);
      space.add(walls);
!     ceiling = new Container("Ceiling", Space.CONSTRUCTION, true);
      space.add(ceiling);
      makeFloor();
***************
*** 291,295 ****
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = new Space("Concrete", Space.CONSTRUCTION, true);
        walls.add(concrete);
        if (s.normal().getZ() == 1.0) {
--- 292,296 ----
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = new Container("Concrete", Space.CONSTRUCTION, true);
        walls.add(concrete);
        if (s.normal().getZ() == 1.0) {
***************
*** 310,314 ****
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = new Space("Tile", Space.CONSTRUCTION, true);
        walls.add(tile);
        if (s.normal().getZ() == 1.0) {
--- 311,315 ----
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = new Container("Tile", Space.CONSTRUCTION, true);
        walls.add(tile);
        if (s.normal().getZ() == 1.0) {
***************
*** 395,399 ****
          if (s.getCurrentValue().equals("Door")) {
            // make a door
!           Space doorSpc = new Space("Door", Space.CONSTRUCTION, true);
            doorAndWindows.add(doorSpc);
            space.add(doorSpc);
--- 396,400 ----
          if (s.getCurrentValue().equals("Door")) {
            // make a door
!           Space doorSpc = new Container("Door", Space.CONSTRUCTION, true);
            doorAndWindows.add(doorSpc);
            space.add(doorSpc);
***************
*** 438,442 ****
          } else if (s.getCurrentValue().equals("Window")) {
            //make a window
!           Space winSpc = new Space("Window", Space.CONSTRUCTION, true);
            doorAndWindows.add(winSpc);
            space.add(winSpc);
--- 439,443 ----
          } else if (s.getCurrentValue().equals("Window")) {
            //make a window
!           Space winSpc = new Container("Window", Space.CONSTRUCTION, true);
            doorAndWindows.add(winSpc);
            space.add(winSpc);
***************
*** 673,677 ****
    public Modellor newInstance(Space s) {
      if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = new Space("Bath-union", Space.CONSTRUCTION, true);
        bath.setUnion(true);
        s.add(bath);
--- 674,678 ----
    public Modellor newInstance(Space s) {
      if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = new Container("Bath-union", Space.CONSTRUCTION, true);
        bath.setUnion(true);
        s.add(bath);