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

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

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

Modified Files:
	NetFacadeModellor.java FacadeModellor.java 
Log Message:
Instance/Container instantiated as appropriately

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** NetFacadeModellor.java	11 Dec 2007 14:48:47 -0000	1.43
--- NetFacadeModellor.java	12 Dec 2007 12:48:18 -0000	1.44
***************
*** 19,22 ****
--- 19,23 ----
  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;
***************
*** 132,136 ****
      Project.getInstance().scheduleObserver(mod);
      s.setModellor(mod);
!     frame = new Space("Frame", 
          Space.CONSTRUCTION, 
          true);
--- 133,137 ----
      Project.getInstance().scheduleObserver(mod);
      s.setModellor(mod);
!     frame = new Container("Frame", 
          Space.CONSTRUCTION, 
          true);
***************
*** 390,394 ****
    private void createDoubleFacade(Space net) {
      if (frame == null) {
!       frame = new Space("Frame", 
            Space.CONSTRUCTION,  
            true);
--- 391,395 ----
    private void createDoubleFacade(Space net) {
      if (frame == null) {
!       frame = new Container("Frame", 
            Space.CONSTRUCTION,  
            true);
***************
*** 439,443 ****
    private void createSingleFacade(Space net) {
      if (frame == null) {
!       frame = new Space("Frame", 
            Space.CONSTRUCTION,
            true);
--- 440,444 ----
    private void createSingleFacade(Space net) {
      if (frame == null) {
!       frame = new Container("Frame", 
            Space.CONSTRUCTION,
            true);
***************
*** 474,478 ****
            Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap));
            hole = space.insert(hole);
!           Space holeSpace = new Space("Facade Hole", 
                Space.FUNCTIONAL, 
                true);
--- 475,479 ----
            Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap));
            hole = space.insert(hole);
!           Space holeSpace = new Container("Facade Hole", 
                Space.FUNCTIONAL, 
                true);
***************
*** 519,528 ****
        Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1));
        Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2));
!       Space f = new Space(type + " Frame", 
            Space.CONSTRUCTION,
            true);
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        f.setClassification(frameClass);
!       Space g = new Space("Glass", 
            Space.CONSTRUCTION,
            true);
--- 520,529 ----
        Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1));
        Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2));
!       Space f = new Container(type + " Frame", 
            Space.CONSTRUCTION,
            true);
        Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
        f.setClassification(frameClass);
!       Space g = new Container("Glass", 
            Space.CONSTRUCTION,
            true);

Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** FacadeModellor.java	11 Dec 2007 14:48:47 -0000	1.38
--- FacadeModellor.java	12 Dec 2007 12:48:18 -0000	1.39
***************
*** 18,21 ****
--- 18,22 ----
  import net.sourceforge.bprocessor.gui.GUI;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
+ import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Attribute;
***************
*** 365,369 ****
      if (front != null &&
          depth > 0) {
!       Space frame = new Space("Frame", Space.CONSTRUCTION, true);
        space.add(frame);
        Surface eFront = front.copy(space);
--- 366,370 ----
      if (front != null &&
          depth > 0) {
!       Space frame = new Container("Frame", Space.CONSTRUCTION, true);
        space.add(frame);
        Surface eFront = front.copy(space);
***************
*** 690,694 ****
        Surface s = (Surface)it.next();
        Set sides = new HashSet();
!       Space w = new Space("Window", Space.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();
!       Space w = new Container("Window", Space.CONSTRUCTION, true);
        double u = s.normal().dot(front.normal());
        if ((u > 0 && front.getBackDomain() == space) ||