bprocessor-commit

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21633/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	FileSaveActionListener.java FileNewActionListener.java 
	FileExitActionListener.java FileLoadActionListener.java 
	FileCloseActionListener.java FileSaveAsActionListener.java 
Added Files:
	MyFileFilter.java 
Log Message:
Added a filefilter, and made some minor tweaks.

Index: FileLoadActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileLoadActionListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileLoadActionListener.java	30 Jan 2006 10:07:42 -0000	1.3
--- FileLoadActionListener.java	8 Feb 2006 10:13:20 -0000	1.4
***************
*** 38,42 ****
     */
    public void actionPerformed(ActionEvent e) {
!     
      if (Project.getInstance().isDirty()) {
        int n = JOptionPane.showConfirmDialog(
--- 38,42 ----
     */
    public void actionPerformed(ActionEvent e) {
! 
      if (Project.getInstance().isDirty()) {
        int n = JOptionPane.showConfirmDialog(
***************
*** 47,50 ****
--- 47,52 ----
        if (n == 0) {        
          JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath());
+         chooser.addChoosableFileFilter(new MyFileFilter());
+ 
          int state = chooser.showSaveDialog(null);
          File file = chooser.getSelectedFile();
***************
*** 57,60 ****
--- 59,63 ----
  
              JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath());
+             loadChooser.addChoosableFileFilter(new MyFileFilter());
              int lstate = loadChooser.showOpenDialog(null);
              File lfile = loadChooser.getSelectedFile();
***************
*** 80,83 ****
--- 83,87 ----
        if (n == 1) {
          JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath());
+         loadChooser.addChoosableFileFilter(new MyFileFilter());
          int lstate = loadChooser.showOpenDialog(null);
          File lfile = loadChooser.getSelectedFile();
***************
*** 101,104 ****
--- 105,109 ----
        
        JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath());
+       loadChooser.addChoosableFileFilter(new MyFileFilter());
        int lstate = loadChooser.showOpenDialog(null);
        File lfile = loadChooser.getSelectedFile();

Index: FileExitActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileExitActionListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileExitActionListener.java	5 Dec 2005 21:00:24 -0000	1.3
--- FileExitActionListener.java	8 Feb 2006 10:13:20 -0000	1.4
***************
*** 9,12 ****
--- 9,19 ----
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
+ import java.io.File;
+ 
+ import javax.swing.JFileChooser;
+ import javax.swing.JOptionPane;
+ 
+ import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.xml.PersistenceManager;
  
  import org.apache.log4j.Logger;
***************
*** 30,34 ****
     */
    public void actionPerformed(ActionEvent e) {
!     System.exit(0);
    }
  }
--- 37,80 ----
     */
    public void actionPerformed(ActionEvent e) {
!     if (Project.getInstance().isDirty()) {
!       int n = JOptionPane.showConfirmDialog(
!           null,
!           "Do you want to save the changes?",
!           "Projekt has been changed",
!           JOptionPane.YES_NO_CANCEL_OPTION);
!       if (n == 0) {   
!         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 {
!               PersistenceManager.save(file);
!               Project.getInstance().setDefaultPath(file.getAbsolutePath());
!               System.exit(0);
!             } catch (Exception ex) {
!               log.error("Could not export to file: " + file, ex);
!             }
!           }
!         } 
!       } 
!       
!       if (n == 1) {
!         System.exit(0);
!       } else {
!         try {
!           PersistenceManager.save(new File(Project.getInstance().getSavePath()));
!           System.exit(0);
!         } catch (Exception ex) {
!           log.error("Could not export to file: " + 
!               new File(Project.getInstance().getSavePath()), ex);
!         }
!       }
! 
!     } else {
!       System.exit(0);
!     }
    }
  }

Index: FileCloseActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileCloseActionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileCloseActionListener.java	30 Jan 2006 10:07:42 -0000	1.2
--- FileCloseActionListener.java	8 Feb 2006 10:13:20 -0000	1.3
***************
*** 42,46 ****
     */
    public void actionPerformed(ActionEvent event) {
!     Project.getInstance().setSavePath(null);
      if (Project.getInstance().isDirty()) {
        int n = JOptionPane.showConfirmDialog(
--- 42,46 ----
     */
    public void actionPerformed(ActionEvent event) {
! 
      if (Project.getInstance().isDirty()) {
        int n = JOptionPane.showConfirmDialog(
***************
*** 49,69 ****
            "Projekt has been changed",
            JOptionPane.YES_NO_CANCEL_OPTION);
!       if (n == 0) {        
!         JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath());
!         int state = chooser.showSaveDialog(null);
!         File file = chooser.getSelectedFile();
!         if (file != null &&
!             state == JFileChooser.APPROVE_OPTION) {
            try {
!             Project.getInstance().setDefaultPath(file.getAbsolutePath());
!             PersistenceManager.save(file);
              Selection.primary().clear();
              Project.getInstance().clear();
              Project.getInstance().makeClean();
            } catch (Exception ex) {
!             log.error("Could not export to file: " + file, ex);
            }
          }
!       } 
        
        if (n == 1) {
--- 49,84 ----
            "Projekt has been changed",
            JOptionPane.YES_NO_CANCEL_OPTION);
!       if (n == 0) {  
!         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 {
!               Project.getInstance().setDefaultPath(file.getAbsolutePath());
!               PersistenceManager.save(file);
!               Selection.primary().clear();
!               Project.getInstance().clear();
!               Project.getInstance().makeClean();
!               Project.getInstance().setSavePath(null);
!             } catch (Exception ex) {
!               log.error("Could not export to file: " + file, ex);
!             }
!           }
!         } else {
            try {
!             PersistenceManager.save(new File(Project.getInstance().getSavePath()));
              Selection.primary().clear();
              Project.getInstance().clear();
              Project.getInstance().makeClean();
+             Project.getInstance().setSavePath(null);
            } catch (Exception ex) {
!             log.error("Could not export to file: " + 
!                 new File(Project.getInstance().getSavePath()), ex);
            }
          }
!       }
        
        if (n == 1) {
***************
*** 71,74 ****
--- 86,90 ----
          Project.getInstance().clear();
          Project.getInstance().makeClean();
+         Project.getInstance().setSavePath(null);
        }
  
***************
*** 77,80 ****
--- 93,97 ----
        Project.getInstance().clear();
        Project.getInstance().makeClean();
+       Project.getInstance().setSavePath(null);
      }
    }

Index: FileNewActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileNewActionListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileNewActionListener.java	30 Jan 2006 10:07:42 -0000	1.4
--- FileNewActionListener.java	8 Feb 2006 10:13:20 -0000	1.5
***************
*** 42,46 ****
     */
    public void actionPerformed(ActionEvent event) {
!     Project.getInstance().setSavePath(null);
      if (Project.getInstance().isDirty()) {
        int n = JOptionPane.showConfirmDialog(
--- 42,46 ----
     */
    public void actionPerformed(ActionEvent event) {
! 
      if (Project.getInstance().isDirty()) {
        int n = JOptionPane.showConfirmDialog(
***************
*** 49,74 ****
            "Projekt has been changed",
            JOptionPane.YES_NO_CANCEL_OPTION);
!       if (n == 0) {        
!         JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath());
!         int state = chooser.showSaveDialog(null);
!         File file = chooser.getSelectedFile();
!         if (file != null &&
!             state == JFileChooser.APPROVE_OPTION) {
            try {
!             PersistenceManager.save(file);
!             Project.getInstance().setDefaultPath(file.getAbsolutePath());
              Selection.primary().clear();
              Project.getInstance().clear();
              Project.getInstance().makeClean();
            } catch (Exception ex) {
!             log.error("Could not export to file: " + file, ex);
            }
          }
!       } 
!       
        if (n == 1) {
          Selection.primary().clear();
          Project.getInstance().clear();
          Project.getInstance().makeClean();
        }
  
--- 49,89 ----
            "Projekt has been changed",
            JOptionPane.YES_NO_CANCEL_OPTION);
!       if (n == 0) {   
!         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 {
!               PersistenceManager.save(file);
!               Project.getInstance().setDefaultPath(file.getAbsolutePath());
!               Selection.primary().clear();
!               Project.getInstance().clear();
!               Project.getInstance().makeClean();
!               Project.getInstance().setSavePath(null);
!             } catch (Exception ex) {
!               log.error("Could not export to file: " + file, ex);
!             }
!           } 
!         } else {
            try {
!             PersistenceManager.save(new File(Project.getInstance().getSavePath()));
              Selection.primary().clear();
              Project.getInstance().clear();
              Project.getInstance().makeClean();
+             Project.getInstance().setSavePath(null);
            } catch (Exception ex) {
!             log.error("Could not export to file: " + 
!                 new File(Project.getInstance().getSavePath()), ex);
            }
          }
!       }
        if (n == 1) {
          Selection.primary().clear();
          Project.getInstance().clear();
          Project.getInstance().makeClean();
+         Project.getInstance().setSavePath(null);
        }
  
***************
*** 77,80 ****
--- 92,96 ----
        Project.getInstance().clear();
        Project.getInstance().makeClean();
+       Project.getInstance().setSavePath(null);
      }
    }

--- NEW FILE: MyFileFilter.java ---
//---------------------------------------------------------------------------------
// $Id: MyFileFilter.java,v 1.1 2006/02/08 10:13:20 nbramsen 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;

/**
 * My filefilter
 */
public class MyFileFilter extends FileFilter {
  
  /**
   * @param f the file the filter is checking
   * @return false, if not a .bp file or a directory.
   */
  public boolean accept(File f) {
    
    if (f.isDirectory()) {
      return true;
    }
    
    String ext = null;
    String s = f.getName();
    int i = s.lastIndexOf('.');
    
    if (i > 0 &&  i < s.length() - 1) {
      ext = s.substring(i + 1).toLowerCase();
    }

    if (ext != null) {
      if (ext.equals("bp")) {
        return true;
      }
    }
    return false;
  }
  
  /**
   * @return the description of the filter
   */
  public String getDescription() {
    return "Bp files";
  }
}



Index: FileSaveAsActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileSaveAsActionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileSaveAsActionListener.java	30 Jan 2006 10:07:42 -0000	1.1
--- FileSaveAsActionListener.java	8 Feb 2006 10:13:20 -0000	1.2
***************
*** 37,40 ****
--- 37,41 ----
    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();

Index: FileSaveActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileSaveActionListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileSaveActionListener.java	30 Jan 2006 10:07:42 -0000	1.3
--- FileSaveActionListener.java	8 Feb 2006 10:13:20 -0000	1.4
***************
*** 39,42 ****
--- 39,43 ----
      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();