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

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

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

Modified Files:
	GenericTreeView.java 
Log Message:
Improvement to components

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** GenericTreeView.java	19 Nov 2007 09:33:17 -0000	1.124
--- GenericTreeView.java	19 Nov 2007 10:51:38 -0000	1.125
***************
*** 514,557 ****
      public void update(Object object) {
        if (object instanceof Collection) {
!         if (sort) {
!           content = (Collection) object;
!           Set<Entity> elements = new HashSet<Entity>();
!           elements.addAll(content);
!           Set<GenericNode> children = new HashSet<GenericNode>();
!           Enumeration enumeration = this.children();
!           while (enumeration.hasMoreElements()) {
!             GenericNode node = (GenericNode)enumeration.nextElement();
!             Entity entity = (Entity)node.getUserObject();
!             if (elements.contains(entity)) {
!               node.update(entity);
!               elements.remove(entity);
!             } else {
!               children.add(node);
!             }
!           }
!           if (elements.size() > 0) {
!             this.insertChildren(elements);
!           }
!           if (children.size() > 0) {
!             this.removeChildren(children);
!           }
!         } else {
!           boolean insert = false;
!           Collection c = (Collection) object;
!           HashSet set = new HashSet(c);
!           Enumeration children = this.children();
!           while (children.hasMoreElements()) {
!             GenericNode node = (GenericNode)children.nextElement();
!             if (!set.contains(node.getUserObject())) {
!               this.removeAllChildren();
!               insert = true;
!               break;
!             }
!           }
!           if (insert) {
!             this.insertChildren(c);
!             model.nodeStructureChanged(this);
            }
          }
        } else {
          log.warn(userObject + " were called with " + object + " and not a collection");
--- 514,538 ----
      public void update(Object object) {
        if (object instanceof Collection) {
!         content = (Collection) object;
!         Set<Entity> elements = new HashSet<Entity>();
!         elements.addAll(content);
!         Set<GenericNode> children = new HashSet<GenericNode>();
!         Enumeration enumeration = this.children();
!         while (enumeration.hasMoreElements()) {
!           GenericNode node = (GenericNode)enumeration.nextElement();
!           Entity entity = (Entity)node.getUserObject();
!           if (elements.contains(entity)) {
!             node.update(entity);
!             elements.remove(entity);
!           } else {
!             children.add(node);
            }
          }
+         if (elements.size() > 0) {
+           this.insertChildren(elements);
+         }
+         if (children.size() > 0) {
+           this.removeChildren(children);
+         }
        } else {
          log.warn(userObject + " were called with " + object + " and not a collection");
***************
*** 1231,1234 ****
--- 1212,1227 ----
        return menu;
      }
+     
+     /**
+      * Return icon
+      * @return icon
+      */
+     public ImageIcon icon() {
+       if (((Component)userObject).getSpace().isConstructionSpace()) {
+         return constructionspaceicon;
+       } else {
+         return functionalspaceicon;
+       }
+     }
    }