X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIMapView.java;h=4df178e2e57e6ba676d0f619a30aedc0d6e2b0ce;hp=701986825ea2c3817286a83b411fe1b644c24523;hb=9a6a3c34293eac6442f766e13ce148f595e891eb;hpb=6f306b267f63d0f59fb77b1ce41c678042dd6802

diff --git a/altosuilib/AltosUIMapView.java b/altosuilib/AltosUIMapView.java
index 70198682..4df178e2 100644
--- a/altosuilib/AltosUIMapView.java
+++ b/altosuilib/AltosUIMapView.java
@@ -28,12 +28,14 @@ import java.util.*;
 import java.util.concurrent.*;
 import org.altusmetrum.altoslib_4.*;
 
-public class AltosUIMapView extends Canvas implements MouseMotionListener, MouseListener, MouseWheelListener, ComponentListener, AltosUIMapTileListener, AltosUIMapStoreListener {
+public class AltosUIMapView extends Component implements MouseMotionListener, MouseListener, MouseWheelListener, ComponentListener, AltosUIMapTileListener, AltosUIMapStoreListener {
 
 	AltosUIMapPath	path = new AltosUIMapPath();
 
 	AltosUIMapLine	line = new AltosUIMapLine();
 
+	AltosUIMapCache	cache = new AltosUIMapCache();
+
 	LinkedList<AltosUIMapMark> marks = new LinkedList<AltosUIMapMark>();
 
 	LinkedList<AltosUIMapZoomListener> zoom_listeners = new LinkedList<AltosUIMapZoomListener>();
@@ -368,7 +370,7 @@ public class AltosUIMapView extends Canvas implements MouseMotionListener, Mouse
 		for (Point point : to_remove)
 			tiles.remove(point);
 
-		AltosUIMapCache.set_cache_size(((lower_right.y - upper_left.y) / px_size + 1) * ((lower_right.x - upper_left.x) / px_size + 1));
+		cache.set_cache_size(((lower_right.y - upper_left.y) / px_size + 1) * ((lower_right.x - upper_left.x) / px_size + 1));
 		for (int y = upper_left.y; y <= lower_right.y; y += px_size) {
 			for (int x = upper_left.x; x <= lower_right.x; x += px_size) {
 				Point point = new Point(x, y);
@@ -394,6 +396,8 @@ public class AltosUIMapView extends Canvas implements MouseMotionListener, Mouse
 		}
 	}
 
+	public AltosUIMapCache cache() { return cache; }
+
 	/* AltosUIMapStoreListener methods */
 	public void notify_store(AltosUIMapStore store, int status) {
 		if (load_listener != null) {
@@ -422,7 +426,6 @@ public class AltosUIMapView extends Canvas implements MouseMotionListener, Mouse
 	}
 
 	public void paint(Graphics g) {
-
 		VolatileImage	back_buffer = create_back_buffer();
 		do {
 			GraphicsConfiguration gc = getGraphicsConfiguration();