[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.46, 1.47 FacadeModellor.java, 1.41, 1.42

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

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

Modified Files:
	NetFacadeModellor.java FacadeModellor.java 
Log Message:
Refactor

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** NetFacadeModellor.java	17 Dec 2007 13:09:29 -0000	1.46
--- NetFacadeModellor.java	3 Nov 2008 13:14:15 -0000	1.47
***************
*** 28,31 ****
--- 28,32 ----
  import net.sourceforge.bprocessor.model.Selector;
  import net.sourceforge.bprocessor.model.Container;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 132,138 ****
      Project.getInstance().scheduleObserver(mod);
      s.setModellor(mod);
!     frame = new Container("Frame", 
!         Container.CONSTRUCTION, 
!         true);
      Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
      frame.setClassification(frameClass);
--- 133,137 ----
      Project.getInstance().scheduleObserver(mod);
      s.setModellor(mod);
!     frame = Space.createConstructionSpace("Frame");
      Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
      frame.setClassification(frameClass);
***************
*** 390,396 ****
    private void createDoubleFacade(Container net) {
      if (frame == null) {
!       frame = new Container("Frame", 
!           Container.CONSTRUCTION,  
!           true);
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        frame.setClassification(frameClass);
--- 389,393 ----
    private void createDoubleFacade(Container net) {
      if (frame == null) {
!       frame = Space.createConstructionSpace("Frame");
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        frame.setClassification(frameClass);
***************
*** 439,445 ****
    private void createSingleFacade(Container net) {
      if (frame == null) {
!       frame = new Container("Frame", 
!           Container.CONSTRUCTION,
!           true);
        space.add(frame);
      }
--- 436,440 ----
    private void createSingleFacade(Container net) {
      if (frame == null) {
!       frame = Space.createConstructionSpace("Frame");
        space.add(frame);
      }
***************
*** 474,480 ****
            Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap));
            hole = space.insert(hole);
!           Container holeSpace = new Container("Facade Hole", 
!               Container.FUNCTIONAL, 
!               true);
            space.add(holeSpace);
            Geometry.assignSame(front, hole, space, holeSpace);          
--- 469,473 ----
            Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap));
            hole = space.insert(hole);
!           Container holeSpace = Space.createFunctionalSpace("Facade Hole");
            space.add(holeSpace);
            Geometry.assignSame(front, hole, space, holeSpace);          
***************
*** 519,530 ****
        Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1));
        Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2));
!       Container f = new Container(type + " Frame", 
!           Container.CONSTRUCTION,
!           true);
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        f.setClassification(frameClass);
!       Container g = new Container("Glass", 
!           Container.CONSTRUCTION,
!           true);
        Classification glassClass = Project.getInstance().getClassification(GLASS, 0);
        g.setClassification(glassClass);
--- 512,519 ----
        Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1));
        Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2));
!       Container f = Space.createConstructionSpace(type + " Frame");
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        f.setClassification(frameClass);
!       Container 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.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** FacadeModellor.java	17 Dec 2007 13:09:29 -0000	1.41
--- FacadeModellor.java	3 Nov 2008 13:14:15 -0000	1.42
***************
*** 20,23 ****
--- 20,24 ----
  import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Attribute;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Project;
***************
*** 365,369 ****
      if (front != null &&
          depth > 0) {
!       Container frame = new Container("Frame", Container.CONSTRUCTION, true);
        space.add(frame);
        Surface eFront = front.copy(space);
--- 366,370 ----
      if (front != null &&
          depth > 0) {
!       Container frame = Space.createConstructionSpace("Frame");
        space.add(frame);
        Surface eFront = front.copy(space);
***************
*** 690,694 ****
        Surface s = (Surface)it.next();
        Set sides = new HashSet();
!       Container w = new Container("Window", Container.CONSTRUCTION, true);
        double u = s.normal().dot(front.normal());
        if ((u > 0 && front.getBackDomain() == space) ||
--- 691,695 ----
        Surface s = (Surface)it.next();
        Set sides = new HashSet();
!       Container w = Space.createConstructionSpace("Window");
        double u = s.normal().dot(front.normal());
        if ((u > 0 && front.getBackDomain() == space) ||