[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor ModelBathModellor2.java, 1

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	ModelBathModellor2.java WallPartingModellor.java 
	InnerWallModellor.java TileModellor.java Modellor.java 
Log Message:
Major change wrt Space/Container

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** TileModellor.java	13 Dec 2007 08:21:34 -0000	1.26
--- TileModellor.java	13 Dec 2007 12:00:33 -0000	1.27
***************
*** 27,31 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selector;
- import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.SurfaceAnalysis;
--- 27,30 ----
***************
*** 58,69 ****
    private CoordinateSystem startPoint;

!   private Space space;

    /** tile thickness in mm */
    private int tileThickness = 8;

!   private Space net;

!   private Space outline;

    private Set<Surface> ignoredSurfaces = new HashSet<Surface>();
--- 57,68 ----
    private CoordinateSystem startPoint;

!   private Container space;

    /** tile thickness in mm */
    private int tileThickness = 8;

!   private Container net;

!   private Container outline;

    private Set<Surface> ignoredSurfaces = new HashSet<Surface>();
***************
*** 79,83 ****
     * @param s The space
     */
!   public TileModellor(Space s) {
      if (s == null) {
        return;
--- 78,82 ----
     * @param s The space
     */
!   public TileModellor(Container s) {
      if (s == null) {
        return;
***************
*** 103,107 ****
     */
    @Override
!   public Modellor newInstance(Space s) {
      return new TileModellor(s);
    }
--- 102,106 ----
     */
    @Override
!   public Modellor newInstance(Container s) {
      return new TileModellor(s);
    }
***************
*** 113,119 ****
        if (ext != null && ext.getOwner().getLevel() < space.getLevel()) {
          // exterior were on a higher level look at the spaces of it
!         if ((ext.getFrontDomain().getType() == Space.FUNCTIONAL 
                && ext.getFrontDomain().isContainer()) ||
!             (ext.getBackDomain().getType() == Space.FUNCTIONAL 
                && ext.getBackDomain().isContainer())) {
            //the surface is assigned to a 
--- 112,118 ----
        if (ext != null && ext.getOwner().getLevel() < space.getLevel()) {
          // exterior were on a higher level look at the spaces of it
!         if ((ext.getFrontDomain().getType() == Container.FUNCTIONAL 
                && ext.getFrontDomain().isContainer()) ||
!             (ext.getBackDomain().getType() == Container.FUNCTIONAL 
                && ext.getBackDomain().isContainer())) {
            //the surface is assigned to a 
***************
*** 122,127 ****
        } else {
          //look for a surface with a funktional space assign that is vertical
!         if (res == null && (s.getFrontDomain().getType() == Space.FUNCTIONAL ||
!             s.getBackDomain().getType() == Space.FUNCTIONAL) &&
              Math.abs(s.normal().getZ()) < 0.0001) {
            res = s;
--- 121,126 ----
        } else {
          //look for a surface with a funktional space assign that is vertical
!         if (res == null && (s.getFrontDomain().getType() == Container.FUNCTIONAL ||
!             s.getBackDomain().getType() == Container.FUNCTIONAL) &&
              Math.abs(s.normal().getZ()) < 0.0001) {
            res = s;
***************
*** 178,182 ****
          outer.addHole(newS);
          space.addAll(newS);
!         Space sp = new Container("Tile", Space.CONSTRUCTION,  true);
          if (sign == -1) {
            newS.setBackDomain(sp);
--- 177,181 ----
          outer.addHole(newS);
          space.addAll(newS);
!         Container sp = new Container("Tile", Container.CONSTRUCTION,  true);
          if (sign == -1) {
            newS.setBackDomain(sp);
***************
*** 190,194 ****
      }

!     Space joint = new Container("Tile", Space.CONSTRUCTION, true);
      if (sign == -1) {
        outer.setBackDomain(joint);
--- 189,193 ----
      }

!     Container joint = new Container("Tile", Container.CONSTRUCTION, true);
      if (sign == -1) {
        outer.setBackDomain(joint);
***************
*** 210,214 ****
    private void updateOutline() {
      if (outline == null) {
!       outline = Space.createNet("Tile-outline");
      }
      outline.clear();
--- 209,213 ----
    private void updateOutline() {
      if (outline == null) {
!       outline = Container.createNet("Tile-outline");
      }
      outline.clear();
***************
*** 239,243 ****
    private void updateNet(CoordinateSystem cs) {
      if (net == null) {
!       net = Space.createNet("strip");
      }
      net.clear();
--- 238,242 ----
    private void updateNet(CoordinateSystem cs) {
      if (net == null) {
!       net = Container.createNet("strip");
      }
      net.clear();
***************
*** 509,513 ****
      Object o = m.get("Space");
      if (o != null) {
!       space = (Space)o;
      }
      o = m.get("Surface");
--- 508,512 ----
      Object o = m.get("Space");
      if (o != null) {
!       space = (Container)o;
      }
      o = m.get("Surface");
***************
*** 555,559 ****
    @Override
    public int getUseableLevel() {
!     return Space.SPACE_LEVEL;
    }

--- 554,558 ----
    @Override
    public int getUseableLevel() {
!     return Container.SPACE_LEVEL;
    }

Index: WallPartingModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** WallPartingModellor.java	12 Dec 2007 12:48:22 -0000	1.7
--- WallPartingModellor.java	13 Dec 2007 12:00:33 -0000	1.8
***************
*** 20,24 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selector;
- import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 20,23 ----
***************
*** 31,36 ****
  public class WallPartingModellor extends Modellor {

!   private Space space;
!   private Space net;
    private double minZ;
    private double maxZ;
--- 30,35 ----
  public class WallPartingModellor extends Modellor {

!   private Container space;
!   private Container net;
    private double minZ;
    private double maxZ;
***************
*** 42,46 ****
     * @param net the net outlining the walls (can be auto calculated by sending null object)
     */
!   public WallPartingModellor(Space walls, Space net) {
      this.space = walls;
      if (net != null) {
--- 41,45 ----
     * @param net the net outlining the walls (can be auto calculated by sending null object)
     */
!   public WallPartingModellor(Container walls, Container net) {
      this.space = walls;
      if (net != null) {
***************
*** 51,57 ****
    }

!   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;
--- 50,56 ----
    }

!   private Container calcNet() {
      //find bottom surface and copy outer contour from it into a new net
!     Container tmpNet = Container.createNet("Contour");
      space.getSurfaces().iterator().next().copy(tmpNet);
      return tmpNet;
***************
*** 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) {
--- 162,166 ----
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Container concrete = new Container("Concrete", Container.CONSTRUCTION, true);
        space.add(concrete);
        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) {
--- 181,185 ----
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Container tile = new Container("Tile", Container.CONSTRUCTION,  true);
        space.add(tile);
        if (s.normal().getZ() == 1.0) {
***************
*** 279,283 ****
    @Override
    public int getUseableLevel() {
!     return Space.ELEMENT_LEVEL;
    }

--- 278,282 ----
    @Override
    public int getUseableLevel() {
!     return Container.ELEMENT_LEVEL;
    }

***************
*** 286,290 ****
     */
    @Override
!   public Modellor newInstance(Space s) {
      return new WallPartingModellor(s, null);
    }
--- 285,289 ----
     */
    @Override
!   public Modellor newInstance(Container s) {
      return new WallPartingModellor(s, null);
    }

Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** InnerWallModellor.java	12 Dec 2007 12:48:22 -0000	1.15
--- InnerWallModellor.java	13 Dec 2007 12:00:33 -0000	1.16
***************
*** 23,29 ****
  import net.sourceforge.bprocessor.model.Plane;
  import net.sourceforge.bprocessor.model.Project;
- import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;

  import org.apache.log4j.Logger;
--- 23,29 ----
  import net.sourceforge.bprocessor.model.Plane;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
+ import net.sourceforge.bprocessor.model.Space;

  import org.apache.log4j.Logger;
***************
*** 62,66 ****

    /** The space of this modellor */
!   private Space space;

    /** A surface in the space to start the modellor  */
--- 62,66 ----

    /** The space of this modellor */
!   private Container space;

    /** A surface in the space to start the modellor  */
***************
*** 82,86 ****

    /** The net of the modellor */
!   private Space net;

    /**
--- 82,86 ----

    /** The net of the modellor */
!   private Container net;

    /**
***************
*** 96,100 ****
     * @param s the space of the modellor
     */
!   public InnerWallModellor(Space s) {
      this.space = s;
    }
--- 96,100 ----
     * @param s the space of the modellor
     */
!   public InnerWallModellor(Container s) {
      this.space = s;
    }
***************
*** 120,124 ****
     */
    public int getUseableLevel() {
!     return Space.SPACE_LEVEL;
    }

--- 120,124 ----
     */
    public int getUseableLevel() {
!     return Container.SPACE_LEVEL;
    }

***************
*** 127,131 ****
     */
    @Override
!   public Modellor newInstance(Space s) {
      InnerWallModellor mod = new InnerWallModellor(s);
      Project.getInstance().addObserver(mod);
--- 127,131 ----
     */
    @Override
!   public Modellor newInstance(Container s) {
      InnerWallModellor mod = new InnerWallModellor(s);
      Project.getInstance().addObserver(mod);
***************
*** 161,165 ****
          for (Space current : space.getElements()) {
            if (current.isNet()) {
!             net = current;
              break;
            }
--- 161,165 ----
          for (Space current : space.getElements()) {
            if (current.isNet()) {
!             net = (Container) current;
              break;
            }
***************
*** 185,189 ****
     * @param net a net to build the framework from
     */
!   private void buildFramework(Space net) {
      Map<Edge, Edge> edge2Run = getRuns(net.getEdges());
      Set<Edge> runs = new HashSet<Edge>(edge2Run.values());
--- 185,189 ----
     * @param net a net to build the framework from
     */
!   private void buildFramework(Container net) {
      Map<Edge, Edge> edge2Run = getRuns(net.getEdges());
      Set<Edge> runs = new HashSet<Edge>(edge2Run.values());
***************
*** 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));
--- 217,221 ----
        Surface base = joistBase();
        space.add(base);
!       Container joist = new Container("joist", Container.CONSTRUCTION, true);
        Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
        joist.setClassificationType(c.getPossibleTypes().getChildren().get(0));
***************
*** 258,262 ****
    }

!   private void buildWoodSheets(Space net) {
      List<Edge> outline = netOutline(net);
      if  (!outline.isEmpty()) { 
--- 258,262 ----
    }

!   private void buildWoodSheets(Container net) {
      List<Edge> outline = netOutline(net);
      if  (!outline.isEmpty()) { 
***************
*** 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();
--- 269,275 ----
        Surface sheet1 = new Surface(outlineCopy1);
        Surface sheet2 = new Surface(outlineCopy2);
!       Container sheetSpace1 = new Container("sheet1", Container.CONSTRUCTION, true);
        sheetSpace1.setClassification(woodSheet());
!       Container sheetSpace2 = new Container("sheet2", Container.CONSTRUCTION, true);
        sheetSpace2.setClassification(woodSheet());
        Vertex j = cs.getJ().copy();
***************
*** 349,355 ****
     * @return a net for building the framework
     */
!   private Space buildNet() {
      if (space != null && !space.getEnvelope().isEmpty()) {
!       Space net = Space.createNet("net");
        space.add(net);
        surface = findSurface();
--- 349,355 ----
     * @return a net for building the framework
     */
!   private Container buildNet() {
      if (space != null && !space.getEnvelope().isEmpty()) {
!       Container net = Container.createNet("net");
        space.add(net);
        surface = findSurface();
***************
*** 417,422 ****
        for (Surface s : envelope) {
          //support for other innerwalls
!         Space front = s.getFrontDomain();
!         Space back = s.getBackDomain();
          Classification frontClass = front.getClassification();
          Classification backClass = back.getClassification();
--- 417,422 ----
        for (Surface s : envelope) {
          //support for other innerwalls
!         Container front = s.getFrontDomain();
!         Container back = s.getBackDomain();
          Classification frontClass = front.getClassification();
          Classification backClass = back.getClassification();
***************
*** 488,493 ****
        for (Surface s : envelope) {
          for (Surface h : s.getHoles()) {
!           Space front = h.getFrontDomain();
!           Space back = h.getBackDomain();
            Classification frontClass = front.getClassification();
            Classification backClass = back.getClassification();
--- 488,493 ----
        for (Surface s : envelope) {
          for (Surface h : s.getHoles()) {
!           Container front = h.getFrontDomain();
!           Container back = h.getBackDomain();
            Classification frontClass = front.getClassification();
            Classification backClass = back.getClassification();
***************
*** 564,569 ****
      Surface surface = space.getEnvelope().iterator().next();
      for (Surface s : space.getEnvelope()) {
!       Space front = s.getFrontDomain();
!       Space back = s.getBackDomain();
        Classification frontClass = front.getClassification();
        Classification backClass = back.getClassification();
--- 564,569 ----
      Surface surface = space.getEnvelope().iterator().next();
      for (Surface s : space.getEnvelope()) {
!       Container front = s.getFrontDomain();
!       Container back = s.getBackDomain();
        Classification frontClass = front.getClassification();
        Classification backClass = back.getClassification();
***************
*** 593,597 ****
     * @return the space
     */
!   public Space getSpace() {
      return space;
    }
--- 593,597 ----
     * @return the space
     */
!   public Container getSpace() {
      return space;
    }
***************
*** 600,604 ****
     *  @param space the space 
     */
!   public void setSpace(Space space) {
      this.space = space;
    }
--- 600,604 ----
     *  @param space the space 
     */
!   public void setSpace(Container space) {
      this.space = space;
    }
***************
*** 624,628 ****
     * @return true if all geometry in the net is in the plane, false otherwise
     */
!   private boolean getPlaneCheck(Space net, Plane p) {
      for (Edge e : net.getEdges()) {
        if (!p.contains(e)) {
--- 624,628 ----
     * @return true if all geometry in the net is in the plane, false otherwise
     */
!   private boolean getPlaneCheck(Container net, Plane p) {
      for (Edge e : net.getEdges()) {
        if (!p.contains(e)) {
***************
*** 688,692 ****
     * @return a list of connected edges making up the net outline
     */
!   private List<Edge> netOutline(Space net) {
      /*Find outer edges*/
      Set<Edge> outer = new HashSet<Edge>();
--- 688,692 ----
     * @return a list of connected edges making up the net outline
     */
!   private List<Edge> netOutline(Container net) {
      /*Find outer edges*/
      Set<Edge> outer = new HashSet<Edge>();
***************
*** 741,745 ****
     * @return the net of this modellor
     */
!   public Space getNet() {
      return net;
    }
--- 741,745 ----
     * @return the net of this modellor
     */
!   public Container getNet() {
      return net;
    }

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ModelBathModellor2.java	12 Dec 2007 12:48:23 -0000	1.14
--- ModelBathModellor2.java	13 Dec 2007 12:00:33 -0000	1.15
***************
*** 38,50 ****
    private static Logger log = Logger.getLogger(ModelBathModellor2.class);

!   private Space space;

!   private Space floor;

!   private Space walls;

!   private Space ceiling;

!   private Space bath;

    private double length;
--- 38,50 ----
    private static Logger log = Logger.getLogger(ModelBathModellor2.class);

!   private Container space;

!   private Container floor;

!   private Container walls;

!   private Container ceiling;

!   private Container bath;

    private double length;
***************
*** 62,66 ****
    private CoordinateSystem coord;

!   private Space net;

    private double doorHeight = 2.2;
--- 62,66 ----
    private CoordinateSystem coord;

!   private Container net;

    private double doorHeight = 2.2;
***************
*** 70,74 ****
    private double windowHeight = 0.5;

!   private Collection<Space> doorAndWindows = new ArrayList<Space>();

    private Collection<Modellor> insideModellors = new LinkedList<Modellor>();
--- 70,74 ----
    private double windowHeight = 0.5;

!   private Collection<Container> doorAndWindows = new ArrayList<Container>();

    private Collection<Modellor> insideModellors = new LinkedList<Modellor>();
***************
*** 85,89 ****
     * @param s the Space to realize the modellor in
     */
!   public ModelBathModellor2(Space s) {
      this();
      space = s;
--- 85,89 ----
     * @param s the Space to realize the modellor in
     */
!   public ModelBathModellor2(Container s) {
      this();
      space = s;
***************
*** 119,123 ****
      Surface s = new Surface(edges);

!     net = Space.createNet("Boundary");
      net.add(v1);
      net.add(v2);
--- 119,123 ----
      Surface s = new Surface(edges);

!     net = Container.createNet("Boundary");
      net.add(v1);
      net.add(v2);
***************
*** 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();
--- 157,167 ----
     */
    private void generateBath() {
!     floor = new Container("Floor", Container.CONSTRUCTION, true);
      space.add(floor);
!     bath = new Container("Bath cabin", Container.FUNCTIONAL, true);
      space.add(bath);
!     walls = new Container("Walls", Container.CONSTRUCTION, true);
      space.add(walls);
!     ceiling = new Container("Ceiling", Container.CONSTRUCTION, true);
      space.add(ceiling);
      makeFloor();
***************
*** 177,184 ****
    private void addTileModellors() {
      for (Space elem : walls.getElements()) {
!       if (elem.getType() == Space.CONSTRUCTION && 
            elem.isContainer() && 
            elem.getName().equals("Tile")) {
!         TileModellor tm = new TileModellor(elem);
          insideModellors .add(tm);
          elem.setModellor(tm);
--- 177,184 ----
    private void addTileModellors() {
      for (Space elem : walls.getElements()) {
!       if (elem.getType() == Container.CONSTRUCTION && 
            elem.isContainer() && 
            elem.getName().equals("Tile")) {
!         TileModellor tm = new TileModellor((Container) elem);
          insideModellors .add(tm);
          elem.setModellor(tm);
***************
*** 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) {
--- 292,296 ----
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Container concrete = new Container("Concrete", Container.CONSTRUCTION, true);
        walls.add(concrete);
        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) {
--- 311,315 ----
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Container tile = new Container("Tile", Container.CONSTRUCTION, true);
        walls.add(tile);
        if (s.normal().getZ() == 1.0) {
***************
*** 364,368 ****
      }
      // copy doors and windows in
!     for (Space spc : doorAndWindows) {
        double maxDist = 0;
        Surface inner = null;
--- 364,368 ----
      }
      // copy doors and windows in
!     for (Container spc : doorAndWindows) {
        double maxDist = 0;
        Surface inner = null;
***************
*** 396,400 ****
          if (s.getCurrentValue().equals("Door")) {
            // make a door
!           Space doorSpc = new Container("Door", Space.CONSTRUCTION, true);
            doorAndWindows.add(doorSpc);
            space.add(doorSpc);
--- 396,400 ----
          if (s.getCurrentValue().equals("Door")) {
            // make a door
!           Container doorSpc = new Container("Door", Container.CONSTRUCTION, true);
            doorAndWindows.add(doorSpc);
            space.add(doorSpc);
***************
*** 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);
--- 439,443 ----
          } else if (s.getCurrentValue().equals("Window")) {
            //make a window
!           Container winSpc = new Container("Window", Container.CONSTRUCTION, true);
            doorAndWindows.add(winSpc);
            space.add(winSpc);
***************
*** 672,678 ****
    /** {@inheritDoc} */
    @Override
!   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);
--- 672,678 ----
    /** {@inheritDoc} */
    @Override
!   public Modellor newInstance(Container s) {
!     if (s.getLevel() == Container.PROJECT_LEVEL) {
!       Container bath = new Container("Bath-union", Container.CONSTRUCTION, true);
        bath.setUnion(true);
        s.add(bath);
***************
*** 777,782 ****
    @Override
    public void setSubContent(Map<String, Object> m) {
!     space = (Space)m.get("Space");
!     net = (Space)m.get("Net");
      wallThickness = (Double)m.get("wallThickness");
      floorThickness = (Double)m.get("floorThickness");
--- 777,782 ----
    @Override
    public void setSubContent(Map<String, Object> m) {
!     space = (Container)m.get("Space");
!     net = (Container)m.get("Net");
      wallThickness = (Double)m.get("wallThickness");
      floorThickness = (Double)m.get("floorThickness");
***************
*** 809,813 ****
    @Override
    public int getUseableLevel() {
!     return Space.PROJECT_LEVEL;
    }
  }
--- 809,813 ----
    @Override
    public int getUseableLevel() {
!     return Container.PROJECT_LEVEL;
    }
  }

Index: Modellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/Modellor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Modellor.java	19 Jun 2007 13:42:28 -0000	1.14
--- Modellor.java	13 Dec 2007 12:00:33 -0000	1.15
***************
*** 18,22 ****
  import net.sourceforge.bprocessor.model.Observer;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.model.Space;

--- 18,22 ----
  import net.sourceforge.bprocessor.model.Observer;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.model.Container;

***************
*** 131,135 ****
     * @return The created modellor object for the given space
     */
!   public abstract Modellor newInstance(Space space);

--- 131,135 ----
     * @return The created modellor object for the given space
     */
!   public abstract Modellor newInstance(Container space);

***************
*** 138,142 ****
     * @return Space
     */
!   public Space createSpace() {
      return null;
    }
--- 138,142 ----
     * @return Space
     */
!   public Container createSpace() {
      return null;
    }
***************
*** 147,151 ****
     * @return Parametric
     */
!   public Parametric get(Space element) {
      return (Parametric) parameters.get(element);
    }
--- 147,151 ----
     * @return Parametric
     */
!   public Parametric get(Container element) {
      return (Parametric) parameters.get(element);
    }
***************
*** 156,160 ****
     * @param parametric Parametric
     */
!   public void set(Space element, Parametric parametric) {
      parameters.put(element, parametric);
    }
--- 156,160 ----
     * @param parametric Parametric
     */
!   public void set(Container element, Parametric parametric) {
      parameters.put(element, parametric);
    }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor ModelBathModellor2.java, 1

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor ModelBathModellor2.java, 1.14, 1.15 WallPartingModellor.java, 1.7, 1.8 InnerWallModellor.java, 1.15, 1.16 TileModellor.java, 1.26, 1.27 Modellor.java, 1.14, 1.15