Switch from GPLv2 to GPLv2+

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroidTab.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index 017315af6c24ef6ae4e739a5286f9fe17f850dbd..11d8f6241fc885b1b140696c803a78753e3b4b77 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.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
@@ -17,7 +18,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_11.*;
 import android.location.Location;
 import android.app.Activity;
 import android.graphics.Color;
@@ -39,9 +40,6 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 
        public abstract String tab_name();
 
-       public void set_map_type(int map_type) {
-       }
-
        public void units_changed(boolean imperial_units) {
                if (!isHidden())
                        show(last_telem_state, last_state, last_from_receiver, last_receiver);
@@ -96,7 +94,6 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
                last_state = state;
                last_from_receiver = from_receiver;
                last_receiver = receiver;
-               AltosDebug.debug("update_ui tab %s is_current %b\n", tab_name(), is_current);
                if (is_current)
                        show(telem_state, state, from_receiver, receiver);
                else