gered/Llanfair
Archived
1
0
Fork 0
Code Issues 9 Pull requests Packages Projects Releases 5 Wiki Activity

fix save dialog not working. change default save/open dir

Browse source
This commit is contained in:
Gered 2015-12-01 13:34:54 -05:00
parent f1729b3e88
commit 3c9405e74b
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/org/fenix/llanfair/Actions.java
View file

@ -6,6 +6,7 @@ import org.fenix.llanfair.config.Settings;
import org.fenix.llanfair.dialog.EditRun; import org.fenix.llanfair.dialog.EditRun;
import org.fenix.llanfair.dialog.EditSettings; import org.fenix.llanfair.dialog.EditSettings;
import org.fenix.llanfair.extern.WSplit; import org.fenix.llanfair.extern.WSplit;
import org.fenix.utils.UserSettings;
import org.fenix.utils.about.AboutDialog; import org.fenix.utils.about.AboutDialog;
import org.jnativehook.keyboard.NativeKeyEvent; import org.jnativehook.keyboard.NativeKeyEvent;
@ -27,6 +28,11 @@ import java.util.ResourceBundle;
*/ */
final class Actions { final class Actions {
public enum FILE_CHOOSER_TYPE {
OPEN,
SAVE
}
private static final long GHOST_DELAY = 300L; private static final long GHOST_DELAY = 300L;
private static ResourceBundle BUNDLE = null; private static ResourceBundle BUNDLE = null;
@ -49,7 +55,7 @@ final class Actions {
master = owner; master = owner;
file = null; file = null;
fileChooser = new JFileChooser( "." ); fileChooser = new JFileChooser( UserSettings.getSplitsPath() );
lastUnsplit = 0L; lastUnsplit = 0L;
lastSkip = 0L; lastSkip = 0L;
@ -216,11 +222,16 @@ final class Actions {
* Displays a dialog to let the user select a file. The user is able to * Displays a dialog to let the user select a file. The user is able to
* cancel this action, which results in a {@code null} being returned. * cancel this action, which results in a {@code null} being returned.
* *
* @param dialogType the type of dialog to show (save or open)
*
* @return a file selected by the user or {@code null} if he canceled * @return a file selected by the user or {@code null} if he canceled
*/ */
private File selectFile() { private File selectFile(FILE_CHOOSER_TYPE dialogType) {
int option = fileChooser.showDialog( master, int option = -1;
Language.action_accept.get() ); if (dialogType == FILE_CHOOSER_TYPE.OPEN)
option = fileChooser.showOpenDialog(master);
else if (dialogType == FILE_CHOOSER_TYPE.SAVE)
option = fileChooser.showSaveDialog(master);
if ( option == JFileChooser.APPROVE_OPTION ) { if ( option == JFileChooser.APPROVE_OPTION ) {
return fileChooser.getSelectedFile(); return fileChooser.getSelectedFile();
@ -278,7 +289,7 @@ final class Actions {
return; return;
} }
if ( file == null ) { if ( file == null ) {
if ( ( file = selectFile() ) == null ) { if ( ( file = selectFile(FILE_CHOOSER_TYPE.OPEN) ) == null ) {
return; return;
} }
} }
@ -356,7 +367,7 @@ final class Actions {
*/ */
private void save() { private void save() {
if ( file == null ) { if ( file == null ) {
if ( ( file = selectFile() ) == null ) { if ( ( file = selectFile(FILE_CHOOSER_TYPE.SAVE) ) == null ) {
return; return;
} }
} }
@ -390,7 +401,7 @@ final class Actions {
return; return;
} }
if ( file == null ) { if ( file == null ) {
if ( ( file = selectFile() ) == null ) { if ( ( file = selectFile(FILE_CHOOSER_TYPE.OPEN) ) == null ) {
return; return;
} }
} }