[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui/treeview GenericTreeView.java, 1.100, 1.101

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

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

Modified Files:
	GenericTreeView.java 
Log Message:
changed labels for unions and container for inner elements

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** GenericTreeView.java	9 May 2007 09:31:05 -0000	1.100
--- GenericTreeView.java	24 May 2007 10:57:23 -0000	1.101
***************
*** 598,602 ****
        Set surfaces = space.getEnvelope();
        add(new SurfaceContainer("Envelope", surfaces));
!       add(new ElementContainer(space.getElements()));
        add(new GeometryContainer("Geometry", space));
        ContainerNode cn = new ConstructorContainer("Constructors", space.getConstructors());
--- 598,608 ----
        Set surfaces = space.getEnvelope();
        add(new SurfaceContainer("Envelope", surfaces));
!       String lvlstr = "";
!       if (space.isUnion()) {
!         lvlstr = Space.levelToString(space.getLevel());
!       } else {
!         lvlstr = Space.levelToString(space.getLevel() + 1);
!       }
!       add(new ElementContainer(lvlstr, space.getElements()));
        add(new GeometryContainer("Geometry", space));
        ContainerNode cn = new ConstructorContainer("Constructors", space.getConstructors());
***************
*** 920,931 ****
       * Constructor 
       * @param elements The elements
       */
!     public ElementContainer(Collection elements) {
!       super("", elements);
        Iterator iter = elements.iterator();
-       setUserObject("Unknown");
        if (iter.hasNext()) {
          Space s = (Space)iter.next();
-         setUserObject(s.getLevelString());
        }
        insertChildren(elements, true);
--- 926,936 ----
       * Constructor 
       * @param elements The elements
+      * @param name the string that should be shown on this object
       */
!     public ElementContainer(String name, Collection elements) {
!       super(name, elements);
        Iterator iter = elements.iterator();
        if (iter.hasNext()) {
          Space s = (Space)iter.next();
        }
        insertChildren(elements, true);