[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.97, 1.98

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

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

Modified Files:
	GUI.java 
Log Message:
Papir

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** GUI.java	20 Feb 2008 13:48:32 -0000	1.97
--- GUI.java	20 Feb 2008 15:20:26 -0000	1.98
***************
*** 8,13 ****
  
  import net.sourceforge.bprocessor.gui.actions.AboutActionListener;
- import net.sourceforge.bprocessor.gui.actions.CreateConstructionSpaceActionListener;
- import net.sourceforge.bprocessor.gui.actions.CreateFunctionalSpaceActionListener;
  import net.sourceforge.bprocessor.gui.actions.EditMenuListener;
  import net.sourceforge.bprocessor.gui.actions.FileCloseActionListener;
--- 8,11 ----
***************
*** 265,272 ****
  
        public void menuSelected(MenuEvent arg0) {
-         if (!(arg0.getSource() instanceof JMenu)) {
-           log.error("MenuListener reacted on wrong object " + arg0.getSource());
-           return;
-         }
          JMenu create = (JMenu)arg0.getSource();
          create.removeAll();
--- 263,266 ----
***************
*** 274,287 ****
          if (lvl < Container.PART_LEVEL) {
            String append = Container.levelToString(lvl + 1);
! 
!           JMenuItem createFunctionalSpace = new JMenuItem("Functional " + append);
!           createFunctionalSpace.setMnemonic(KeyEvent.VK_F);
!           createFunctionalSpace.addActionListener(new CreateFunctionalSpaceActionListener());
!           create.add(createFunctionalSpace);
!           
!           JMenuItem createConstructionSpace = new JMenuItem("Construction " + append);
!           createConstructionSpace.setMnemonic(KeyEvent.VK_O);
!           createConstructionSpace.addActionListener(new CreateConstructionSpaceActionListener());
!           create.add(createConstructionSpace);
          }
          {
--- 268,299 ----
          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 = owner.createFunctionalSpace("");
!                 owner.add(space);
!                 AttributeView.instance().display(space);
!                 Project.getInstance().checkpoint();
!                 Project.getInstance().changed(owner);
!               }
!             };
!             create.add(action);
!           }
!           {
!             AbstractAction action = new AbstractAction("Construction " + append) {
!               public void actionPerformed(ActionEvent e) {
!                 Container owner = Project.getInstance().getActiveSpace();
!                 Container space;
!                 space = owner.createConstructionSpace("");
!                 owner.add(space);
!                 AttributeView.instance().display(space);
!                 Project.getInstance().checkpoint();
!                 Project.getInstance().changed(owner);
!               }
!             };
!             create.add(action);
!           }
          }
          {
***************
*** 292,295 ****
--- 304,308 ----
                active.add(net);
                net.edit();
+               AttributeView.instance().display(net);
                Project.getInstance().checkpoint();
                Project.getInstance().changed(active);
***************
*** 306,309 ****
--- 319,323 ----
                active.add(union);
                union.edit();
+               AttributeView.instance().display(union);
                Project.getInstance().checkpoint();
                Project.getInstance().changed(Project.getInstance());