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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17492/src/net/sourceforge/bprocessor/gui/treeview

Modified Files:
	GenericTreeView.java 
Log Message:
Renamed Space to Item and Container to Space

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** GenericTreeView.java	4 Feb 2009 15:09:44 -0000	1.144
--- GenericTreeView.java	25 Jun 2009 22:17:33 -0000	1.145
***************
*** 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;
--- 38,42 ----
  import org.apache.log4j.Logger;
  
! import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.Camera;
***************
*** 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;
--- 55,59 ----
  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;
***************
*** 633,637 ****
       * @param space Space
       */
!     public SpaceNode(Space space) {
        super(space);
      }
--- 633,637 ----
       * @param space Space
       */
!     public SpaceNode(Item space) {
        super(space);
      }
***************
*** 642,646 ****
       */
      public String toString() {
!       String nid = ((Space)userObject).getDisplayName();
        return nid;
      }
--- 642,646 ----
       */
      public String toString() {
!       String nid = ((Item)userObject).getDisplayName();
        return nid;
      }
***************
*** 651,655 ****
       */
      public ImageIcon icon() {
!       if (((Space)userObject).isConstructionSpace()) {
          return constructionspaceicon;
        } else {
--- 651,655 ----
       */
      public ImageIcon icon() {
!       if (((Item)userObject).isConstructionSpace()) {
          return constructionspaceicon;
        } else {
***************
*** 717,721 ****
       * @param container Container
       */
!     public ContainerNode(Container container) {
        super(container);
        makeContainerContent(container);
--- 717,721 ----
       * @param container Container
       */
!     public ContainerNode(Space container) {
        super(container);
        makeContainerContent(container);
***************
*** 726,732 ****
       * @param space the space
       */
!     protected void makeContainerContent(Container space) {
        add(new EnvelopeContainer("Envelope", space));
!       String lvlstr = Container.levelToString(space.getLevel() + 1);
        add(new ElementContainer(lvlstr + "s", space.getElements()));
        CompositeNode cn = new ConstructorContainer("Constructors", space.getConstructors());
--- 726,732 ----
       * @param space the space
       */
!     protected void makeContainerContent(Space space) {
        add(new EnvelopeContainer("Envelope", space));
!       String lvlstr = Space.levelToString(space.getLevel() + 1);
        add(new ElementContainer(lvlstr + "s", space.getElements()));
        CompositeNode cn = new ConstructorContainer("Constructors", space.getConstructors());
***************
*** 745,750 ****
       */
      public void update(Object o) {
!       if (o instanceof Container) {
!         Container space = (Container)o;
          int inx = 0;
          ((GenericNode)getChildAt(inx++)).update(space.getEnvelope());
--- 745,750 ----
       */
      public void update(Object o) {
!       if (o instanceof Space) {
!         Space space = (Space)o;
          int inx = 0;
          ((GenericNode)getChildAt(inx++)).update(space.getEnvelope());
***************
*** 783,787 ****
       * @param space Space
       */
!     public VoidNode(Space space) {
        super(space);
        add(new SurfaceContainer("Envelope", space.getEnvelope(), false));
--- 783,787 ----
       * @param space Space
       */
!     public VoidNode(Item space) {
        super(space);
        add(new SurfaceContainer("Envelope", space.getEnvelope(), false));
***************
*** 793,798 ****
       */
      public void update(Object o) {
!       if (o instanceof Space) {
!         Space s = (Space)o;
          if (this.getChildCount() == 1) {
            ((GenericNode)getChildAt(0)).update(s.getEnvelope());
--- 793,798 ----
       */
      public void update(Object o) {
!       if (o instanceof Item) {
!         Item s = (Item)o;
          if (this.getChildCount() == 1) {
            ((GenericNode)getChildAt(0)).update(s.getEnvelope());
***************
*** 844,848 ****
     */
    public class EnvelopeNode extends EntityNode {
!     private Container space;
      
      /**
--- 844,848 ----
     */
    public class EnvelopeNode extends EntityNode {
!     private Space space;
      
      /**
***************
*** 851,855 ****
       * @param space Space
       */
!     public EnvelopeNode(Surface surface, Container space) {
        super(surface);
        this.space = space;
--- 851,855 ----
       * @param space Space
       */
!     public EnvelopeNode(Surface surface, Space space) {
        super(surface);
        this.space = space;
***************
*** 861,865 ****
      public String toString() {
        Surface surface = (Surface) userObject;
!       Container other;
        if (surface.getBackDomain() == space) {
          other = surface.getFrontDomain();
--- 861,865 ----
      public String toString() {
        Surface surface = (Surface) userObject;
!       Space other;
        if (surface.getBackDomain() == space) {
          other = surface.getFrontDomain();
***************
*** 1016,1020 ****
     */
    public class EnvelopeContainer extends CompositeNode {
!     private Container space;
      /**
       * Constructor for SurfaceContainer
--- 1016,1020 ----
     */
    public class EnvelopeContainer extends CompositeNode {
!     private Space space;
      /**
       * Constructor for SurfaceContainer
***************
*** 1022,1026 ****
       * @param space Space
       */
!     public EnvelopeContainer(String name, Container space) {
        super(name);
        this.space = space;
--- 1022,1026 ----
       * @param space Space
       */
!     public EnvelopeContainer(String name, Space space) {
        super(name);
        this.space = space;
***************
*** 1058,1066 ****
      /** {@inheritDoc} */
      public EntityNode nodeFor(Object entity) {
!       Space space = (Space) entity;
        if (space.isVoid()) {
          return new VoidNode(space);
!       } else if (space instanceof Container) {
!         return new ContainerNode((Container) space);
        } else if (space instanceof Instance) {
          return new InstanceNode((Instance) space);
--- 1058,1066 ----
      /** {@inheritDoc} */
      public EntityNode nodeFor(Object entity) {
!       Item space = (Item) entity;
        if (space.isVoid()) {
          return new VoidNode(space);
!       } else if (space instanceof Space) {
!         return new ContainerNode((Space) space);
        } else if (space instanceof Instance) {
          return new InstanceNode((Instance) space);
***************
*** 1088,1092 ****
       * @param space The space
       */
!     public GeometryNode(String name, Container space) {
        super(name);
        add(new SurfaceContainer("Surfaces", space.getSurfaces(), true));
--- 1088,1092 ----
       * @param space The space
       */
!     public GeometryNode(String name, Space space) {
        super(name);
        add(new SurfaceContainer("Surfaces", space.getSurfaces(), true));
***************
*** 1099,1103 ****
       */
      public void update(Object o) {
!       Container space = (Container)o;
        updateChild(0, space.getSurfaces());
        updateChild(1, space.getEdges());
--- 1099,1103 ----
       */
      public void update(Object o) {
!       Space space = (Space)o;
        updateChild(0, space.getSurfaces());
        updateChild(1, space.getEdges());
***************
*** 1240,1248 ****
      /** {@inheritDoc} */
      public EntityNode nodeFor(Object entity) {
!       Space space = (Space) entity;
        if (space.isVoid()) {
          return new VoidNode(space);
!       } else if (space instanceof Container) {
!         return new ContainerNode((Container) space);
        } else if (space instanceof Instance) {
          return new InstanceNode((Instance) space);
--- 1240,1248 ----
      /** {@inheritDoc} */
      public EntityNode nodeFor(Object entity) {
!       Item space = (Item) entity;
        if (space.isVoid()) {
          return new VoidNode(space);
!       } else if (space instanceof Space) {
!         return new ContainerNode((Space) space);
        } else if (space instanceof Instance) {
          return new InstanceNode((Instance) space);

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

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