[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview GenericTreeView.java, 1.139, 1.140 SpaceTreeView.java, 1.29, 1.30

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

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

Modified Files:
	GenericTreeView.java SpaceTreeView.java 
Log Message:
make union is more intelligent wrt selection
geometry, constraints and globals removed from D-View

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** GenericTreeView.java	10 Jan 2008 09:54:00 -0000	1.139
--- GenericTreeView.java	24 Jan 2008 10:35:38 -0000	1.140
***************
*** 124,128 ****
      vertexgroupicon = loadIcon("Biconvertexgroup.gif");
      genericgroupicon = loadIcon("Bicongenericgroup.gif");
!     constructoricon = loadIcon("Biconconstructor.gif");
      constructorgroupicon = loadIcon("Biconconstructorgroup.gif");
      constructionspaceicon = loadIcon("Biconconspace.gif");
--- 124,128 ----
      vertexgroupicon = loadIcon("Biconvertexgroup.gif");
      genericgroupicon = loadIcon("Bicongenericgroup.gif");
!     constructoricon = loadIcon("constructor-icon.png");
      constructorgroupicon = loadIcon("Biconconstructorgroup.gif");
      constructionspaceicon = loadIcon("Biconconspace.gif");
***************
*** 1170,1181 ****
      }
      
-     /**
-      * Return icon
-      * @return icon
-      */
-     public ImageIcon icon() {
-       return constructorgroupicon;
-     }
-     
      /** {@inheritDoc} */
      public EntityNode nodeFor(Object entity) {
--- 1170,1173 ----

Index: SpaceTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** SpaceTreeView.java	10 Dec 2007 18:45:06 -0000	1.29
--- SpaceTreeView.java	24 Jan 2008 10:35:39 -0000	1.30
***************
*** 33,41 ****
      root.removeAllChildren();
      root.add(new ProjectNode(p));
-     root.add(new GeometryNode("Geometry", p.world()));
-     root.add(new ConstraintContainer("Constraints", p.getConstraints()));
-     root.add(new MaterialContainer("Materials", p.getMaterials(), true));
-     root.add(new ParameterBlockNode("Globals", p.getGlobals()));
      root.add(new ConstructorContainer("Constructors", p.getConstructors()));
      root.add(new ComponentContainer("Catalog", p.getCatalogObjects()));
      model.nodeStructureChanged(root);
--- 33,38 ----
      root.removeAllChildren();
      root.add(new ProjectNode(p));
      root.add(new ConstructorContainer("Constructors", p.getConstructors()));
+     root.add(new MaterialContainer("Materials", p.getMaterials(), true));
      root.add(new ComponentContainer("Catalog", p.getCatalogObjects()));
      model.nodeStructureChanged(root);
***************
*** 48,66 ****
     */
    public void update() {
-     long t0 = System.currentTimeMillis();
      try {
        Project p = Project.getInstance();
        ((GenericNode)root.getChildAt(0)).update(p);
!       ((GenericNode)root.getChildAt(1)).update(p.world());
!       ((GenericNode)root.getChildAt(2)).update(p.getConstraints());
!       ((GenericNode)root.getChildAt(3)).update(p.getMaterials());
!       ((GenericNode)root.getChildAt(4)).update(p.getGlobals());
!       ((GenericNode)root.getChildAt(5)).update(p.getConstructors());
!       ((GenericNode)root.getChildAt(6)).update(p.getCatalogObjects());
      } catch (ArrayIndexOutOfBoundsException e) {
        log.error("There were a inconsistent number of nodes attached to " +
            "the root which resulted in a exception: " + e.getMessage());
      }
-     long t1 = System.currentTimeMillis();
    }
  }
--- 45,58 ----
     */
    public void update() {
      try {
        Project p = Project.getInstance();
        ((GenericNode)root.getChildAt(0)).update(p);
!       ((GenericNode)root.getChildAt(1)).update(p.getConstructors());
!       ((GenericNode)root.getChildAt(2)).update(p.getMaterials());
!       ((GenericNode)root.getChildAt(3)).update(p.getCatalogObjects());
      } catch (ArrayIndexOutOfBoundsException e) {
        log.error("There were a inconsistent number of nodes attached to " +
            "the root which resulted in a exception: " + e.getMessage());
      }
    }
  }