Bump java lib versions in preparation for 1.9.2

[fw/altos] / altosuilib / AltosUILib.java

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 1f1ad23b4e748e2750b14901f3d94d39d33c6315..7553a8ac06bf9a84c2a832be60cb4433bf27fdf9 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_9;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_9.*;
+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);
@@ -112,9 +119,8 @@ public class AltosUILib extends AltosLib {
 
                        String OS = System.getProperty("os.name");
 
-                       if (OS.startsWith("Linux")) {
+                       if (OS.startsWith("L") || OS.startsWith("W"))
                                has_bluetooth = true;
-                       }
 
                        initialized = true;
                }