X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMap.java;h=9fbb94a6e1f5870f6ba13646ed19000fbb0c6d8f;hp=2c93adb8d008bcfbb355a418a39d265ae41eb570;hb=21d176f161b90f18f236ef887cef9676d712eee3;hpb=a9bc364ecc69d9085146a39198f0671de164eb2e

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 2c93adb8..9fbb94a6 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_10;
 
 import java.io.*;
 import java.lang.*;
@@ -230,23 +230,23 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		if (!gps.locked && gps.nsat < 4)
 			return;
 
-		switch (state.state) {
+		switch (state.state()) {
 		case AltosLib.ao_flight_boost:
 			if (!have_boost) {
-				add_mark(gps.lat, gps.lon, state.state);
+				add_mark(gps.lat, gps.lon, state.state());
 				have_boost = true;
 			}
 			break;
 		case AltosLib.ao_flight_landed:
 			if (!have_landed) {
-				add_mark(gps.lat, gps.lon, state.state);
+				add_mark(gps.lat, gps.lon, state.state());
 				have_landed = true;
 			}
 			break;
 		}
 
 		if (path != null) {
-			AltosMapRectangle	damage = path.add(gps.lat, gps.lon, state.state);
+			AltosMapRectangle	damage = path.add(gps.lat, gps.lon, state.state());
 
 			if (damage != null)
 				repaint(damage, AltosMapPath.stroke_width);
@@ -308,7 +308,11 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 			upper_left = floor(transform.screen_point(new AltosPointInt(0, 0)));
 			lower_right = floor(transform.screen_point(new AltosPointInt(width(), height())));
 		}
-		for (AltosPointInt point : tiles.keySet()) {
+
+		Enumeration<AltosPointInt> keyEnumeration = tiles.keys();
+
+		while (keyEnumeration.hasMoreElements()) {
+			AltosPointInt point = keyEnumeration.nextElement();
 			if (point.x < upper_left.x || lower_right.x < point.x ||
 			    point.y < upper_left.y || lower_right.y < point.y) {
 				tiles.remove(point);
@@ -377,7 +381,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
 	/* AltosMapTileListener methods */
 	public synchronized void notify_tile(AltosMapTile tile, int status) {
-		for (AltosPointInt point : tiles.keySet()) {
+		Enumeration<AltosPointInt> keyEnumeration = tiles.keys();
+
+		while (keyEnumeration.hasMoreElements()) {
+			AltosPointInt point = keyEnumeration.nextElement();
 			if (tile == tiles.get(point)) {
 				AltosPointInt	screen = transform.screen(point);
 				repaint(screen.x, screen.y, AltosMap.px_size, AltosMap.px_size);