bprocessor-commit

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17452/src/net/sourceforge/bprocessor/model/modellor

Modified Files:
	ModelBathModellor2.java WallPartingModellor.java 
	InnerWallModellor.java TileModellor.java Modellor.java 
Log Message:
Renamed Space to Item and Container to Space

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** TileModellor.java	25 Jun 2009 20:29:33 -0000	1.31
--- TileModellor.java	25 Jun 2009 22:17:30 -0000	1.32
***************
*** 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;
--- 21,25 ----
  
  import net.sourceforge.bprocessor.model.Attribute;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 28,32 ****
  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;
--- 28,32 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selector;
! import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.SurfaceAnalysis;
***************
*** 59,70 ****
    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>();
--- 59,70 ----
    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>();
***************
*** 80,84 ****
     * @param s The space
     */
!   public TileModellor(Container s) {
      if (s == null) {
        return;
--- 80,84 ----
     * @param s The space
     */
!   public TileModellor(Space s) {
      if (s == null) {
        return;
***************
*** 104,108 ****
     */
    @Override
!   public Modellor newInstance(Container s) {
      return new TileModellor(s);
    }
--- 104,108 ----
     */
    @Override
!   public Modellor newInstance(Space s) {
      return new TileModellor(s);
    }
***************
*** 114,120 ****
        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 
--- 114,120 ----
        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 
***************
*** 123,128 ****
        } 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;
--- 123,128 ----
        } 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;
***************
*** 178,182 ****
          outer.addHole(newS);
          space.addAll(newS);
!         Container sp = Space.createConstructionSpace("Tile");
          if (sign == -1) {
            newS.setBackDomain(sp);
--- 178,182 ----
          outer.addHole(newS);
          space.addAll(newS);
!         Space sp = Item.createConstructionSpace("Tile");
          if (sign == -1) {
            newS.setBackDomain(sp);
***************
*** 190,194 ****
      }
  
!     Container joint = Space.createConstructionSpace("Tile");
      if (sign == -1) {
        outer.setBackDomain(joint);
--- 190,194 ----
      }
  
!     Space joint = Item.createConstructionSpace("Tile");
      if (sign == -1) {
        outer.setBackDomain(joint);
***************
*** 210,214 ****
    private void updateOutline() {
      if (outline == null) {
!       outline = Container.createNet("Tile-outline");
      }
      outline.clear();
--- 210,214 ----
    private void updateOutline() {
      if (outline == null) {
!       outline = Space.createNet("Tile-outline");
      }
      outline.clear();
***************
*** 243,247 ****
    private void updateNet(CoordinateSystem cs) {
      if (net == null) {
!       net = Container.createNet("strip");
      }
      net.clear();
--- 243,247 ----
    private void updateNet(CoordinateSystem cs) {
      if (net == null) {
!       net = Space.createNet("strip");
      }
      net.clear();
***************
*** 513,517 ****
      Object o = m.get("Space");
      if (o != null) {
!       space = (Container)o;
      }
      o = m.get("Surface");
--- 513,517 ----
      Object o = m.get("Space");
      if (o != null) {
!       space = (Space)o;
      }
      o = m.get("Surface");
***************
*** 559,563 ****
    @Override
    public int getUseableLevel() {
!     return Container.SPACE_LEVEL;
    }
    
--- 559,563 ----
    @Override
    public int getUseableLevel() {
!     return Space.SPACE_LEVEL;
    }
    

Index: WallPartingModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** WallPartingModellor.java	25 Jun 2009 20:29:33 -0000	1.10
--- WallPartingModellor.java	25 Jun 2009 22:17:30 -0000	1.11
***************
*** 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;
--- 14,18 ----
  
  import net.sourceforge.bprocessor.model.Attribute;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 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,24 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selector;
! import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 31,36 ****
  public class WallPartingModellor extends Modellor {
    
!   private Container space;
!   private Container net;
    private double minZ;
    private double maxZ;
--- 31,36 ----
  public class WallPartingModellor extends Modellor {
    
!   private Space space;
!   private Space 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(Container walls, Container net) {
      this.space = walls;
      if (net != null) {
--- 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) {
***************
*** 51,57 ****
    }
  
!   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;
--- 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;
***************
*** 158,162 ****
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Container concrete = Space.createConstructionSpace("Concrete");
        space.add(concrete);
        if (s.normal().getZ() == 1.0) {
--- 158,162 ----
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = Item.createConstructionSpace("Concrete");
        space.add(concrete);
        if (s.normal().getZ() == 1.0) {
***************
*** 177,181 ****
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Container tile = Space.createConstructionSpace("Tile");
        space.add(tile);
        if (s.normal().getZ() == 1.0) {
--- 177,181 ----
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = Item.createConstructionSpace("Tile");
        space.add(tile);
        if (s.normal().getZ() == 1.0) {
***************
*** 274,278 ****
    @Override
    public int getUseableLevel() {
!     return Container.ELEMENT_LEVEL;
    }
  
--- 274,278 ----
    @Override
    public int getUseableLevel() {
!     return Space.ELEMENT_LEVEL;
    }
  
***************
*** 281,285 ****
     */
    @Override
!   public Modellor newInstance(Container s) {
      return new WallPartingModellor(s, null);
    }
--- 281,285 ----
     */
    @Override
!   public Modellor newInstance(Space 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.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** InnerWallModellor.java	25 Jun 2009 20:29:33 -0000	1.19
--- InnerWallModellor.java	25 Jun 2009 22:17:30 -0000	1.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;
--- 17,21 ----
  import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.Classification;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 24,28 ****
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
! import net.sourceforge.bprocessor.model.Space;
  
  import org.apache.log4j.Logger;
--- 24,28 ----
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
! import net.sourceforge.bprocessor.model.Item;
  
  import org.apache.log4j.Logger;
***************
*** 61,65 ****
    
    /** The space of this modellor */
!   private Container space;
  
    /** A surface in the space to start the modellor  */
--- 61,65 ----
    
    /** The space of this modellor */
!   private Space space;
  
    /** A surface in the space to start the modellor  */
***************
*** 81,85 ****
    
    /** The net of the modellor */
!   private Container net;
    
    /**
--- 81,85 ----
    
    /** The net of the modellor */
!   private Space net;
    
    /**
***************
*** 95,99 ****
     * @param s the space of the modellor
     */
!   public InnerWallModellor(Container s) {
      this.space = s;
    }
--- 95,99 ----
     * @param s the space of the modellor
     */
!   public InnerWallModellor(Space s) {
      this.space = s;
    }
***************
*** 119,123 ****
     */
    public int getUseableLevel() {
!     return Container.SPACE_LEVEL;
    }
  
--- 119,123 ----
     */
    public int getUseableLevel() {
!     return Space.SPACE_LEVEL;
    }
  
***************
*** 126,130 ****
     */
    @Override
!   public Modellor newInstance(Container s) {
      InnerWallModellor mod = new InnerWallModellor(s);
      Project.getInstance().addObserver(mod);
--- 126,130 ----
     */
    @Override
!   public Modellor newInstance(Space s) {
      InnerWallModellor mod = new InnerWallModellor(s);
      Project.getInstance().addObserver(mod);
***************
*** 158,164 ****
      if (build) {
        if (net == null) {
!         for (Space current : space.getElements()) {
            if (current.isNet()) {
!             net = (Container) current;
              break;
            }
--- 158,164 ----
      if (build) {
        if (net == null) {
!         for (Item current : space.getElements()) {
            if (current.isNet()) {
!             net = (Space) current;
              break;
            }
***************
*** 184,188 ****
     * @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());
--- 184,188 ----
     * @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());
***************
*** 216,220 ****
        Surface base = joistBase();
        space.add(base);
!       Container joist = Space.createConstructionSpace("joist");
        Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
        joist.setClassificationType(c.getPossibleTypes().getChildren().get(0));
--- 216,220 ----
        Surface base = joistBase();
        space.add(base);
!       Space joist = Item.createConstructionSpace("joist");
        Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
        joist.setClassificationType(c.getPossibleTypes().getChildren().get(0));
***************
*** 257,261 ****
    }
    
!   private void buildWoodSheets(Container net) {
      List<Edge> outline = netOutline(net);
      if  (!outline.isEmpty()) { 
--- 257,261 ----
    }
    
!   private void buildWoodSheets(Space net) {
      List<Edge> outline = netOutline(net);
      if  (!outline.isEmpty()) { 
***************
*** 268,274 ****
        Surface sheet1 = new Surface(outlineCopy1);
        Surface sheet2 = new Surface(outlineCopy2);
!       Container sheetSpace1 = Space.createConstructionSpace("sheet1");
        sheetSpace1.setClassification(woodSheet());
!       Container sheetSpace2 = Space.createConstructionSpace("sheet2");
        sheetSpace2.setClassification(woodSheet());
        Vertex j = cs.getJ().copy();
--- 268,274 ----
        Surface sheet1 = new Surface(outlineCopy1);
        Surface sheet2 = new Surface(outlineCopy2);
!       Space sheetSpace1 = Item.createConstructionSpace("sheet1");
        sheetSpace1.setClassification(woodSheet());
!       Space sheetSpace2 = Item.createConstructionSpace("sheet2");
        sheetSpace2.setClassification(woodSheet());
        Vertex j = cs.getJ().copy();
***************
*** 348,354 ****
     * @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();
--- 348,354 ----
     * @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();
***************
*** 416,421 ****
        for (Surface s : envelope) {
          //support for other innerwalls
!         Container front = s.getFrontDomain();
!         Container back = s.getBackDomain();
          Classification frontClass = front.getClassification();
          Classification backClass = back.getClassification();
--- 416,421 ----
        for (Surface s : envelope) {
          //support for other innerwalls
!         Space front = s.getFrontDomain();
!         Space back = s.getBackDomain();
          Classification frontClass = front.getClassification();
          Classification backClass = back.getClassification();
***************
*** 487,492 ****
        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();
--- 487,492 ----
        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();
***************
*** 563,568 ****
      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();
--- 563,568 ----
      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();
***************
*** 592,596 ****
     * @return the space
     */
!   public Container getSpace() {
      return space;
    }
--- 592,596 ----
     * @return the space
     */
!   public Space getSpace() {
      return space;
    }
***************
*** 599,603 ****
     *  @param space the space 
     */
!   public void setSpace(Container space) {
      this.space = space;
    }
--- 599,603 ----
     *  @param space the space 
     */
!   public void setSpace(Space space) {
      this.space = space;
    }
***************
*** 672,676 ****
     * @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>();
--- 672,676 ----
     * @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>();
***************
*** 725,729 ****
     * @return the net of this modellor
     */
!   public Container getNet() {
      return net;
    }
--- 725,729 ----
     * @return the net of this modellor
     */
!   public Space getNet() {
      return net;
    }

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ModelBathModellor2.java	25 Jun 2009 20:29:33 -0000	1.19
--- ModelBathModellor2.java	25 Jun 2009 22:17:30 -0000	1.20
***************
*** 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;
--- 16,20 ----
  
  import net.sourceforge.bprocessor.model.Attribute;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 24,28 ****
  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;
--- 24,28 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selector;
! import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 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;
--- 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;
***************
*** 62,66 ****
    private CoordinateSystem coord;
  
!   private Container net;
  
    private double doorHeight = 2.2;
--- 62,66 ----
    private CoordinateSystem coord;
  
!   private Space net;
  
    private double doorHeight = 2.2;
***************
*** 70,74 ****
    private double windowHeight = 0.5;
    
!   private Collection<Container> doorAndWindows = new ArrayList<Container>();
  
    private Collection<Modellor> insideModellors = new LinkedList<Modellor>();
--- 70,74 ----
    private double windowHeight = 0.5;
    
!   private Collection<Space> doorAndWindows = new ArrayList<Space>();
  
    private Collection<Modellor> insideModellors = new LinkedList<Modellor>();
***************
*** 85,89 ****
     * @param s the Space to realize the modellor in
     */
!   public ModelBathModellor2(Container s) {
      this();
      space = s;
--- 85,89 ----
     * @param s the Space to realize the modellor in
     */
!   public ModelBathModellor2(Space s) {
      this();
      space = s;
***************
*** 119,123 ****
      Surface s = new Surface(edges);
      
!     net = Container.createNet("Boundary");
      net.add(v1);
      net.add(v2);
--- 119,123 ----
      Surface s = new Surface(edges);
      
!     net = Space.createNet("Boundary");
      net.add(v1);
      net.add(v2);
***************
*** 157,167 ****
     */
    private void generateBath() {
!     floor = Space.createConstructionSpace("Floor");
      space.add(floor);
!     bath = Space.createFunctionalSpace("Bath cabin");
      space.add(bath);
!     walls = Space.createConstructionSpace("Walls");
      space.add(walls);
!     ceiling = Space.createConstructionSpace("Ceiling");
      space.add(ceiling);
      makeFloor();
--- 157,167 ----
     */
    private void generateBath() {
!     floor = Item.createConstructionSpace("Floor");
      space.add(floor);
!     bath = Item.createFunctionalSpace("Bath cabin");
      space.add(bath);
!     walls = Item.createConstructionSpace("Walls");
      space.add(walls);
!     ceiling = Item.createConstructionSpace("Ceiling");
      space.add(ceiling);
      makeFloor();
***************
*** 273,277 ****
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Container concrete = Space.createConstructionSpace("Concrete");
        walls.add(concrete);
        if (s.normal().getZ() == 1.0) {
--- 273,277 ----
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = Item.createConstructionSpace("Concrete");
        walls.add(concrete);
        if (s.normal().getZ() == 1.0) {
***************
*** 292,296 ****
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Container tile = Space.createConstructionSpace("Tile");
        walls.add(tile);
        if (s.normal().getZ() == 1.0) {
--- 292,296 ----
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = Item.createConstructionSpace("Tile");
        walls.add(tile);
        if (s.normal().getZ() == 1.0) {
***************
*** 345,349 ****
      }
      // copy doors and windows in
!     for (Container spc : doorAndWindows) {
        Surface inner = null;
        for (Surface s : spc.getEnvelope()) {
--- 345,349 ----
      }
      // copy doors and windows in
!     for (Space spc : doorAndWindows) {
        Surface inner = null;
        for (Surface s : spc.getEnvelope()) {
***************
*** 376,380 ****
          if (s.getCurrentValue().equals("Door")) {
            // make a door
!           Container doorSpc = Space.createConstructionSpace("Door");
            doorAndWindows.add(doorSpc);
            space.add(doorSpc);
--- 376,380 ----
          if (s.getCurrentValue().equals("Door")) {
            // make a door
!           Space doorSpc = Item.createConstructionSpace("Door");
            doorAndWindows.add(doorSpc);
            space.add(doorSpc);
***************
*** 419,423 ****
          } else if (s.getCurrentValue().equals("Window")) {
            //make a window
!           Container winSpc = Space.createConstructionSpace("Window");
            doorAndWindows.add(winSpc);
            space.add(winSpc);
--- 419,423 ----
          } else if (s.getCurrentValue().equals("Window")) {
            //make a window
!           Space winSpc = Item.createConstructionSpace("Window");
            doorAndWindows.add(winSpc);
            space.add(winSpc);
***************
*** 651,657 ****
    /** {@inheritDoc} */
    @Override
!   public Modellor newInstance(Container s) {
!     if (s.getLevel() == Container.PROJECT_LEVEL) {
!       Container bath = Space.createUnion("Bath-union");
        s.add(bath);
        return new ModelBathModellor2(bath);
--- 651,657 ----
    /** {@inheritDoc} */
    @Override
!   public Modellor newInstance(Space s) {
!     if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = Item.createUnion("Bath-union");
        s.add(bath);
        return new ModelBathModellor2(bath);
***************
*** 755,760 ****
    @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");
--- 755,760 ----
    @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");
***************
*** 787,791 ****
    @Override
    public int getUseableLevel() {
!     return Container.PROJECT_LEVEL;
    }
  }
--- 787,791 ----
    @Override
    public int getUseableLevel() {
!     return Space.PROJECT_LEVEL;
    }
  }

Index: Modellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/Modellor.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Modellor.java	17 Dec 2007 13:09:18 -0000	1.16
--- Modellor.java	25 Jun 2009 22:17:30 -0000	1.17
***************
*** 18,22 ****
  import net.sourceforge.bprocessor.model.Observer;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.model.Container;
  
  
--- 18,22 ----
  import net.sourceforge.bprocessor.model.Observer;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.model.Space;
  
  
***************
*** 131,135 ****
     * @return The created modellor object for the given space
     */
!   public abstract Modellor newInstance(Container space);
    
   
--- 131,135 ----
     * @return The created modellor object for the given space
     */
!   public abstract Modellor newInstance(Space space);
    
   
***************
*** 138,142 ****
     * @return Space
     */
!   public Container createSpace() {
      return null;
    }
--- 138,142 ----
     * @return Space
     */
!   public Space createSpace() {
      return null;
    }
***************
*** 147,151 ****
     * @return Parametric
     */
!   public Parametric get(Container element) {
      return (Parametric) parameters.get(element);
    }
--- 147,151 ----
     * @return Parametric
     */
!   public Parametric get(Space element) {
      return (Parametric) parameters.get(element);
    }
***************
*** 156,160 ****
     * @param parametric Parametric
     */
!   public void set(Container element, Parametric parametric) {
      parameters.put(element, parametric);
    }
--- 156,160 ----
     * @param parametric Parametric
     */
!   public void set(Space element, Parametric parametric) {
      parameters.put(element, parametric);
    }