telegps: Add scan UI

[fw/altos] / altosuilib / AltosUILib.java

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 9fcaf6d4d636979ef4272b1171ff0a982f75a758..b51c5963314a41dc57d794a86e99b66d26d905c2 100644 (file)
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_4.*;
 
 public class AltosUILib extends AltosLib {
 
@@ -81,18 +81,18 @@ public class AltosUILib extends AltosLib {
        static public boolean initialized = false;
        static public boolean loaded_library = false;
 
+       static final String[] library_names = { "altos", "altos32", "altos64" };
+
        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) {
+                                       System.out.printf("Link error %s\n", e.getMessage());
                                        loaded_library = false;
                                }
                        }