[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview GenericTreeView.java,1.28,1.29 SpaceTreeView.java,1.10,1.11

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

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

Modified Files:
	GenericTreeView.java SpaceTreeView.java 
Log Message:
Added globals to D-View and Project

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** GenericTreeView.java	17 May 2006 12:03:42 -0000	1.28
--- GenericTreeView.java	24 May 2006 13:43:42 -0000	1.29
***************
*** 44,47 ****
--- 44,48 ----
  import net.sourceforge.bprocessor.model.Modellor;
  import net.sourceforge.bprocessor.model.Observer;
+ import net.sourceforge.bprocessor.model.ParameterBlock;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
***************
*** 446,450 ****
        Object object = this.getUserObject();
        if (object != null) {
!         AbstractAction copy = new EntityAction((Entity)object, "Copy") {
              public void actionPerformed(ActionEvent arg0) {
                if (entity != null) {
--- 447,451 ----
        Object object = this.getUserObject();
        if (object != null) {
!         AbstractAction copy = new EntityAction((Entity)object, "Duplicate") {
              public void actionPerformed(ActionEvent arg0) {
                if (entity != null) {
***************
*** 462,466 ****
            };
          pm.add(edit);
!         AbstractAction flip = new EntityAction((Entity)object, "Rotate 90degrees CCW") {
              public void actionPerformed(ActionEvent arg0) {
                Space space = (Space)entity;
--- 463,467 ----
            };
          pm.add(edit);
!         AbstractAction flip = new EntityAction((Entity)object, "Rotate 90 degrees CCW") {
              public void actionPerformed(ActionEvent arg0) {
                Space space = (Space)entity;
***************
*** 834,837 ****
--- 835,867 ----
    
    /**
+    * ParameterBlockNode
+    */
+   public class ParameterBlockNode extends EntityNode {
+     /** */
+     private static final long serialVersionUID = 1L;
+     
+     /** name */
+     private String name;
+     
+     /**
+      * Constructor
+      * @param object ParameterBlock
+      * @param name String
+      */
+     public ParameterBlockNode(String name, ParameterBlock object) {
+       super(object);
+       this.name = name;
+     }
+ 
+     /**
+      * Name
+      * @return String
+      */
+     public String toString() {
+       return name;
+     }
+   }
+   
+   /**
     * ConstraintContainer
     */

Index: SpaceTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SpaceTreeView.java	17 May 2006 12:03:42 -0000	1.10
--- SpaceTreeView.java	24 May 2006 13:43:42 -0000	1.11
***************
*** 40,46 ****
      Object[] paths = findPaths(e);
      root.removeAllChildren();
!     root.add(new SpaceContainer("Functional", Project.getInstance().getConstructionSpaces()));
!     root.add(new SpaceContainer("Construction", Project.getInstance().getFunctionalSpaces()));
      root.add(new ConstraintContainer("Constraints", Project.getInstance().getConstraints()));
      root.add(new GeometryContainer("Geometry", Project.getInstance().world()));
      model.nodeStructureChanged(root);
--- 40,47 ----
      Object[] paths = findPaths(e);
      root.removeAllChildren();
!     root.add(new SpaceContainer("Construction", Project.getInstance().getConstructionSpaces()));
!     root.add(new SpaceContainer("Functional", Project.getInstance().getFunctionalSpaces()));
      root.add(new ConstraintContainer("Constraints", Project.getInstance().getConstraints()));
+     root.add(new ParameterBlockNode("Globals", Project.getInstance().getGlobals()));
      root.add(new GeometryContainer("Geometry", Project.getInstance().world()));
      model.nodeStructureChanged(root);