[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions FileSaveAsActionListener.java,NON
Status: Pre-Alpha
Brought to you by:
henryml
From: Nikolaj B. <nbr...@us...> - 2006-01-30 10:07:58
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19053/src/net/sourceforge/bprocessor/gui/actions Modified Files: FileSaveActionListener.java FileNewActionListener.java FileLoadActionListener.java FileCloseActionListener.java Added Files: FileSaveAsActionListener.java Log Message: File options now remeber last used path, and a few minor updates Index: FileSaveActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileSaveActionListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSaveActionListener.java 25 Jan 2006 11:01:14 -0000 1.2 --- FileSaveActionListener.java 30 Jan 2006 10:07:42 -0000 1.3 *************** *** 36,52 **** */ 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 { ! PersistenceManager.save(file); Project.getInstance().makeClean(); } catch (Exception ex) { ! log.error("Could not export to file: " + file, ex); } } } } --- 36,66 ---- */ public void actionPerformed(ActionEvent e) { ! ! if (Project.getInstance().getSavePath() == null) { ! 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().setSavePath(file.getAbsolutePath()); ! Project.getInstance().setDefaultPath(file.getAbsolutePath()); ! Project.getInstance().makeClean(); ! } catch (Exception ex) { ! log.error("Could not export to file: " + file, ex); ! } ! } ! } else { try { ! PersistenceManager.save(new File(Project.getInstance().getSavePath())); Project.getInstance().makeClean(); } catch (Exception ex) { ! log.error("Could not export to file: " + ! new File(Project.getInstance().getSavePath()), ex); } } } } + Index: FileLoadActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileLoadActionListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileLoadActionListener.java 25 Jan 2006 11:01:14 -0000 1.2 --- FileLoadActionListener.java 30 Jan 2006 10:07:42 -0000 1.3 *************** *** 46,64 **** JOptionPane.YES_NO_CANCEL_OPTION); if (n == 0) { ! JFileChooser chooser = new JFileChooser(); int state = chooser.showSaveDialog(null); File file = chooser.getSelectedFile(); if (file != null && state == JFileChooser.APPROVE_OPTION) { try { PersistenceManager.save(file); ! JFileChooser loadChooser = new JFileChooser(); int lstate = loadChooser.showOpenDialog(null); File lfile = loadChooser.getSelectedFile(); - if (lfile != null && lstate == JFileChooser.APPROVE_OPTION) { try { Selection.primary().clear(); Project.getInstance().clear(); --- 46,67 ---- 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); ! JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath()); int lstate = loadChooser.showOpenDialog(null); File lfile = loadChooser.getSelectedFile(); if (lfile != null && lstate == JFileChooser.APPROVE_OPTION) { try { + Project.getInstance().setSavePath(lfile.getAbsolutePath()); + Project.getInstance().setDefaultPath(lfile.getAbsolutePath()); Selection.primary().clear(); Project.getInstance().clear(); *************** *** 76,86 **** if (n == 1) { ! JFileChooser loadChooser = new JFileChooser(); int lstate = loadChooser.showOpenDialog(null); File lfile = loadChooser.getSelectedFile(); - if (lfile != null && lstate == JFileChooser.APPROVE_OPTION) { try { Selection.primary().clear(); Project.getInstance().clear(); --- 79,90 ---- if (n == 1) { ! JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath()); int lstate = loadChooser.showOpenDialog(null); File lfile = loadChooser.getSelectedFile(); if (lfile != null && lstate == JFileChooser.APPROVE_OPTION) { try { + Project.getInstance().setSavePath(lfile.getAbsolutePath()); + Project.getInstance().setDefaultPath(lfile.getAbsolutePath()); Selection.primary().clear(); Project.getInstance().clear(); *************** *** 92,105 **** } } } else { ! JFileChooser loadChooser = new JFileChooser(); int lstate = loadChooser.showOpenDialog(null); File lfile = loadChooser.getSelectedFile(); - if (lfile != null && lstate == JFileChooser.APPROVE_OPTION) { try { Selection.primary().clear(); Project.getInstance().clear(); --- 96,111 ---- } } + } else { ! JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath()); int lstate = loadChooser.showOpenDialog(null); File lfile = loadChooser.getSelectedFile(); if (lfile != null && lstate == JFileChooser.APPROVE_OPTION) { try { + Project.getInstance().setSavePath(lfile.getAbsolutePath()); + Project.getInstance().setDefaultPath(lfile.getAbsolutePath()); Selection.primary().clear(); Project.getInstance().clear(); --- NEW FILE: FileSaveAsActionListener.java --- //--------------------------------------------------------------------------------- // $Id: FileSaveAsActionListener.java,v 1.1 2006/01/30 10:07:42 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 net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.xml.PersistenceManager; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; import javax.swing.JFileChooser; import org.apache.log4j.Logger; /** * The file->save as action listener */ public class FileSaveAsActionListener implements ActionListener { /** The logger */ private static Logger log = Logger.getLogger(FileSaveAsActionListener.class); /** * FileSavAseActionListener */ public FileSaveAsActionListener() { } /** * Action performed * @param e The action event */ public void actionPerformed(ActionEvent e) { 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()); Project.getInstance().setSavePath(file.getAbsolutePath()); PersistenceManager.save(file); Project.getInstance().makeClean(); } catch (Exception ex) { log.error("Could not export to file: " + file, ex); } } } } Index: FileNewActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileNewActionListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileNewActionListener.java 25 Jan 2006 11:01:14 -0000 1.3 --- FileNewActionListener.java 30 Jan 2006 10:07:42 -0000 1.4 *************** *** 42,45 **** --- 42,46 ---- */ public void actionPerformed(ActionEvent event) { + Project.getInstance().setSavePath(null); if (Project.getInstance().isDirty()) { int n = JOptionPane.showConfirmDialog( *************** *** 49,53 **** JOptionPane.YES_NO_CANCEL_OPTION); if (n == 0) { ! JFileChooser chooser = new JFileChooser(); int state = chooser.showSaveDialog(null); File file = chooser.getSelectedFile(); --- 50,54 ---- JOptionPane.YES_NO_CANCEL_OPTION); if (n == 0) { ! JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath()); int state = chooser.showSaveDialog(null); File file = chooser.getSelectedFile(); *************** *** 56,59 **** --- 57,61 ---- try { PersistenceManager.save(file); + Project.getInstance().setDefaultPath(file.getAbsolutePath()); Selection.primary().clear(); Project.getInstance().clear(); Index: FileCloseActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileCloseActionListener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileCloseActionListener.java 25 Jan 2006 11:01:14 -0000 1.1 --- FileCloseActionListener.java 30 Jan 2006 10:07:42 -0000 1.2 *************** *** 42,46 **** */ public void actionPerformed(ActionEvent event) { ! if (Project.getInstance().isDirty()) { int n = JOptionPane.showConfirmDialog( --- 42,46 ---- */ public void actionPerformed(ActionEvent event) { ! Project.getInstance().setSavePath(null); if (Project.getInstance().isDirty()) { int n = JOptionPane.showConfirmDialog( *************** *** 50,54 **** JOptionPane.YES_NO_CANCEL_OPTION); if (n == 0) { ! JFileChooser chooser = new JFileChooser(); int state = chooser.showSaveDialog(null); File file = chooser.getSelectedFile(); --- 50,54 ---- JOptionPane.YES_NO_CANCEL_OPTION); if (n == 0) { ! JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath()); int state = chooser.showSaveDialog(null); File file = chooser.getSelectedFile(); *************** *** 56,59 **** --- 56,60 ---- state == JFileChooser.APPROVE_OPTION) { try { + Project.getInstance().setDefaultPath(file.getAbsolutePath()); PersistenceManager.save(file); Selection.primary().clear(); |