X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMapView.java;h=331b0aea56f0177282a864ab95bd93310da12340;hb=cb23b992be8ba40c97d8988c134a814a13ccd58c;hp=1abd173121852a321ac17e40c738e0eb3c28dc54;hpb=c8078d352a7f54a4a97d25af080155d3f875536a;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMapView.java b/altosuilib/AltosUIMapView.java
index 1abd1731..331b0aea 100644
--- a/altosuilib/AltosUIMapView.java
+++ b/altosuilib/AltosUIMapView.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_3;
+package org.altusmetrum.altosuilib_7;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -26,7 +26,7 @@ import java.lang.*;
 import java.awt.geom.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_7.*;
 
 public class AltosUIMapView extends Component implements MouseMotionListener, MouseListener, MouseWheelListener, ComponentListener, AltosUIMapTileListener, AltosUIMapStoreListener {
 
@@ -67,7 +67,7 @@ public class AltosUIMapView extends Component implements MouseMotionListener, Mo
 	AltosUILatLon		centre;
 
 	public void set_font() {
-		line.set_font(AltosUILib.value_font);
+		line.set_font(AltosUILib.status_font);
 		for (AltosUIMapTile tile : tiles.values())
 			tile.set_font(AltosUILib.value_font);
 		repaint();
@@ -370,7 +370,7 @@ public class AltosUIMapView extends Component implements MouseMotionListener, Mo
 		for (Point point : to_remove)
 			tiles.remove(point);
 
-		cache.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((getWidth() / px_size + 2) * (getHeight() / px_size + 2));
 		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);
@@ -426,21 +426,6 @@ public class AltosUIMapView extends Component implements MouseMotionListener, Mo
 	}
 
 	public void paint(Graphics g) {
-		VolatileImage	back_buffer = create_back_buffer();
-		do {
-			GraphicsConfiguration gc = getGraphicsConfiguration();
-			int code = back_buffer.validate(gc);
-			if (code == VolatileImage.IMAGE_INCOMPATIBLE)
-				back_buffer = create_back_buffer();
-
-			Graphics g_back = back_buffer.getGraphics();
-			g_back.setClip(g.getClip());
-			do_paint(g_back);
-			g_back.dispose();
-
-			g.drawImage(back_buffer, 0, 0, this);
-		} while (back_buffer.contentsLost());
-		back_buffer.flush();
 	}
 
 	public void update(Graphics g) {