Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosKML.java

diff --git a/altoslib/AltosKML.java b/altoslib/AltosKML.java
index 0c9f46c905ac5a8434758946bb318d01333a0621..25108bf97c67ad27660f8d1e3915b561c1724b8e 100644 (file)
--- a/altoslib/AltosKML.java
+++ b/altoslib/AltosKML.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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -112,8 +113,8 @@ public class AltosKML implements AltosWriter {
        boolean started = false;
 
        void state_start(AltosState state) {
-               String  state_name = AltosLib.state_name(state.state);
-               String  state_color = state_color(state.state);
+               String  state_name = AltosLib.state_name(state.state());
+               String  state_color = state_color(state.state());
                out.printf(kml_style_start, state_name, state_color);
                out.printf("\tState: %s\n", state_name);
                out.printf("%s", kml_style_end);
@@ -171,8 +172,8 @@ public class AltosKML implements AltosWriter {
                }
                if (prev != null && prev.gps_sequence == state.gps_sequence)
                        return;
-               if (state.state != flight_state) {
-                       flight_state = state.state;
+               if (state.state() != flight_state) {
+                       flight_state = state.state();
                        if (prev != null) {
                                coord(state);
                                state_end(prev);