projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telemini-v3.0: Update to production hardware
[fw/altos]
/
micropeak
/
MicroSave.java
diff --git
a/micropeak/MicroSave.java
b/micropeak/MicroSave.java
index cb4b4221d3b0b0d2e14ff7b121cfc7969e8863b8..5dda5b8c53dafdcdac34a87f6c621cc25362f72d 100644
(file)
--- a/
micropeak/MicroSave.java
+++ b/
micropeak/MicroSave.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,14
+25,20
@@
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.
AltosLib
.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.
altoslib_11
.*;
+import org.altusmetrum.altosuilib
_11
.*;
public class MicroSave extends JFileChooser {
JFrame frame;
MicroData data;
public class MicroSave extends JFileChooser {
JFrame frame;
MicroData data;
+ public static void save(File file, MicroData data) throws FileNotFoundException, IOException {
+ FileOutputStream fos = new FileOutputStream(file);
+ data.save(fos);
+ fos.close();
+ }
+
public boolean runDialog() {
int ret;
public boolean runDialog() {
int ret;
@@
-76,9
+83,8
@@
public class MicroSave extends JFileChooser {
}
}
try {
}
}
try {
- FileOutputStream fos = new FileOutputStream(file);
- data.save(fos);
- fos.close();
+ save(file, data);
+ AltosUIPreferences.set_last_logdir(file.getParentFile());
data.set_name(filename);
return true;
} catch (FileNotFoundException fe) {
data.set_name(filename);
return true;
} catch (FileNotFoundException fe) {
@@
-97,6
+103,7
@@
public class MicroSave extends JFileChooser {
setDialogTitle("Save MicroPeak Data File");
setFileFilter(new FileNameExtensionFilter("MicroPeak data file",
"mpd"));
setDialogTitle("Save MicroPeak Data File");
setFileFilter(new FileNameExtensionFilter("MicroPeak data file",
"mpd"));
- setCurrentDirectory(AltosUIPreferences.logdir());
+ setCurrentDirectory(AltosUIPreferences.last_logdir());
+ setSelectedFile(MicroFile.make());
}
}
}
}