Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5962/src/net/sourceforge/bprocessor/gui/treeview
Modified Files:
GenericTreeView.java SpaceTreeView.java
Log Message:
Hotfix of tree
Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** GenericTreeView.java 13 Oct 2006 16:27:09 -0000 1.58
--- GenericTreeView.java 16 Oct 2006 08:43:32 -0000 1.59
***************
*** 997,1001 ****
public ProjectNode(Project p) {
super(p);
- add(new GeometryContainer("Geometry", p.world()));
}
--- 997,1000 ----
***************
*** 1006,1014 ****
public void update(Object o) {
if (o instanceof Project) {
- Collection c = new LinkedList();
Project proj = (Project)o;
! c.add(proj.world());
! c.addAll(proj.getSpaces());
! super.update(c);
} else {
log.warn("Were a " + o + " not a Project");
--- 1005,1010 ----
public void update(Object o) {
if (o instanceof Project) {
Project proj = (Project)o;
! super.update(proj.getSpaces());
} else {
log.warn("Were a " + o + " not a Project");
***************
*** 1026,1034 ****
while (iter.hasNext()) {
Space s = (Space)iter.next();
! if (s.getLevel() == Space.PROJECT_LEVEL) {
! this.insert(new GeometryContainer("Geometry", s), 0);
! } else {
! this.add(new SpaceNode(s));
! }
ins[i] = this.getChildCount() - 1;
i++;
--- 1022,1026 ----
while (iter.hasNext()) {
Space s = (Space)iter.next();
! this.add(new SpaceNode(s));
ins[i] = this.getChildCount() - 1;
i++;
Index: SpaceTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SpaceTreeView.java 13 Oct 2006 15:49:37 -0000 1.18
--- SpaceTreeView.java 16 Oct 2006 08:43:32 -0000 1.19
***************
*** 8,11 ****
--- 8,12 ----
package net.sourceforge.bprocessor.gui.treeview;
+ import net.sourceforge.bprocessor.gui.treeview.GenericTreeView.GeometryContainer;
import net.sourceforge.bprocessor.model.Project;
***************
*** 27,30 ****
--- 28,32 ----
root.removeAllChildren();
root.add(new ProjectNode(Project.getInstance()));
+ root.add(new GeometryContainer("Geometry", Project.getInstance().world()));
root.add(new ConstraintContainer("Constraints", Project.getInstance().getConstraints()));
root.add(new ParameterBlockNode("Globals", Project.getInstance().getGlobals()));
***************
*** 37,45 ****
*/
public void update() {
! if (root.getChildCount() == 4) {
((GenericNode)root.getChildAt(0)).update(Project.getInstance());
! ((GenericNode)root.getChildAt(1)).update(Project.getInstance().getConstraints());
! ((GenericNode)root.getChildAt(2)).update(Project.getInstance().getGlobals());
! ((GenericNode)root.getChildAt(3)).update(Project.getInstance().getConstructors());
}
}
--- 39,48 ----
*/
public void update() {
! if (root.getChildCount() == 5) {
((GenericNode)root.getChildAt(0)).update(Project.getInstance());
! ((GenericNode)root.getChildAt(1)).update(Project.getInstance().world());
! ((GenericNode)root.getChildAt(2)).update(Project.getInstance().getConstraints());
! ((GenericNode)root.getChildAt(3)).update(Project.getInstance().getGlobals());
! ((GenericNode)root.getChildAt(4)).update(Project.getInstance().getConstructors());
}
}
|
