[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor FacadeModellor.java, 1.15, 1.16 WindowModellor.java, 1.8, 1.9

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

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

Modified Files:
	FacadeModellor.java WindowModellor.java 
Log Message:
as

Index: WindowModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/WindowModellor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WindowModellor.java	25 Sep 2006 13:44:40 -0000	1.8
--- WindowModellor.java	26 Sep 2006 10:01:11 -0000	1.9
***************
*** 143,148 ****
    /** Draw the window */
    public void drawWindow() {
!     Space frame = new Space("Frame", Space.CONSTRUCTION, true);
!     Space glass = new Space("Glass", Space.CONSTRUCTION, true);
      glass.setTransparent(true);
      Surface inner = surface.copy(space);
--- 143,148 ----
    /** Draw the window */
    public void drawWindow() {
!     Space frame = new Space("Frame", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
!     Space glass = new Space("Glass", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
      glass.setTransparent(true);
      Surface inner = surface.copy(space);
***************
*** 183,187 ****
     */
    public Modellor newInstance(Space s) {
!     return new WindowModellor(s, (Surface)(s.getEnvelope().iterator().next()));
    }
  
--- 183,192 ----
     */
    public Modellor newInstance(Space s) {
!     if (s.getLevel() == Space.SPACE_LEVEL) {
!       return new WindowModellor(s, (Surface)(s.getEnvelope().iterator().next()));
!     } else {
!       
!       return null;
!     }
    }
  

Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FacadeModellor.java	25 Sep 2006 14:07:36 -0000	1.15
--- FacadeModellor.java	26 Sep 2006 10:01:11 -0000	1.16
***************
*** 323,327 ****
          depth > 0) {
        removeFacade();
!       frame = new Space("Frame", Space.CONSTRUCTION, true);
        space.add(frame);
        Surface eFront = front.copy(space);
--- 323,327 ----
          depth > 0) {
        removeFacade();
!       frame = new Space("Frame", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
        space.add(frame);
        Surface eFront = front.copy(space);
***************
*** 612,616 ****
          Vertex sn = s.normal();
          Vertex fn = front.normal();
!         Space wf = new Space("Window", Space.CONSTRUCTION, true);
          space.add(wf);
          windowElements.add(wf);
--- 612,616 ----
          Vertex sn = s.normal();
          Vertex fn = front.normal();
!         Space wf = new Space("Window", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
          space.add(wf);
          windowElements.add(wf);