[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.60, 1.61

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	GUI.java 
Log Message:
added modellor submenu to the menu

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** GUI.java	29 Mar 2007 22:02:37 -0000	1.60
--- GUI.java	10 Apr 2007 21:02:37 -0000	1.61
***************
*** 22,25 ****
--- 22,26 ----
  import net.sourceforge.bprocessor.gui.actions.FileSaveActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileSaveAsActionListener;
+ import net.sourceforge.bprocessor.gui.actions.ModellorMenuAction;
  import net.sourceforge.bprocessor.gui.actions.ToolsEnergyActionListener;
  import net.sourceforge.bprocessor.gui.attrview.AttributeView;
***************
*** 37,40 ****
--- 38,42 ----
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
+ import net.sourceforge.bprocessor.model.modellor.Modellor;

  import java.util.Collection;
***************
*** 63,66 ****
--- 65,70 ----
  import javax.swing.JPopupMenu;
  import javax.swing.KeyStroke;
+ import javax.swing.event.MenuEvent;
+ import javax.swing.event.MenuListener;

  import org.apache.log4j.Logger;
***************
*** 149,153 ****
     * Create menus
     */
!   public void createMenus() {
      Menu menu = Menu.getInstance();
      menu.setMainWindow(this);
--- 153,157 ----
     * Create menus
     */
!   private void createMenus() {
      Menu menu = Menu.getInstance();
      menu.setMainWindow(this);
***************
*** 156,231 ****

      // File menu
!     JMenu file = new JMenu("File");
!     file.setMnemonic(KeyEvent.VK_F);

!     JMenuItem fileNew = new JMenuItem("New");
!     fileNew.addActionListener(new FileNewActionListener());
!     fileNew.setMnemonic(KeyEvent.VK_N);
!     fileNew.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileNew.setEnabled(true);
!     file.add(fileNew);

!     JMenuItem fileLoad = new JMenuItem("Open");
!     fileLoad.addActionListener(new FileLoadActionListener());
!     fileLoad.setMnemonic(KeyEvent.VK_L);
!     fileLoad.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileLoad.setEnabled(true);
!     file.add(fileLoad);
!     
!     file.addSeparator();
!     
!     JMenuItem fileClose = new JMenuItem("Close");
!     fileClose.addActionListener(new FileCloseActionListener());
!     fileClose.setMnemonic(KeyEvent.VK_C);
!     fileClose.setEnabled(true);
!     file.add(fileClose);
!     
!     JMenuItem fileSave = new JMenuItem("Save");
!     fileSave.addActionListener(new FileSaveActionListener());
!     fileSave.setMnemonic(KeyEvent.VK_S);
!     fileSave.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileSave.setEnabled(true);
!     file.add(fileSave);

!     JMenuItem fileSaveAs = new JMenuItem("Save As");
!     fileSaveAs.addActionListener(new FileSaveAsActionListener());
!     fileSaveAs.setMnemonic(KeyEvent.VK_A);
!     fileSaveAs.setEnabled(true);
!     file.add(fileSaveAs);

!     file.addSeparator();

!     JMenuItem fileImport = new JMenuItem("Import");
!     fileImport.addActionListener(new FileImportActionListener());
!     fileImport.setMnemonic(KeyEvent.VK_I);
!     fileImport.setEnabled(true);
!     file.add(fileImport);

!     JMenuItem fileExport = new JMenuItem("Export");
!     fileExport.addActionListener(new FileExportActionListener());
!     fileExport.setMnemonic(KeyEvent.VK_E);
!     fileExport.setEnabled(false);
!     file.add(fileExport);

!     file.addSeparator();

!     JMenuItem fileProperties = new JMenuItem("Properties");
!     fileProperties.setMnemonic(KeyEvent.VK_P);
!     fileProperties.addActionListener(new FilePropertiesActionListener());
!     file.add(fileProperties);

!     file.addSeparator();

!     JMenuItem fileExit = new JMenuItem("Exit");
!     fileExit.addActionListener(new FileExitActionListener());
!     fileExit.setMnemonic(KeyEvent.VK_X);
!     file.add(fileExit);

!     menu.registerMenu(file);

!     // Edit menu REMEMBER TO CHANGE EditMenuListener WHEN CHANGING CONTENT OF edit
      JMenu edit = new JMenu("Edit");
      edit.setMnemonic(KeyEvent.VK_E);
--- 160,292 ----

      // File menu
!     JMenu file = createFileMenu();
!     menu.registerMenu(file);

!     // Edit menu REMEMBER TO CHANGE EditMenuListener WHEN CHANGING CONTENT OF edit
!     JMenu edit = createEditMenu();
!     menu.registerMenu(edit);

!     // Create menu
!     JMenu create = createCreateMenu();

!     /*JMenuItem createElement = new JMenuItem("Element");
!     createElement.setMnemonic(KeyEvent.VK_E);
!     createElement.setEnabled(false);
!     create.add(createElement);
! 
!     JMenuItem createPart = new JMenuItem("Part");
!     createPart.setMnemonic(KeyEvent.VK_P);
!     createPart.setEnabled(false);
!     create.add(createPart);
! 
!     JMenuItem createSurface = new JMenuItem("Surface");
!     createSurface.setMnemonic(KeyEvent.VK_S);
!     createSurface.addActionListener(new CreateSurfaceActionListener());
!     createSurface.setEnabled(false);
!     create.add(createSurface);*/
! 
!     menu.registerMenu(create);
! 
!     // Tools menu
!     JMenu tools = new JMenu("Tools");
!     tools.setMnemonic(KeyEvent.VK_T);

!     JMenuItem toolsEnergy = new JMenuItem("Energy calc");
!     toolsEnergy.setMnemonic(KeyEvent.VK_T);
!     toolsEnergy.addActionListener(new ToolsEnergyActionListener());
!     tools.add(toolsEnergy);
!    
!     menu.registerMenu(tools);

!     // Plugin menu
!     JMenu plugin = new JMenu("Plugin");
!     plugin.setMnemonic(KeyEvent.VK_P);

!     menu.registerMenu(plugin);

!     // Help menu
!     JMenu help = new JMenu("Help");
!     help.setMnemonic(KeyEvent.VK_H);

!     JMenuItem helpHandbook = new JMenuItem("Handbook");
!     helpHandbook.setMnemonic(KeyEvent.VK_H);
!     helpHandbook.setEnabled(false);
!     help.add(helpHandbook);

!     JMenuItem helpWhat = new JMenuItem("What is this?");
!     helpWhat.setMnemonic(KeyEvent.VK_W);
!     helpWhat.setEnabled(false);
!     help.add(helpWhat);

!     help.addSeparator();

!     JMenuItem helpTip = new JMenuItem("Tip of the day");
!     helpTip.setMnemonic(KeyEvent.VK_T);
!     helpTip.setEnabled(false);
!     help.add(helpTip);

!     help.addSeparator();
! 
!     JMenuItem helpAbout = new JMenuItem("About");
!     helpAbout.addActionListener(new AboutActionListener());
!     helpAbout.setMnemonic(KeyEvent.VK_A);
!     help.add(helpAbout);
! 
!     menu.registerMenu(help);
!   }
! 
!   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;
!   }
! 
!   private JMenu createEditMenu() {
      JMenu edit = new JMenu("Edit");
      edit.setMnemonic(KeyEvent.VK_E);
***************
*** 356,449 ****
      edit.add(repaintTree);
      Selection.primary().addObserver(new EditMenuListener(edit));
!     menu.registerMenu(edit);
! 
!     // Create menu
!     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.addActionListener(new CreateNetActionListener());
!     create.add(createNet);
! 
!     /*JMenuItem createElement = new JMenuItem("Element");
!     createElement.setMnemonic(KeyEvent.VK_E);
!     createElement.setEnabled(false);
!     create.add(createElement);
! 
!     JMenuItem createPart = new JMenuItem("Part");
!     createPart.setMnemonic(KeyEvent.VK_P);
!     createPart.setEnabled(false);
!     create.add(createPart);
! 
!     JMenuItem createSurface = new JMenuItem("Surface");
!     createSurface.setMnemonic(KeyEvent.VK_S);
!     createSurface.addActionListener(new CreateSurfaceActionListener());
!     createSurface.setEnabled(false);
!     create.add(createSurface);*/
! 
!     menu.registerMenu(create);
! 
!     // Tools menu
!     JMenu tools = new JMenu("Tools");
!     tools.setMnemonic(KeyEvent.VK_T);

!     JMenuItem toolsEnergy = new JMenuItem("Energy calc");
!     toolsEnergy.setMnemonic(KeyEvent.VK_T);
!     toolsEnergy.addActionListener(new ToolsEnergyActionListener());
!     tools.add(toolsEnergy);
!    
!     menu.registerMenu(tools);
! 
!     // Plugin menu
!     JMenu plugin = new JMenu("Plugin");
!     plugin.setMnemonic(KeyEvent.VK_P);
! 
!     menu.registerMenu(plugin);
! 
!     // Help menu
!     JMenu help = new JMenu("Help");
!     help.setMnemonic(KeyEvent.VK_H);
! 
!     JMenuItem helpHandbook = new JMenuItem("Handbook");
!     helpHandbook.setMnemonic(KeyEvent.VK_H);
!     helpHandbook.setEnabled(false);
!     help.add(helpHandbook);

!     JMenuItem helpWhat = new JMenuItem("What is this?");
!     helpWhat.setMnemonic(KeyEvent.VK_W);
!     helpWhat.setEnabled(false);
!     help.add(helpWhat);

!     help.addSeparator();

!     JMenuItem helpTip = new JMenuItem("Tip of the day");
!     helpTip.setMnemonic(KeyEvent.VK_T);
!     helpTip.setEnabled(false);
!     help.add(helpTip);

!     help.addSeparator();

!     JMenuItem helpAbout = new JMenuItem("About");
!     helpAbout.addActionListener(new AboutActionListener());
!     helpAbout.setMnemonic(KeyEvent.VK_A);
!     help.add(helpAbout);

!     menu.registerMenu(help);
    }

--- 417,493 ----
      edit.add(repaintTree);
      Selection.primary().addObserver(new EditMenuListener(edit));
!     return edit;
!   }

!   private JMenu createFileMenu() {
!     JMenu file = new JMenu("File");
!     file.setMnemonic(KeyEvent.VK_F);

!     JMenuItem fileNew = new JMenuItem("New");
!     fileNew.addActionListener(new FileNewActionListener());
!     fileNew.setMnemonic(KeyEvent.VK_N);
!     fileNew.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileNew.setEnabled(true);
!     file.add(fileNew);

!     JMenuItem fileLoad = new JMenuItem("Open");
!     fileLoad.addActionListener(new FileLoadActionListener());
!     fileLoad.setMnemonic(KeyEvent.VK_L);
!     fileLoad.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileLoad.setEnabled(true);
!     file.add(fileLoad);

!     file.addSeparator();

!     JMenuItem fileClose = new JMenuItem("Close");
!     fileClose.addActionListener(new FileCloseActionListener());
!     fileClose.setMnemonic(KeyEvent.VK_C);
!     fileClose.setEnabled(true);
!     file.add(fileClose);
!     
!     JMenuItem fileSave = new JMenuItem("Save");
!     fileSave.addActionListener(new FileSaveActionListener());
!     fileSave.setMnemonic(KeyEvent.VK_S);
!     fileSave.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileSave.setEnabled(true);
!     file.add(fileSave);
!     
!     JMenuItem fileSaveAs = new JMenuItem("Save As");
!     fileSaveAs.addActionListener(new FileSaveAsActionListener());
!     fileSaveAs.setMnemonic(KeyEvent.VK_A);
!     fileSaveAs.setEnabled(true);
!     file.add(fileSaveAs);
!     
!     file.addSeparator();

!     JMenuItem fileImport = new JMenuItem("Import");
!     fileImport.addActionListener(new FileImportActionListener());
!     fileImport.setMnemonic(KeyEvent.VK_I);
!     fileImport.setEnabled(true);
!     file.add(fileImport);

!     JMenuItem fileExport = new JMenuItem("Export");
!     fileExport.addActionListener(new FileExportActionListener());
!     fileExport.setMnemonic(KeyEvent.VK_E);
!     fileExport.setEnabled(false);
!     file.add(fileExport);

!     file.addSeparator();

!     JMenuItem fileProperties = new JMenuItem("Properties");
!     fileProperties.setMnemonic(KeyEvent.VK_P);
!     fileProperties.addActionListener(new FilePropertiesActionListener());
!     file.add(fileProperties);

!     file.addSeparator();

!     JMenuItem fileExit = new JMenuItem("Exit");
!     fileExit.addActionListener(new FileExitActionListener());
!     fileExit.setMnemonic(KeyEvent.VK_X);
!     file.add(fileExit);
!     return file;
    }