[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview SpacesTreeView.java,1.4,1.5

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20828

Modified Files:
	SpacesTreeView.java 
Log Message:
added checks to see if space contained any elements of surfaces

Index: SpacesTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpacesTreeView.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SpacesTreeView.java	10 Aug 2005 09:48:54 -0000	1.4
--- SpacesTreeView.java	13 Sep 2005 17:45:05 -0000	1.5
***************
*** 26,29 ****
--- 26,30 ----
  import java.util.LinkedList;
  import java.util.List;
+ import java.util.Set;
  import java.util.Vector;
  
***************
*** 99,140 ****
        ElementContainerNode ecn = sn.getElementContainer();
        ecn.removeAll();
! 
!       Iterator it = space.getSurfaces().iterator();
!       while (it.hasNext()) {
!         Surface s = (Surface)it.next();
!         scn.add(new SurfaceNode(s.getId(), s.getName(), scn));
!       }
! 
!       it = space.getElements().iterator();
!       while (it.hasNext()) {
!         Element e = (Element)it.next();
!         ElementNode en = new ElementNode(e.getId(), e.getName(), ecn);
!         SurfaceContainerNode escn = en.getSurfaceContainer();
!         PartContainerNode pcn = en.getPartContainer();
! 
!         Iterator eit = e.getSurfaces().iterator();
!         while (eit.hasNext()) {
!           Surface s = (Surface)eit.next();
!           escn.add(new SurfaceNode(s.getId(), s.getName(), escn));
          }
! 
!         eit = e.getParts().iterator();
!         while (eit.hasNext()) {
!           Part p = (Part)eit.next();
!           PartNode pn = new PartNode(p.getId(), p.getName(), pcn);
!           SurfaceContainerNode pscn = pn.getSurfaceContainer();
          
!           Iterator pit = p.getSurfaces().iterator();
!           while (pit.hasNext()) {
!             Surface s = (Surface)pit.next();
!             pscn.add(new SurfaceNode(s.getId(), s.getName(), pscn));
            }
  
!           pcn.add(pn);
          }
- 
-         ecn.add(en);
        }
- 
        getModel().valueForPathChanged(sn.getTreePath(), sn);
  
--- 100,147 ----
        ElementContainerNode ecn = sn.getElementContainer();
        ecn.removeAll();
!       
!       Set surfs = space.getSurfaces();
!       if (surfs != null) {
!         Iterator it = surfs.iterator();
!         while (it.hasNext()) {
!           Surface s = (Surface)it.next();
!           scn.add(new SurfaceNode(s.getId(), s.getName(), scn));
          }
!       }
!       
!       Set elems = space.getElements();
!       if (elems != null) {
!         Iterator it = space.getElements().iterator();
          
!         while (it.hasNext()) {
!           Element e = (Element)it.next();
!           ElementNode en = new ElementNode(e.getId(), e.getName(), ecn);
!           SurfaceContainerNode escn = en.getSurfaceContainer();
!           PartContainerNode pcn = en.getPartContainer();
!           
!           Iterator eit = e.getSurfaces().iterator();
!           while (eit.hasNext()) {
!             Surface s = (Surface)eit.next();
!             escn.add(new SurfaceNode(s.getId(), s.getName(), escn));
!           }
!           
!           eit = e.getParts().iterator();
!           while (eit.hasNext()) {
!             Part p = (Part)eit.next();
!             PartNode pn = new PartNode(p.getId(), p.getName(), pcn);
!             SurfaceContainerNode pscn = pn.getSurfaceContainer();
!             
!             Iterator pit = p.getSurfaces().iterator();
!             while (pit.hasNext()) {
!               Surface s = (Surface)pit.next();
!               pscn.add(new SurfaceNode(s.getId(), s.getName(), pscn));
!             }
!             
!             pcn.add(pn);
            }
  
!           ecn.add(en);
          }
        }
        getModel().valueForPathChanged(sn.getTreePath(), sn);