bprocessor-commit

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

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

Modified Files:
	FileSaveActionListener.java FileNewActionListener.java 
	FileLoadActionListener.java FileCloseActionListener.java 
	FileActionListener.java FileSaveAsActionListener.java 
Added Files:
	BProcessorFileFilter.java 
Removed Files:
	MyFileFilter.java 
Log Message:
Refactoring

Index: FileLoadActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileLoadActionListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FileLoadActionListener.java	21 Nov 2006 17:29:34 -0000	1.7
--- FileLoadActionListener.java	12 Nov 2009 15:27:24 -0000	1.8
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.bprocessor.gui.actions;
  
+ import net.sourceforge.bprocessor.gui.GUI;
  import net.sourceforge.bprocessor.model.Project;
  
***************
*** 12,25 ****
  import java.io.File;
  
- import javax.swing.JFileChooser;
- 
- import org.apache.log4j.Logger;
- 
  /**
   * The file->load action listener
   */
  public class FileLoadActionListener extends FileActionListener {
-   /** The logger */
-   private static Logger log = Logger.getLogger(FileLoadActionListener.class);
    
    /**
--- 13,20 ----
***************
*** 34,47 ****
     */
    public void additionalAction(ActionEvent e) {
!     JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath());
!     loadChooser.addChoosableFileFilter(new MyFileFilter());
!     int lstate = loadChooser.showOpenDialog(null);
!     File lfile = loadChooser.getSelectedFile();
!     if (lfile != null &&
!         lstate == JFileChooser.APPROVE_OPTION) {
        try {
!         Project.getInstance().load(lfile);
!       } catch (Exception ex) {
!         log.error("Could not open file: " + lfile, ex);
        }
      }
--- 29,37 ----
     */
    public void additionalAction(ActionEvent e) {
!     File file = GUI.chooseFile("Open");
!     if (file != null) {
        try {
!         Project.getInstance().load(file);
!       } catch (Exception exception) {
        }
      }

Index: FileCloseActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileCloseActionListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FileCloseActionListener.java	21 Nov 2006 17:29:34 -0000	1.7
--- FileCloseActionListener.java	12 Nov 2009 15:27:24 -0000	1.8
***************
*** 10,19 ****
  import java.awt.event.ActionEvent;
  
- import net.sourceforge.bprocessor.model.Project;
- 
  /**
   * The FileCloseActionListener
   */
- 
  public class FileCloseActionListener extends FileActionListener {
    /**
--- 10,16 ----
***************
*** 29,33 ****
     */
    public void additionalAction(ActionEvent e) {
-     Project.getInstance().close();
    }
  }
--- 26,29 ----

Index: FileNewActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileNewActionListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FileNewActionListener.java	2 Jan 2007 18:30:51 -0000	1.10
--- FileNewActionListener.java	12 Nov 2009 15:27:24 -0000	1.11
***************
*** 9,15 ****
  
  import java.awt.event.ActionEvent;
- 
- import net.sourceforge.bprocessor.model.Project;
- 
  /**
   * The FileNewActionListener
--- 9,12 ----
***************
*** 30,36 ****
     */
    public void additionalAction(ActionEvent e) {
-     Project.getInstance().close();
-     Project.getInstance().changed(Project.getInstance());
-     Project.getInstance().makeClean();
    }
  }
--- 27,30 ----

--- MyFileFilter.java DELETED ---

Index: FileSaveAsActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileSaveAsActionListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileSaveAsActionListener.java	21 Nov 2006 17:29:34 -0000	1.5
--- FileSaveAsActionListener.java	12 Nov 2009 15:27:24 -0000	1.6
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.bprocessor.gui.actions;
  
+ import net.sourceforge.bprocessor.gui.GUI;
  import net.sourceforge.bprocessor.model.Project;
  
***************
*** 35,46 ****
     */
    public void actionPerformed(ActionEvent e) {
!     JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath());
!     chooser.addChoosableFileFilter(new MyFileFilter());
!     int state = chooser.showSaveDialog(null);
!     File file = chooser.getSelectedFile();
!     if (file != null &&
!         state == JFileChooser.APPROVE_OPTION) {
        try {
-         
          if (file.getName().lastIndexOf('.') != -1) {
            Project.getInstance().saveAs(file); 
--- 36,42 ----
     */
    public void actionPerformed(ActionEvent e) {
!     File file = GUI.chooseFile("Save");
!     if (file != null) {
        try {
          if (file.getName().lastIndexOf('.') != -1) {
            Project.getInstance().saveAs(file); 
***************
*** 48,53 ****
            Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp"));
          }
!       } catch (Exception ex) {
!         log.error("Could not save to file: " + file, ex);
        }
      }
--- 44,48 ----
            Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp"));
          }
!       } catch (Exception exception) {
        }
      }

Index: FileSaveActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileSaveActionListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FileSaveActionListener.java	21 Mar 2006 12:24:13 -0000	1.6
--- FileSaveActionListener.java	12 Nov 2009 15:27:24 -0000	1.7
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.bprocessor.gui.actions;
  
+ import net.sourceforge.bprocessor.gui.GUI;
  import net.sourceforge.bprocessor.model.Project;
  
***************
*** 37,47 ****
      
      if (Project.getInstance().getSavePath() == null) {     
-       JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath());
-       chooser.addChoosableFileFilter(new MyFileFilter());
-       int state = chooser.showSaveDialog(null);
-       File file = chooser.getSelectedFile();
        
!       if (file != null &&
!           state == JFileChooser.APPROVE_OPTION) {
          try {
            if (file.getName().lastIndexOf('.') != -1) {
--- 38,45 ----
      
      if (Project.getInstance().getSavePath() == null) {     
        
!       File file = GUI.chooseFile("Save");
!       
!       if (file != null) {
          try {
            if (file.getName().lastIndexOf('.') != -1) {
***************
*** 50,55 ****
              Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp"));
            }
!         } catch (Exception ex) {
!           log.error("Could not save to file: " + file, ex);
          }
        }
--- 48,53 ----
              Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp"));
            }
!         } catch (Exception exception) {
!           
          }
        }

--- NEW FILE: BProcessorFileFilter.java ---
//---------------------------------------------------------------------------------
// $Id: BProcessorFileFilter.java,v 1.1 2009/11/12 15:27:24 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------
package net.sourceforge.bprocessor.gui.actions;


import java.io.File;

import javax.swing.filechooser.FileFilter;

/**
 * 
 */
public class BProcessorFileFilter extends FileFilter {
  
  /**
   * @param file the file the filter is checking
   * @return false, if not a ".bp" file or a directory.
   */
  public boolean accept(File file) {
    if (file.isDirectory()) {
      return true;
    }
    
    String name = file.getName();
    return name.endsWith(".bp");
  }
  
  /**
   * @return the description of the filter
   */
  public String getDescription() {
    return "bprocessor files";
  }
}



Index: FileActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileActionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileActionListener.java	21 Nov 2006 17:29:34 -0000	1.1
--- FileActionListener.java	12 Nov 2009 15:27:24 -0000	1.2
***************
*** 10,21 ****
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
! import java.io.File;
! 
! import javax.swing.JFileChooser;
! import javax.swing.JOptionPane;
! 
! import org.apache.log4j.Logger;
! 
! import net.sourceforge.bprocessor.model.Project;
  
  /**
--- 10,14 ----
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
! import net.sourceforge.bprocessor.gui.GUI;
  
  /**
***************
*** 24,31 ****
  
  public abstract class FileActionListener implements ActionListener {
- 
-   /** The logger */
-   private static Logger log = Logger.getLogger(FileActionListener.class);
-   
    /**
     * Constructs  the FileCloseActionListner
--- 17,20 ----
***************
*** 40,91 ****
     */
    public void actionPerformed(ActionEvent event) {
!     if (Project.getInstance().isDirty()) {
!       int n = JOptionPane.showConfirmDialog(
!           null,
!           "Do you want to save the changes?",
!           "Project has been changed",
!           JOptionPane.YES_NO_CANCEL_OPTION);
!       if (n == 0) {  
!         if (Project.getInstance().getSavePath() == null) {
!           String path = Project.getInstance().getDefaultPath();
!           JFileChooser chooser = new JFileChooser(path);
!           chooser.addChoosableFileFilter(new MyFileFilter());
!           int state = chooser.showSaveDialog(null);
!           File file = chooser.getSelectedFile();
!           if (file != null &&
!               state == JFileChooser.APPROVE_OPTION) {
!             try {
!               
!               if (file.getName().lastIndexOf('.') != -1) {
!                 Project.getInstance().saveAs(file);
!               } else {
!                 Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp"));
!               }
!               Project.getInstance().close();
!             } catch (Exception ex) {
!               log.error("Could not save to file: " + file, ex);
!             }
!           }
!         } else {
!           try {
!             Project.getInstance().save();
!             Project.getInstance().close();
!           } catch (Exception ex) {
!             log.error("Could not save to file: " + 
!                 new File(Project.getInstance().getSavePath()), ex);
!           }
!         }
!       }
!       
!       if (n == 1) {
          additionalAction(event);
        }
!     } else {
!       additionalAction(event);
      }
    }
    
    /**
!    * The action to perform when the file is saved or save is cancled
     * @param e The action event
     */
--- 29,42 ----
     */
    public void actionPerformed(ActionEvent event) {
!     try {
!       if (GUI.userClose()) {
          additionalAction(event);
        }
!     } catch (Exception exception) {
      }
    }
    
    /**
!    * The action to perform when the project is closed 
     * @param e The action event
     */