[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.48, 1.49 FacadeModellor.java, 1.43, 1.44

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

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

Modified Files:
	NetFacadeModellor.java FacadeModellor.java 
Log Message:
item to space


Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** NetFacadeModellor.java	25 Jun 2009 22:17:23 -0000	1.48
--- NetFacadeModellor.java	25 Jun 2009 23:28:38 -0000	1.49
***************
*** 28,32 ****
  import net.sourceforge.bprocessor.model.Selector;
  import net.sourceforge.bprocessor.model.Space;
- import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 28,31 ----
***************
*** 133,137 ****
      Project.getInstance().scheduleObserver(mod);
      s.setModellor(mod);
!     frame = Item.createConstructionSpace("Frame");
      Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
      frame.setClassification(frameClass);
--- 132,136 ----
      Project.getInstance().scheduleObserver(mod);
      s.setModellor(mod);
!     frame = Space.createConstructionSpace("Frame");
      Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
      frame.setClassification(frameClass);
***************
*** 389,393 ****
    private void createDoubleFacade(Space net) {
      if (frame == null) {
!       frame = Item.createConstructionSpace("Frame");
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        frame.setClassification(frameClass);
--- 388,392 ----
    private void createDoubleFacade(Space net) {
      if (frame == null) {
!       frame = Space.createConstructionSpace("Frame");
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        frame.setClassification(frameClass);
***************
*** 436,440 ****
    private void createSingleFacade(Space net) {
      if (frame == null) {
!       frame = Item.createConstructionSpace("Frame");
        space.add(frame);
      }
--- 435,439 ----
    private void createSingleFacade(Space net) {
      if (frame == null) {
!       frame = Space.createConstructionSpace("Frame");
        space.add(frame);
      }
***************
*** 469,473 ****
            Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap));
            hole = space.insert(hole);
!           Space holeSpace = Item.createFunctionalSpace("Facade Hole");
            space.add(holeSpace);
            Geometry.assignSame(front, hole, space, holeSpace);          
--- 468,472 ----
            Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap));
            hole = space.insert(hole);
!           Space holeSpace = Space.createFunctionalSpace("Facade Hole");
            space.add(holeSpace);
            Geometry.assignSame(front, hole, space, holeSpace);          
***************
*** 512,519 ****
        Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1));
        Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2));
!       Space f = Item.createConstructionSpace(type + " Frame");
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        f.setClassification(frameClass);
!       Space g = Item.createConstructionSpace("Glass");
        Classification glassClass = Project.getInstance().getClassification(GLASS, 0);
        g.setClassification(glassClass);
--- 511,518 ----
        Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1));
        Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2));
!       Space f = Space.createConstructionSpace(type + " Frame");
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        f.setClassification(frameClass);
!       Space g = Space.createConstructionSpace("Glass");
        Classification glassClass = Project.getInstance().getClassification(GLASS, 0);
        g.setClassification(glassClass);

Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** FacadeModellor.java	25 Jun 2009 22:17:23 -0000	1.43
--- FacadeModellor.java	25 Jun 2009 23:28:38 -0000	1.44
***************
*** 20,24 ****
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Attribute;
- import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Project;
--- 20,23 ----
***************
*** 366,370 ****
      if (front != null &&
          depth > 0) {
!       Space frame = Item.createConstructionSpace("Frame");
        space.add(frame);
        Surface eFront = front.copy(space);
--- 365,369 ----
      if (front != null &&
          depth > 0) {
!       Space frame = Space.createConstructionSpace("Frame");
        space.add(frame);
        Surface eFront = front.copy(space);
***************
*** 691,695 ****
        Surface s = (Surface)it.next();
        Set sides = new HashSet();
!       Space w = Item.createConstructionSpace("Window");
        double u = s.normal().dot(front.normal());
        if ((u > 0 && front.getBackDomain() == space) ||
--- 690,694 ----
        Surface s = (Surface)it.next();
        Set sides = new HashSet();
!       Space w = Space.createConstructionSpace("Window");
        double u = s.normal().dot(front.normal());
        if ((u > 0 && front.getBackDomain() == space) ||