Switch from GPLv2 to GPLv2+

[fw/altos] / altosuilib / AltosUIUnitsIndicator.java

diff --git a/altosuilib/AltosUIUnitsIndicator.java b/altosuilib/AltosUIUnitsIndicator.java
index 6f398808fde5066c9a8bcd58a56ed4b1f6cb5b4b..dc5cb11c6c6f8bb728c58491ca42969e95076267 100644 (file)
--- a/altosuilib/AltosUIUnitsIndicator.java
+++ b/altosuilib/AltosUIUnitsIndicator.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,11 +16,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_11;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_11.*;
 
 public abstract class AltosUIUnitsIndicator extends AltosUIIndicator {
 
@@ -36,16 +37,20 @@ public abstract class AltosUIUnitsIndicator extends AltosUIIndicator {
                return hide(value(state, i));
        }
 
+       public boolean hide(AltosState state, AltosListenerState listener_state, int i) {
+               return hide(state, i);
+       }
+
        public double value (AltosState state, AltosListenerState listener_state, int i) {
                return value(state, i);
        }
 
        public double[] last_values;
 
-       public void show(double... v) {
+       private void show(boolean force, double... v) {
                show();
                for (int i = 0; i < values.length; i++) {
-                       if (v[i] != last_values[i]) {
+                       if (force || v[i] != last_values[i]) {
                                String  value_text;
                                boolean good = false;
 
@@ -64,20 +69,26 @@ public abstract class AltosUIUnitsIndicator extends AltosUIIndicator {
                }
        }
 
+       boolean hide = false;
+
+       public void show(double... v) {
+               show(false, v);
+       }
+
        public void units_changed(boolean imperial_units) {
-               show(last_values);
+               if (!hide)
+                       show(true, last_values);
        }
 
        public void show (AltosState state, AltosListenerState listener_state) {
                double[] v = new double[values.length];
-               boolean hide = false;
 
                for (int i = 0; i < values.length; i++) {
                        if (state != null)
                                v[i] = value(state, listener_state, i);
                        else
                                v[i] = AltosLib.MISSING;
-                       if (hide(state, i))
+                       if (hide(state, listener_state, i))
                                hide = true;
                }
 
@@ -89,7 +100,7 @@ public abstract class AltosUIUnitsIndicator extends AltosUIIndicator {
 
        public void reset() {
                for (int i = 0; i < last_values.length; i++)
-                       last_values[i] = AltosLib.MISSING - 1;
+                       last_values[i] = AltosLib.MISSING;
        }
 
        public AltosUIUnitsIndicator (Container container, int x, int y, int label_width, AltosUnits units, String name, int number_values, boolean has_lights, int width) {
@@ -97,7 +108,7 @@ public abstract class AltosUIUnitsIndicator extends AltosUIIndicator {
                this.units = units;
                last_values = new double[values.length];
                for (int i = 0; i < last_values.length; i++)
-                       last_values[i] = AltosLib.MISSING - 1;
+                       last_values[i] = AltosLib.MISSING;
        }
 
        public AltosUIUnitsIndicator (Container container, int x, int y, AltosUnits units, String name, int number_values, boolean has_lights, int width) {