bprocessor-commit

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

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

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

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** GUI.java	25 Jun 2009 20:29:36 -0000	1.110
--- GUI.java	25 Jun 2009 22:17:33 -0000	1.111
***************
*** 29,34 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
- import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
  
--- 29,34 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
  import net.sourceforge.bprocessor.model.Space;
+ import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
  
***************
*** 111,115 ****
    
    /** closed spaces */
!   private Set<Container> closedSpaces = new HashSet<Container>();
  
    /** The browsing tree */
--- 111,115 ----
    
    /** closed spaces */
!   private Set<Space> closedSpaces = new HashSet<Space>();
  
    /** The browsing tree */
***************
*** 263,274 ****
          create.removeAll();
          int lvl = Project.getInstance().getActiveSpace().getLevel();
!         if (lvl < Container.PART_LEVEL) {
!           String append = Container.levelToString(lvl + 1);
            {
              AbstractAction action = new AbstractAction("Functional " + append) {
                public void actionPerformed(ActionEvent e) {
!                 Container owner = Project.getInstance().getActiveSpace();
!                 Container space;
!                 space = Space.createFunctionalSpace("");
                  owner.add(space);
                  AttributeView.instance().display(space);
--- 263,274 ----
          create.removeAll();
          int lvl = Project.getInstance().getActiveSpace().getLevel();
!         if (lvl < Space.PART_LEVEL) {
!           String append = Space.levelToString(lvl + 1);
            {
              AbstractAction action = new AbstractAction("Functional " + append) {
                public void actionPerformed(ActionEvent e) {
!                 Space owner = Project.getInstance().getActiveSpace();
!                 Space space;
!                 space = Item.createFunctionalSpace("");
                  owner.add(space);
                  AttributeView.instance().display(space);
***************
*** 282,288 ****
              AbstractAction action = new AbstractAction("Construction " + append) {
                public void actionPerformed(ActionEvent e) {
!                 Container owner = Project.getInstance().getActiveSpace();
!                 Container space;
!                 space = Space.createConstructionSpace("");
                  owner.add(space);
                  AttributeView.instance().display(space);
--- 282,288 ----
              AbstractAction action = new AbstractAction("Construction " + append) {
                public void actionPerformed(ActionEvent e) {
!                 Space owner = Project.getInstance().getActiveSpace();
!                 Space space;
!                 space = Item.createConstructionSpace("");
                  owner.add(space);
                  AttributeView.instance().display(space);
***************
*** 297,302 ****
            AbstractAction action = new AbstractAction("B-net") {
              public void actionPerformed(ActionEvent e) {
!               Container net = Container.createNet("B-net");
!               Container active = Project.getInstance().getActiveSpace();
                active.add(net);
                net.edit();
--- 297,302 ----
            AbstractAction action = new AbstractAction("B-net") {
              public void actionPerformed(ActionEvent e) {
!               Space net = Space.createNet("B-net");
!               Space active = Project.getInstance().getActiveSpace();
                active.add(net);
                net.edit();
***************
*** 311,316 ****
            AbstractAction action = new AbstractAction("Union") {
              public void actionPerformed(ActionEvent e) {
!               Container union = Space.createUnion("Union");
!               Container active = Project.getInstance().getActiveSpace();
                active.add(union);
                union.edit();
--- 311,316 ----
            AbstractAction action = new AbstractAction("Union") {
              public void actionPerformed(ActionEvent e) {
!               Space union = Item.createUnion("Union");
!               Space active = Project.getInstance().getActiveSpace();
                active.add(union);
                union.edit();
***************
*** 328,332 ****
                public void actionPerformed(ActionEvent e) {
                  System.out.println("actionate " + modellor);
!                 Container space = modellor.createSpace();
                  Project.getInstance().world().add(space);
                  Project.getInstance().changed(Project.getInstance());
--- 328,332 ----
                public void actionPerformed(ActionEvent e) {
                  System.out.println("actionate " + modellor);
!                 Space space = modellor.createSpace();
                  Project.getInstance().world().add(space);
                  Project.getInstance().changed(Project.getInstance());
***************
*** 351,355 ****
              JMenu jm = (JMenu)e.getSource();
              jm.removeAll();
!             Container s = Project.getInstance().getActiveSpace();
              int level = s.getLevel();
              for (Modellor m : Modellor.getRegisteredModellors()) {
--- 351,355 ----
              JMenu jm = (JMenu)e.getSource();
              jm.removeAll();
!             Space s = Project.getInstance().getActiveSpace();
              int level = s.getLevel();
              for (Modellor m : Modellor.getRegisteredModellors()) {
***************
*** 823,827 ****
     * @return wherther or not the space is closed.
     */
!   public boolean isClosed(Container sp) {
      boolean closed = closedSpaces.contains(sp);
      return closed;
--- 823,827 ----
     * @return wherther or not the space is closed.
     */
!   public boolean isClosed(Space sp) {
      boolean closed = closedSpaces.contains(sp);
      return closed;