no longer need patch

[fw/altos] / altosuilib / AltosUILib.java

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 1b1214052f8f9598f46b8895456d6a3f95a23b76..a0cf325d8543ed1f2afcc33e941a8de50eec1dc8 100644 (file)
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.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_1;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosUILib extends AltosLib {
 
@@ -35,6 +36,7 @@ public class AltosUILib extends AltosLib {
        final public static int font_size_small = 1;
        final public static int font_size_medium = 2;
        final public static int font_size_large = 3;
+       final public static int font_size_huge = 4;
 
        final public static int position_top_left = 0;
        final public static int position_top = 1;
@@ -68,6 +70,11 @@ public class AltosUILib extends AltosLib {
                        status_size = 30;
                        table_size = 17;
                        break;
+               case font_size_huge:
+                       brief_size = 30;
+                       status_size = 36;
+                       table_size = 24;
+                       break;
                }
                label_font = new Font("Dialog", Font.PLAIN, brief_size);
                value_font = new Font("Monospaced", Font.PLAIN, brief_size);
@@ -80,22 +87,39 @@ public class AltosUILib extends AltosLib {
 
        static public boolean initialized = false;
        static public boolean loaded_library = false;
+       static public boolean has_bluetooth = false;
+
+       static final String[] library_names = {
+               "altos",
+               "altos32",
+               "altos64",
+               "altos_i686",
+               "altos_amd64",
+               "altos_aarch64",
+               "altos_armel",
+               "altos_armhf"
+       };
 
        public static boolean load_library() {
                if (!initialized) {
-                       try {
-                               System.loadLibrary("altos");
-                               libaltos.altos_init();
-                               loaded_library = true;
-                       } catch (UnsatisfiedLinkError e) {
+                       for (String name : library_names) {
                                try {
-                                       System.loadLibrary("altos64");
+                                       System.loadLibrary(name);
                                        libaltos.altos_init();
                                        loaded_library = true;
-                               } catch (UnsatisfiedLinkError e2) {
+                                       break;
+                               } catch (UnsatisfiedLinkError e) {
                                        loaded_library = false;
                                }
                        }
+                       if (!loaded_library)
+                               System.out.printf("Cannot find 'libaltos' device access library\n");
+
+                       String OS = System.getProperty("os.name");
+
+                       if (OS.startsWith("L") || OS.startsWith("W"))
+                               has_bluetooth = true;
+
                        initialized = true;
                }
                return loaded_library;