[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.122, 1.123

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

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

Modified Files:
	GUI.java 
Log Message:


Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** GUI.java	26 Nov 2010 14:20:34 -0000	1.122
--- GUI.java	8 Dec 2010 11:37:32 -0000	1.123
***************
*** 7,40 ****
  package net.sourceforge.bprocessor.gui;
  
- import net.sourceforge.bprocessor.gui.actions.AboutActionListener;
- import net.sourceforge.bprocessor.gui.actions.BProcessorFileFilter;
- import net.sourceforge.bprocessor.gui.actions.EditMenuListener;
- 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;
- import net.sourceforge.bprocessor.gui.treeview.DBKTreeView;
- import net.sourceforge.bprocessor.gui.treeview.LibraryTreeView;
- import net.sourceforge.bprocessor.gui.treeview.SpaceTreeView;
- import net.sourceforge.bprocessor.model.Command;
- import net.sourceforge.bprocessor.model.Geometric;
- 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;
- 
- import java.util.Collection;
- import java.util.Set;
- import java.util.HashSet;
- 
  import java.awt.BorderLayout;
  import java.awt.Color;
--- 7,10 ----
***************
*** 49,55 ****
  import java.awt.event.MouseEvent;
  import java.io.File;
! import java.io.FileNotFoundException;
! import java.io.FileOutputStream;
! import java.io.OutputStream;
  
  import javax.swing.AbstractAction;
--- 19,25 ----
  import java.awt.event.MouseEvent;
  import java.io.File;
! import java.util.Collection;
! import java.util.HashSet;
! import java.util.Set;
  
  import javax.swing.AbstractAction;
***************
*** 60,63 ****
--- 30,34 ----
  import javax.swing.JOptionPane;
  import javax.swing.JPanel;
+ import javax.swing.JPopupMenu;
  import javax.swing.JScrollPane;
  import javax.swing.JSplitPane;
***************
*** 65,75 ****
  import javax.swing.JTextArea;
  import javax.swing.JWindow;
- import javax.swing.ToolTipManager;
- import javax.swing.JPopupMenu;
  import javax.swing.KeyStroke;
  import javax.swing.border.LineBorder;
  import javax.swing.event.MenuEvent;
  import javax.swing.event.MenuListener;
! import javax.swing.Timer;
  
  import org.apache.log4j.Logger;
--- 36,71 ----
  import javax.swing.JTextArea;
  import javax.swing.JWindow;
  import javax.swing.KeyStroke;
+ import javax.swing.Timer;
+ import javax.swing.ToolTipManager;
  import javax.swing.border.LineBorder;
  import javax.swing.event.MenuEvent;
  import javax.swing.event.MenuListener;
! 
! import net.sourceforge.bprocessor.gui.actions.AboutActionListener;
! import net.sourceforge.bprocessor.gui.actions.BProcessorFileFilter;
! import net.sourceforge.bprocessor.gui.actions.EditMenuListener;
! 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;
! import net.sourceforge.bprocessor.gui.treeview.DBKTreeView;
! import net.sourceforge.bprocessor.gui.treeview.LibraryTreeView;
! import net.sourceforge.bprocessor.gui.treeview.SpaceTreeView;
! import net.sourceforge.bprocessor.model.Command;
! import net.sourceforge.bprocessor.model.Geometric;
! import net.sourceforge.bprocessor.model.Item;
! import net.sourceforge.bprocessor.model.Project;
! import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Space;
! import net.sourceforge.bprocessor.model.modellor.Modellor;
  
  import org.apache.log4j.Logger;
***************
*** 653,687 ****
      fileExport.setEnabled(false);
      file.add(fileExport);
-     
-     
-     
-     JMenuItem jlmaExport = new JMenuItem("Export JLMA");
-     jlmaExport.addActionListener(new ActionListener() {
-       public void actionPerformed(ActionEvent e) {
-         Project.getInstance().exportJLMA(); 
-       }
-     });
-     file.add(jlmaExport);
-     JMenuItem ppExport = new JMenuItem("Export PPLM");
-     ppExport.addActionListener(new ActionListener() {
-       public void actionPerformed(ActionEvent e) {
- 
-         JFileChooser chooser = new JFileChooser();
-         int state = chooser.showSaveDialog(null);
-         File file = chooser.getSelectedFile();
- 
-         if (file != null &&
-             state == JFileChooser.APPROVE_OPTION) {
-           try {
-             OutputStream out = new FileOutputStream(file);
-             Project.getInstance().exportPPLM(out);
-           } catch (FileNotFoundException e1) {
-             System.out.println("unable to write to " + file);
-           }
-         }
- 
-       }
-     });
-     file.add(ppExport);
  
      {
--- 649,652 ----