X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=bd85c2c208373b8a6f7c48ad5b6661d3fbcbc110;hp=ce430d7a9137f082ddffcf667acd7f7c805f1dd8;hb=44c0cecabb3a815dbf7f52e6b2dad364cc72b60c;hpb=b1a90adac9f6e2a609ce1ccd6749462bb5c9adbe diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java index ce430d7a..bd85c2c2 100644 --- a/altoslib/AltosConfigData.java +++ b/altoslib/AltosConfigData.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 @@ -34,7 +35,7 @@ public class AltosConfigData implements Iterable { public int altitude_32; /* Strings returned */ - public LinkedList lines; + public LinkedList __lines; /* Config information */ /* HAS_FLIGHT*/ @@ -142,7 +143,7 @@ public class AltosConfigData implements Iterable { } public Iterator iterator() { - return lines.iterator(); + return __lines.iterator(); } public int log_space() { @@ -232,7 +233,7 @@ public class AltosConfigData implements Iterable { } public void reset() { - lines = new LinkedList(); + __lines = new LinkedList(); manufacturer = "unknown"; product = "unknown"; @@ -288,7 +289,7 @@ public class AltosConfigData implements Iterable { } public void parse_line(String line) { - lines.add(line); + __lines.add(line); /* Version replies */ try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {} try { product = get_string(line, "product"); } catch (Exception e) {} @@ -718,5 +719,4 @@ public class AltosConfigData implements Iterable { break; } } - }