[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.64, 1.65

[rimestad <rim...@us...>]

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

Modified Files:
	GUI.java 
Log Message:
made create menu dynamic so that only relevant modellors are shown

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** GUI.java	11 Apr 2007 12:20:08 -0000	1.64
--- GUI.java	14 Apr 2007 14:58:09 -0000	1.65
***************
*** 74,77 ****
--- 74,80 ----
   */
  public class GUI extends JFrame {
+   /** */
+   private static final long serialVersionUID = 1L;
+ 
    /** The logger */
    private static Logger log = Logger.getLogger(GUI.class);
***************
*** 102,106 ****
    
    /** closed spaces */
!   private Set closedSpaces = new HashSet();
  
    /** The browsing tree */
--- 105,109 ----
    
    /** closed spaces */
!   private Set<Space> closedSpaces = new HashSet<Space>();
  
    /** The browsing tree */
***************
*** 240,290 ****
    private JMenu createCreateMenu() {
      JMenu create = new JMenu("Create");
!     create.setMnemonic(KeyEvent.VK_C);
  
!     JMenuItem createConstructor = new JMenuItem("Constructor");
!     createConstructor.setMnemonic(KeyEvent.VK_N);
!     createConstructor.addActionListener(new CreateConstructorActionListener());
!     createConstructor.setEnabled(false);
!     create.add(createConstructor);
  
!     JMenuItem createFunctionalSpace = new JMenuItem("Functional Space");
!     createFunctionalSpace.setMnemonic(KeyEvent.VK_F);
!     createFunctionalSpace.addActionListener(new CreateFunctionalSpaceActionListener());
!     create.add(createFunctionalSpace);
  
!     JMenuItem createConstructionSpace = new JMenuItem("Construction Space");
!     createConstructionSpace.setMnemonic(KeyEvent.VK_O);
!     createConstructionSpace.addActionListener(new CreateConstructionSpaceActionListener());
!     create.add(createConstructionSpace);
!     
!     JMenuItem createNet = new JMenuItem("B-net");
!     createNet.setMnemonic(KeyEvent.VK_N);
!     createNet.addActionListener(new CreateNetActionListener());
!     create.add(createNet);
  
!     JMenu modellorSubmenu = new JMenu("Modellors");
!     modellorSubmenu.setMnemonic(KeyEvent.VK_M);
!     modellorSubmenu.addMenuListener(new MenuListener() {
!       public void menuCanceled(MenuEvent e) {
!       }
  
!       public void menuDeselected(MenuEvent e) {
!       }
  
!       public void menuSelected(MenuEvent e) {
!         JMenu jm = (JMenu)e.getSource();
!         jm.removeAll();
!         Space s = Project.getInstance().getActiveSpace();
!         int level = s.getLevel();
!         for (Modellor m : Modellor.getRegisteredModellors()) {
!           JMenuItem mod = new JMenuItem(m.getName());
!           if (level == m.getUseableLevel()) {
!             mod.addActionListener(new ModellorMenuAction(s, m));
!             jm.add(mod);
            }
!         }
        }
      });
!     create.add(modellorSubmenu);
      return create;
    }
--- 243,311 ----
    private JMenu createCreateMenu() {
      JMenu create = new JMenu("Create");
!     create.addMenuListener(new MenuListener() {
!       public void menuCanceled(MenuEvent arg0) {
!       }
  
!       public void menuDeselected(MenuEvent arg0) {
!       }
  
!       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();
!         JMenuItem createConstructor = new JMenuItem("Constructor");
!         createConstructor.setMnemonic(KeyEvent.VK_N);
!         createConstructor.addActionListener(new CreateConstructorActionListener());
!         createConstructor.setEnabled(false);
!         create.add(createConstructor);
!         int lvl = Project.getInstance().getActiveSpace().getLevel();
!         if (lvl < Space.PART_LEVEL) {
!           String append = Space.levelToSting(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);
!         }
!         JMenuItem createNet = new JMenuItem("B-net");
!         createNet.setMnemonic(KeyEvent.VK_N);
!         createNet.addActionListener(new CreateNetActionListener());
!         create.add(createNet);
  
!         JMenu modellorSubmenu = new JMenu("Modellors");
!         modellorSubmenu.setMnemonic(KeyEvent.VK_M);
!         modellorSubmenu.addMenuListener(new MenuListener() {
!           public void menuCanceled(MenuEvent e) {
!           }
  
!           public void menuDeselected(MenuEvent e) {
            }
! 
!           public void menuSelected(MenuEvent e) {
!             JMenu jm = (JMenu)e.getSource();
!             jm.removeAll();
!             Space s = Project.getInstance().getActiveSpace();
!             int level = s.getLevel();
!             for (Modellor m : Modellor.getRegisteredModellors()) {
!               JMenuItem mod = new JMenuItem(m.getName());
!               if (level == m.getUseableLevel()) {
!                 mod.addActionListener(new ModellorMenuAction(s, m));
!                 jm.add(mod);
!               }
!             }
!           }
!         });
!         create.add(modellorSubmenu);
        }
      });
!     create.setMnemonic(KeyEvent.VK_C);
      return create;
    }
***************
*** 335,339 ****
        public void actionPerformed(ActionEvent arg0) {
          Selection s = Selection.primary();
!         Collection copy = Project.getInstance().getCopyBuffer();
          copy.clear();
          //FIXME check if it is legal to copy the selected geometry
--- 356,360 ----
        public void actionPerformed(ActionEvent arg0) {
          Selection s = Selection.primary();
!         Collection<Geometric> copy = Project.getInstance().getCopyBuffer();
          copy.clear();
          //FIXME check if it is legal to copy the selected geometry
***************
*** 354,362 ****
      editPaste.addActionListener(new AbstractAction() {
        public void actionPerformed(ActionEvent arg0) {
!         LinkedList copied = new LinkedList();
!         Collection c = Project.getInstance().getCopyBuffer();
!         Iterator iter = c.iterator();
          while (iter.hasNext()) {
!           Geometric g = (Geometric)iter.next();
            if (g instanceof Space) {
              copied.add(((Space)g).copy());
--- 375,383 ----
      editPaste.addActionListener(new AbstractAction() {
        public void actionPerformed(ActionEvent arg0) {
!         LinkedList<Geometric> copied = new LinkedList<Geometric>();
!         Collection<Geometric> c = Project.getInstance().getCopyBuffer();
!         Iterator<Geometric> iter = c.iterator();
          while (iter.hasNext()) {
!           Geometric g = iter.next();
            if (g instanceof Space) {
              copied.add(((Space)g).copy());
***************
*** 386,390 ****
            }
          }
!         Selection.primary().retainAll(copied);
        }
      });
--- 407,411 ----
            }
          }
!         Selection.primary().set(copied);
        }
      });
***************
*** 622,625 ****
--- 643,647 ----
       * The run
       */
+     @Override
      public void run() {
        while (true) {