[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.132, 1.133

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16266/src/net/sourceforge/bprocessor/gui

Modified Files:
	GUI.java 
Log Message:
Clean up

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** GUI.java	31 May 2013 08:01:03 -0000	1.132
--- GUI.java	31 May 2013 16:07:12 -0000	1.133
***************
*** 49,60 ****
  import net.sourceforge.bprocessor.gui.actions.FileCloseActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileExitActionListener;
- import net.sourceforge.bprocessor.gui.actions.FileExportActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileImportActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileLoadActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileNewActionListener;
- import net.sourceforge.bprocessor.gui.actions.FilePropertiesActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileSaveActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileSaveAsActionListener;
- import net.sourceforge.bprocessor.gui.actions.ToolsEnergyActionListener;
  import net.sourceforge.bprocessor.gui.attrview.AttributeView;
  import net.sourceforge.bprocessor.gui.splash.SplashWindow;
--- 49,57 ----
***************
*** 81,86 ****
    private static final long serialVersionUID = 1L;
  
-   private static final boolean IMPORT = false;
- 
    private boolean isMac;
  
--- 78,81 ----
***************
*** 290,294 ****
      JPopupMenu.setDefaultLightWeightPopupEnabled(false);
  
!     // File menu
      JMenu file = createFileMenu();
      menu.registerMenu(file);
--- 285,289 ----
      JPopupMenu.setDefaultLightWeightPopupEnabled(false);
  
!     // File menu GL Colors
      JMenu file = createFileMenu();
      menu.registerMenu(file);
***************
*** 301,322 ****
      JMenu create = createCreateMenu();
      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");
--- 296,300 ----
      JMenu create = createCreateMenu();
      menu.registerMenu(create);
!     
      // Help menu
      JMenu help = new JMenu("Help");
***************
*** 570,574 ****
      file.add(fileNew);
  
!     JMenuItem fileLoad = new JMenuItem("Open");
      fileLoad.addActionListener(new FileLoadActionListener());
      fileLoad.setMnemonic(KeyEvent.VK_L);
--- 548,552 ----
      file.add(fileNew);
  
!     JMenuItem fileLoad = new JMenuItem("Open...");
      fileLoad.addActionListener(new FileLoadActionListener());
      fileLoad.setMnemonic(KeyEvent.VK_L);
***************
*** 594,598 ****
      file.add(fileSave);
  
!     JMenuItem fileSaveAs = new JMenuItem("Save As");
      fileSaveAs.addActionListener(new FileSaveAsActionListener());
      fileSaveAs.setMnemonic(KeyEvent.VK_A);
--- 572,576 ----
      file.add(fileSave);
  
!     JMenuItem fileSaveAs = new JMenuItem("Save As...");
      fileSaveAs.addActionListener(new FileSaveAsActionListener());
      fileSaveAs.setMnemonic(KeyEvent.VK_A);
***************
*** 601,618 ****
      file.addSeparator();
  
-     {
-       JMenuItem item = new JMenuItem("Import Data...");
-       item.addActionListener(new AbstractAction() {
-         public void actionPerformed(ActionEvent e) {
-           JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath());
-           int state = chooser.showOpenDialog(null);
-           File file = chooser.getSelectedFile();
-         }
-       });
-       file.add(item);
-     }
- 
-     file.addSeparator();
- 
      JMenuItem fileImport = new JMenuItem("Import...");
      fileImport.addActionListener(new FileImportActionListener());
--- 579,582 ----
***************
*** 620,650 ****
      fileImport.setEnabled(true);
      file.add(fileImport);
! 
!     if (IMPORT) {
!       JMenuItem item = new JMenuItem("Import Library...");
!       item.addActionListener(new AbstractAction() {
!         public void actionPerformed(ActionEvent e) {
!           File file = chooseFile("");
!           if (file != null) {
!             try {
!               Project.getInstance().importLibrary(file);
!             } catch (Exception e1) {
!               // TODO Auto-generated catch block
!               e1.printStackTrace();
!             }
!           }
!         }
!       });
!       file.add(item);
!     }
! 
!     JMenuItem fileExport = new JMenuItem("Export");
!     fileExport.addActionListener(new FileExportActionListener());
!     fileExport.setMnemonic(KeyEvent.VK_E);
!     fileExport.setEnabled(false);
!     file.add(fileExport);
! 
      {
!       JMenuItem item = new JMenuItem("Export OBJ");
        item.addActionListener(new ActionListener() {
          public void actionPerformed(ActionEvent e) {
--- 584,592 ----
      fileImport.setEnabled(true);
      file.add(fileImport);
!     
!     file.addSeparator();
!     
      {
!       JMenuItem item = new JMenuItem("Export OBJ...");
        item.addActionListener(new ActionListener() {
          public void actionPerformed(ActionEvent e) {
***************
*** 667,671 ****
      }
      {
!       JMenuItem item = new JMenuItem("Export XML");
        item.addActionListener(new ActionListener() {
          public void actionPerformed(ActionEvent e) {
--- 609,613 ----
      }
      {
!       JMenuItem item = new JMenuItem("Export XML...");
        item.addActionListener(new ActionListener() {
          public void actionPerformed(ActionEvent e) {
***************
*** 687,696 ****
        file.add(item);
      }
-     file.addSeparator();
- 
-     JMenuItem fileProperties = new JMenuItem("Properties");
-     fileProperties.setMnemonic(KeyEvent.VK_P);
-     fileProperties.addActionListener(new FilePropertiesActionListener());
-     file.add(fileProperties);
  
      if (!isMac) {
--- 629,632 ----