Merge branch 'master' into new-state

[fw/altos] / altosuilib / AltosUILib.java

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 717678bafa6d959d19df096fa317f4a0e2ec33da..1b1214052f8f9598f46b8895456d6a3f95a23b76 100644 (file)
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -15,28 +15,38 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_1;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosUILib extends AltosLib {
 
-       static final int tab_elt_pad = 5;
+       public 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;
+       public static Font label_font;
+       public static Font value_font;
+       public static Font status_font;
+       public static Font table_label_font;
+       public 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;
+       final public static int font_size_small = 1;
+       final public static int font_size_medium = 2;
+       final public static int font_size_large = 3;
 
-       static void set_fonts(int size) {
+       final public static int position_top_left = 0;
+       final public static int position_top = 1;
+       final public static int position_top_right = 2;
+       final public static int position_left = 3;
+       final public static int position_center = 4;
+       final public static int position_right = 5;
+       final public static int position_bottom_left = 6;
+       final public static int position_bottom = 7;
+       final public static int position_bottom_right = 8;
+
+       public static void set_fonts(int size) {
                int     brief_size;
                int     table_size;
                int     status_size;
@@ -66,7 +76,7 @@ public class AltosUILib extends AltosLib {
                table_value_font = new Font("Monospaced", Font.PLAIN, table_size);
        }
 
-       static final int text_width = 20;
+       static public final int text_width = 20;
 
        static public boolean initialized = false;
        static public boolean loaded_library = false;