[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui Toolbar.java, 1.9, 1.10 GUI.java, 1.112, 1.113

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20807/src/net/sourceforge/bprocessor/gui

Modified Files:
	Toolbar.java GUI.java 
Log Message:
Brunata

Index: Toolbar.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/Toolbar.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Toolbar.java	25 Jun 2009 20:29:36 -0000	1.9
--- Toolbar.java	14 Sep 2009 16:22:52 -0000	1.10
***************
*** 8,13 ****
--- 8,18 ----
  
  import java.awt.Dimension;
+ import java.awt.event.MouseEvent;
+ import java.awt.event.MouseListener;
+ import java.util.LinkedList;
+ import java.util.List;
  
  import javax.swing.Action;
+ import javax.swing.JComponent;
  import javax.swing.JToggleButton;
  import javax.swing.JPanel;
***************
*** 25,28 ****
--- 30,35 ----
    /** The toolbar bar */
    private JToolBar toolBar;
+   
+   private List<JComponent> content;
  
    /**
***************
*** 33,36 ****
--- 40,44 ----
      toolBar = new JToolBar();
      add(toolBar);
+     content = new LinkedList();
    }
  
***************
*** 52,61 ****
     */
    public JToggleButton registerAction(Action action) {
!     JToggleButton tb = new JToggleButton(action);
!     toolBar.add(tb);
!     return tb;
    }
    
    /**
     * Register a toolbar action, with a push button.
     * @param action The action
--- 60,107 ----
     */
    public JToggleButton registerAction(Action action) {
!     JToggleButton button = new JToggleButton(action);
! 
!     for (MouseListener current : button.getMouseListeners()) {
!       button.removeMouseListener(current);
!     }
!     button.addMouseListener(new MouseListener() {
!       public void mouseClicked(MouseEvent arg0) {
!       }
!       public void mouseEntered(MouseEvent arg0) {
!       }
!       public void mouseExited(MouseEvent arg0) {
!       }
!       public void mousePressed(MouseEvent event) {
!         JToggleButton button = (JToggleButton) event.getComponent();
!         button.doClick();
!       }
!       public void mouseReleased(MouseEvent arg0) {
!       }
!     });
!     return button;
    }
    
    /**
+    * 
+    * @param component JComponent
+    */
+   public void addButton(JComponent component) {
+     toolBar.add(component);
+     content.add(component);
+   }
+   
+   /**
+    * 
+    */
+   public void clear() {
+     for (JComponent current : content) {
+       toolBar.remove(current);
+     }
+     content.clear();
+   }
+   
+   
+   
+   /**
     * Register a toolbar action, with a push button.
     * @param action The action
***************
*** 66,70 ****
      JButton tb = new JButton(action);
      tb.setToolTipText(tooltip);
-     toolBar.add(tb);
      return tb;
    }
--- 112,115 ----
***************
*** 73,79 ****
     * Add a separator to the toolbar
     * @param size size
     */
!   public void addSeparator(int size) {
!     toolBar.addSeparator(new Dimension(size, 0));
    }
  }
--- 118,126 ----
     * Add a separator to the toolbar
     * @param size size
+    * @return component
     */
!   public JComponent addSeparator(int size) {
!     JToolBar.Separator s = new JToolBar.Separator(new Dimension(size, 0));
!     return s;
    }
  }

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** GUI.java	25 Jun 2009 23:28:46 -0000	1.112
--- GUI.java	14 Sep 2009 16:22:52 -0000	1.113
***************
*** 32,37 ****
--- 32,41 ----
  import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
+ import net.sourceforge.bprocessor.model.sense.DataReader;
+ import net.sourceforge.bprocessor.model.sense.SensorItem;
  
+ import java.text.ParseException;
  import java.util.Collection;
+ import java.util.List;
  import java.util.Set;
  import java.util.HashSet;
***************
*** 51,54 ****
--- 55,59 ----
  import java.io.FileNotFoundException;
  import java.io.FileOutputStream;
+ import java.io.IOException;
  import java.io.OutputStream;
  
***************
*** 515,522 ****
      saveDBK.setEnabled(true);
      file.add(saveDBK);
      
      file.addSeparator();
      
!     JMenuItem fileImport = new JMenuItem("Import");
      fileImport.addActionListener(new FileImportActionListener());
      fileImport.setMnemonic(KeyEvent.VK_I);
--- 520,551 ----
      saveDBK.setEnabled(true);
      file.add(saveDBK);
+     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();
+           DataReader reader = new DataReader();
+           try {
+             List<SensorItem> data = reader.read(file);
+             Project.getInstance().setMeasures(data);
+           } catch (IOException e1) {
+             // TODO Auto-generated catch block
+             e1.printStackTrace();
+           } catch (ParseException e1) {
+             // TODO Auto-generated catch block
+             e1.printStackTrace();
+           }
+         }
+       });
+       file.add(item);
+     }
      
      file.addSeparator();
      
!     JMenuItem fileImport = new JMenuItem("Import...");
      fileImport.addActionListener(new FileImportActionListener());
      fileImport.setMnemonic(KeyEvent.VK_I);
***************
*** 530,533 ****
--- 559,564 ----
      file.add(fileExport);
      
+     
+     
      JMenuItem jlmaExport = new JMenuItem("Export JLMA");
      jlmaExport.addActionListener(new ActionListener() {