Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21502/src/net/sourceforge/bprocessor/gui/treeview
Modified Files:
GenericTreeView.java SpaceTreeView.java
Log Message:
Made some small adjustments to the treeview. Also changed the gfx on the space nodes, so there is now a visual differencet between construction and functional space icons.
Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** GenericTreeView.java 5 Oct 2006 11:26:56 -0000 1.54
--- GenericTreeView.java 9 Oct 2006 12:42:29 -0000 1.55
***************
*** 70,75 ****
private static final boolean SHOW_COUNTERS = false;
! /** Space icon */
! protected static ImageIcon spaceicon;
/** Space group icon*/
--- 70,78 ----
private static final boolean SHOW_COUNTERS = false;
! /** Functionalspace icon */
! protected static ImageIcon functionalspaceicon;
!
! /** Constructionspace icon */
! protected static ImageIcon constructionspaceicon;
/** Space group icon*/
***************
*** 104,108 ****
static {
- spaceicon = loadIcon("Biconspace.gif");
spacegroupicon = loadIcon("Biconspacegroup.gif");
surfaceicon = loadIcon("Biconsurface.gif");
--- 107,110 ----
***************
*** 115,118 ****
--- 117,122 ----
constructoricon = loadIcon("Biconconstructor.gif");
constructorgroupicon = loadIcon("Biconconstructorgroup.gif");
+ constructionspaceicon = loadIcon("Biconconspace.gif");
+ functionalspaceicon = loadIcon("Biconspace.gif");
}
***************
*** 502,505 ****
--- 506,512 ----
private static final long serialVersionUID = 1L;
+ /** The current space*/
+ private Space current;
+
/**
* Constructor for SpaceNode
***************
*** 508,511 ****
--- 515,519 ----
public SpaceNode(Space space) {
super(space);
+ current = space;
Set surfaces = space.getEnvelope();
add(new SurfaceContainer("Surfaces", surfaces));
***************
*** 565,569 ****
*/
public ImageIcon icon() {
! return spaceicon;
}
--- 573,582 ----
*/
public ImageIcon icon() {
! if (current.isConstructionSpace()) {
! return constructionspaceicon;
! } else {
! return functionalspaceicon;
! }
!
}
***************
*** 585,589 ****
*/
private static final long serialVersionUID = 1L;
!
/**
* Constructor for SurfaceNode
--- 598,602 ----
*/
private static final long serialVersionUID = 1L;
!
/**
* Constructor for SurfaceNode
***************
*** 985,988 ****
--- 998,1002 ----
super(p);
update(p);
+ add(new GeometryContainer("Geometry", Project.getInstance().world()));
}
Index: SpaceTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** SpaceTreeView.java 3 Oct 2006 10:04:08 -0000 1.16
--- SpaceTreeView.java 9 Oct 2006 12:42:29 -0000 1.17
***************
*** 50,54 ****
root.add(new ConstraintContainer("Constraints", Project.getInstance().getConstraints()));
root.add(new ParameterBlockNode("Globals", Project.getInstance().getGlobals()));
- root.add(new GeometryContainer("Geometry", Project.getInstance().world()));
root.add(new ConstructorContainer("Constructors", Project.getInstance().getConstructors()));
model.nodeStructureChanged(root);
--- 50,53 ----
|
