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

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

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

Modified Files:
	GenericTreeView.java 
Log Message:
Major change wrt Space/Container

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** GenericTreeView.java	12 Dec 2007 14:12:19 -0000	1.133
--- GenericTreeView.java	13 Dec 2007 12:00:55 -0000	1.134
***************
*** 38,41 ****
--- 38,42 ----
  import org.apache.log4j.Logger;
  
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.Camera;
***************
*** 54,58 ****
  import net.sourceforge.bprocessor.model.Relation;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 55,59 ----
  import net.sourceforge.bprocessor.model.Relation;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 634,638 ****
          makeInstanceContent((Instance) space);
        } else if (space.isContainer()) {
!         makeContainerContent(space);
        } else {
          Set surfaces = space.getEnvelope();
--- 635,639 ----
          makeInstanceContent((Instance) space);
        } else if (space.isContainer()) {
!         makeContainerContent((Container) space);
        } else {
          Set surfaces = space.getEnvelope();
***************
*** 645,651 ****
       * @param space the space
       */
!     private void makeContainerContent(Space space) {
        add(new EnvelopeContainer("Envelope", space));
!       String lvlstr = Space.levelToString(space.getLevel() + 1);
        add(new ElementContainer(lvlstr + "s", space.getElements()));
        if (Project.doDisplayGeometry()) {
--- 646,652 ----
       * @param space the space
       */
!     private void makeContainerContent(Container space) {
        add(new EnvelopeContainer("Envelope", space));
!       String lvlstr = Container.levelToString(space.getLevel() + 1);
        add(new ElementContainer(lvlstr + "s", space.getElements()));
        if (Project.doDisplayGeometry()) {
***************
*** 679,684 ****
       */
      public void update(Object o) {
!       if (o instanceof Space) {
!         Space s = (Space)o;
          if (s.isInstance()) {
            Instance instance = (Instance) s;
--- 680,685 ----
       */
      public void update(Object o) {
!       if (o instanceof Container) {
!         Space s = (Container)o;
          if (s.isInstance()) {
            Instance instance = (Instance) s;
***************
*** 693,697 ****
            }
          } else if (s.isContainer()) {
!           Space space = (Space)userObject;
            if (space.isContainer()) {
              int inx = 0;
--- 694,698 ----
            }
          } else if (s.isContainer()) {
!           Container space = (Container)userObject;
            if (space.isContainer()) {
              int inx = 0;
***************
*** 719,723 ****
            } else {
              removeAllChildren();
!             makeContainerContent(s);
              model.nodeStructureChanged(this);
            }
--- 720,724 ----
            } else {
              removeAllChildren();
!             makeContainerContent((Container) s);
              model.nodeStructureChanged(this);
            }
***************
*** 742,752 ****
      public String toString() {
        String nid = ((Space)userObject).getDisplayName();
-       if (TAG) {
-         if (GUI.getInstance().isClosed(((Space)userObject))) { 
-           nid += " (C)";
-         } else {
-           nid += " (O)";
-         }
-       }
        return nid;
      }
--- 743,746 ----
***************
*** 801,805 ****
     */
    public class EnvelopeNode extends EntityNode {
!     private Space space;
      
      /**
--- 795,799 ----
     */
    public class EnvelopeNode extends EntityNode {
!     private Container space;
      
      /**
***************
*** 808,812 ****
       * @param space Space
       */
!     public EnvelopeNode(Surface surface, Space space) {
        super(surface);
        this.space = space;
--- 802,806 ----
       * @param space Space
       */
!     public EnvelopeNode(Surface surface, Container space) {
        super(surface);
        this.space = space;
***************
*** 818,822 ****
      public String toString() {
        Surface surface = (Surface) userObject;
!       Space other;
        if (surface.getBackDomain() == space) {
          other = surface.getFrontDomain();
--- 812,816 ----
      public String toString() {
        Surface surface = (Surface) userObject;
!       Container other;
        if (surface.getBackDomain() == space) {
          other = surface.getFrontDomain();
***************
*** 973,977 ****
     */
    public class EnvelopeContainer extends ContainerNode {
!     private Space space;
      /**
       * Constructor for SurfaceContainer
--- 967,971 ----
     */
    public class EnvelopeContainer extends ContainerNode {
!     private Container space;
      /**
       * Constructor for SurfaceContainer
***************
*** 979,983 ****
       * @param space Space
       */
!     public EnvelopeContainer(String name, Space space) {
        super(name);
        this.space = space;
--- 973,977 ----
       * @param space Space
       */
!     public EnvelopeContainer(String name, Container space) {
        super(name);
        this.space = space;
***************
*** 1015,1019 ****
      /** {@inheritDoc} */
      public EntityNode nodeFor(Object entity) {
!       return new SpaceNode((Space) entity);
      }
      
--- 1009,1013 ----
      /** {@inheritDoc} */
      public EntityNode nodeFor(Object entity) {
!       return new SpaceNode((Container) entity);
      }
      
***************
*** 1036,1040 ****
       * @param space The space
       */
!     public GeometryNode(String name, Space space) {
        super(name);
        add(new SurfaceContainer("Surfaces", space.getSurfaces(), true));
--- 1030,1034 ----
       * @param space The space
       */
!     public GeometryNode(String name, Container space) {
        super(name);
        add(new SurfaceContainer("Surfaces", space.getSurfaces(), true));
***************
*** 1047,1051 ****
       */
      public void update(Object o) {
!       Space space = (Space)o;
        updateChild(0, space.getSurfaces());
        updateChild(1, space.getEdges());
--- 1041,1045 ----
       */
      public void update(Object o) {
!       Container space = (Container)o;
        updateChild(0, space.getSurfaces());
        updateChild(1, space.getEdges());
***************
*** 1246,1253 ****
          public void actionPerformed(ActionEvent e) {
            Project proj = Project.getInstance();
!           Space world = proj.getActiveSpace();
            for (Object o : col) {
              Component lo = (Component)o;
!             Space space = lo.getSpace();
              Instance instance = new Instance(space.getName() + " instance ");
              proj.addCalalogObject(lo);
--- 1240,1247 ----
          public void actionPerformed(ActionEvent e) {
            Project proj = Project.getInstance();
!           Container world = proj.getActiveSpace();
            for (Object o : col) {
              Component lo = (Component)o;
!             Container space = lo.getSpace();
              Instance instance = new Instance(space.getName() + " instance ");
              proj.addCalalogObject(lo);