Switch from GPLv2 to GPLv2+

[fw/altos] / altosuilib / AltosDataChooser.java

diff --git a/altosuilib/AltosDataChooser.java b/altosuilib/AltosDataChooser.java
index 14d281152d4ac7c2b22c8cd11bb16c0fd6adc14b..8758fc34df213d000f3e770fd7499b5679f15e9a 100644 (file)
--- a/altosuilib/AltosDataChooser.java
+++ b/altosuilib/AltosDataChooser.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
- * 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
@@ -15,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_2;
+package org.altusmetrum.altosuilib_11;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altoslib_11.*;
 
 public class AltosDataChooser extends JFileChooser {
        JFrame  frame;
@@ -67,16 +68,12 @@ public class AltosDataChooser extends JFileChooser {
        public AltosDataChooser(JFrame in_frame) {
                frame = in_frame;
                setDialogTitle("Select Flight Record File");
-               setFileFilter(new FileNameExtensionFilter("TeleMetrum eeprom file",
+               setFileFilter(new FileNameExtensionFilter("On-board Log file",
                                                          "eeprom"));
                setFileFilter(new FileNameExtensionFilter("Telemetry file",
                                                          "telem"));
-               setFileFilter(new FileNameExtensionFilter("TeleMega eeprom file",
-                                                         "mega"));
-               setFileFilter(new FileNameExtensionFilter("EasyMini eeprom file",
-                                                         "mini"));
                setFileFilter(new FileNameExtensionFilter("Flight data file",
-                                                         "telem", "eeprom", "mega", "mini"));
+                                                         "telem", "eeprom"));
                setCurrentDirectory(AltosUIPreferences.logdir());
        }
 }