Switch from GPLv2 to GPLv2+

[fw/altos] / altosui / Altos.java

diff --git a/altosui/Altos.java b/altosui/Altos.java
index e60b3aaa5d6454524c99f69dfc55e39e06ceec10..c2cf409084e1ec5b44448830d0cfaf9a10369902 100644 (file)
--- a/altosui/Altos.java
+++ b/altosui/Altos.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
@@ -18,94 +19,11 @@
 package altosui;
 
 import java.awt.*;
-import java.util.*;
-import java.text.*;
-import java.nio.charset.Charset;
-
 import libaltosJNI.*;
 
-import org.altusmetrum.AltosLib.*;
-
-public class Altos extends AltosLib {
-
-       static final int tab_elt_pad = 5;
-
-       static Font label_font;
-       static Font value_font;
-       static Font status_font;
-       static Font table_label_font;
-       static Font table_value_font;
-
-       final static int font_size_small = 1;
-       final static int font_size_medium = 2;
-       final static int font_size_large = 3;
-
-       static void set_fonts(int size) {
-               int     brief_size;
-               int     table_size;
-               int     status_size;
-
-               switch (size) {
-               case font_size_small:
-                       brief_size = 16;
-                       status_size = 18;
-                       table_size = 11;
-                       break;
-               default:
-               case font_size_medium:
-                       brief_size = 22;
-                       status_size = 24;
-                       table_size = 14;
-                       break;
-               case font_size_large:
-                       brief_size = 26;
-                       status_size = 30;
-                       table_size = 17;
-                       break;
-               }
-               label_font = new Font("Dialog", Font.PLAIN, brief_size);
-               value_font = new Font("Monospaced", Font.PLAIN, brief_size);
-               status_font = new Font("SansSerif", Font.BOLD, status_size);
-               table_label_font = new Font("SansSerif", Font.PLAIN, table_size);
-               table_value_font = new Font("Monospaced", Font.PLAIN, table_size);
-       }
-
-       static final int text_width = 20;
-
-       static public int state(String state) {
-               if (!map_initialized)
-                       initialize_map();
-               if (string_to_state.containsKey(state))
-                       return string_to_state.get(state);
-               return ao_flight_invalid;
-       }
-
-       static public String state_name(int state) {
-               if (state < 0 || state_to_string.length <= state)
-                       return "invalid";
-               return state_to_string[state];
-       }
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
-       static public boolean initialized = false;
-       static public boolean loaded_library = false;
+public class Altos extends AltosUILib {
 
-       public static boolean load_library() {
-               if (!initialized) {
-                       try {
-                               System.loadLibrary("altos");
-                               libaltos.altos_init();
-                               loaded_library = true;
-                       } catch (UnsatisfiedLinkError e) {
-                               try {
-                                       System.loadLibrary("altos64");
-                                       libaltos.altos_init();
-                                       loaded_library = true;
-                               } catch (UnsatisfiedLinkError e2) {
-                                       loaded_library = false;
-                               }
-                       }
-                       initialized = true;
-               }
-               return loaded_library;
-       }
 }