[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor WindowModellor.java, 1.10, 1.11

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

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

Modified Files:
	WindowModellor.java 
Log Message:
The modellor do not remove created geomerty at deletion and made some simplifications

Index: WindowModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/WindowModellor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** WindowModellor.java	3 Oct 2006 09:53:26 -0000	1.10
--- WindowModellor.java	4 Oct 2006 14:44:07 -0000	1.11
***************
*** 58,64 ****
    /** The created bounding */
    private Surface opposite;
-   
-   /** the constructed spaces */
-   private List elements;
  
    /** The constructed geometry */
--- 58,61 ----
***************
*** 82,86 ****
      space = s;
      surface = sur;
-     elements = new LinkedList();
      extension = new HashSet();
      
--- 79,82 ----
***************
*** 147,151 ****
      glass.setTransparent(true);
      Surface inner = surface.copy(space);
-     elements.add(inner);
      inner.setFrontDomain(frame);
      //make hole in frame
--- 143,146 ----
***************
*** 162,166 ****
      }
      Surface glasssurface = new Surface(holeedges);
-     elements.add(glasssurface);
      inner.addHole(glasssurface);
      space.add(glasssurface);
--- 157,160 ----
***************
*** 168,178 ****
      HashSet tmp = new HashSet();
      Surface frametop = inner.extrude(sign * framedepth, tmp);
-     elements.addAll(tmp);
-     elements.add(frametop);
      tmp.clear();
      Surface hole = glasssurface.extrude(sign * framedepth, tmp);
-     elements.add(hole);
      frametop.addHole(hole);
-     elements.addAll(tmp);
      space.add(frame);
      space.add(glass);
--- 162,168 ----
***************
*** 195,205 ****
     */
    public void delete() {
-     cleanUp();
-     
-     Iterator iter = extension.iterator();
-     while (iter.hasNext()) {
-       Surface s = (Surface)iter.next();
-       s.delete();
-     }    
      space.setModellor(null);
    }
--- 185,188 ----
***************
*** 209,218 ****
     */
    private void cleanUp() {
-     Iterator it = elements.iterator();
-     while (it.hasNext()) {
-       ((Surface)it.next()).delete();
-     }
-     elements = new LinkedList();
-     extension = new HashSet();
      space.clear();
    }
--- 192,195 ----