[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor ModelBathModellor2.java, 1.6, 1.7 ModelBathModellor.java, 1.5, 1.6

[rimestad <rim...@us...>]

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

Modified Files:
	ModelBathModellor2.java ModelBathModellor.java 
Log Message:
Change bath modellor to be created on the project space instead

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ModelBathModellor2.java	30 May 2007 17:28:58 -0000	1.6
--- ModelBathModellor2.java	10 Aug 2007 11:23:06 -0000	1.7
***************
*** 87,91 ****
      this();
      space = s;
!     space.setUnion(true);
      coord = Project.getInstance().getActiveCoordinateSystem();
      width = 1.500;
--- 87,91 ----
      this();
      space = s;
!     space.setModellor(this);
      coord = Project.getInstance().getActiveCoordinateSystem();
      width = 1.500;
***************
*** 94,97 ****
--- 94,98 ----
      generateNet();
      space.add(net);
+     update(net);
      net.edit();
    }
***************
*** 170,174 ****
      
      elementWalls();
!     addTileModellors();
    }
    
--- 171,175 ----
      
      elementWalls();
!     //addTileModellors();
    }
    
***************
*** 664,669 ****
    @Override
    public Modellor newInstance(Space s) {
!     if (s.getLevel() == Space.SPACE_LEVEL) {
!       return new ModelBathModellor2(s);
      } else {
        return null;
--- 665,673 ----
    @Override
    public Modellor newInstance(Space s) {
!     if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = new Space("Bath-union", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
!       bath.setUnion(true);
!       s.add(bath);
!       return new ModelBathModellor2(bath);
      } else {
        return null;
***************
*** 797,801 ****
    @Override
    public int getUseableLevel() {
!     return Space.SPACE_LEVEL;
    }
  }
--- 801,805 ----
    @Override
    public int getUseableLevel() {
!     return Space.PROJECT_LEVEL;
    }
  }

Index: ModelBathModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ModelBathModellor.java	18 Jul 2007 12:24:09 -0000	1.5
--- ModelBathModellor.java	10 Aug 2007 11:23:06 -0000	1.6
***************
*** 198,203 ****
    /** {@inheritDoc} */
    public Modellor newInstance(Space s) {
!     if (s.getLevel() == Space.SPACE_LEVEL) {
!       return new ModelBathModellor(s);
      } else {
        return null;
--- 198,206 ----
    /** {@inheritDoc} */
    public Modellor newInstance(Space s) {
!     if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = new Space("Bath-unio", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
!       bath.setUnion(true);
!       s.add(bath);
!       return new ModelBathModellor(bath);
      } else {
        return null;