altoslib: Use symbols in AltosRomconfig instead of fixed offsets

[fw/altos] / micropeak / MicroSave.java

diff --git a/micropeak/MicroSave.java b/micropeak/MicroSave.java
index cb4b4221d3b0b0d2e14ff7b121cfc7969e8863b8..1f1ef3cb86df99e779a7fa87ab3ab45548272ad7 100644 (file)
--- a/micropeak/MicroSave.java
+++ b/micropeak/MicroSave.java
@@ -24,14 +24,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_2.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 +82,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 +102,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());

        }
 }
        }
 }