Merge branch 'branch-1.2' into debian

1 files changed, 3 insertions, 10 deletions

diff --git a/altosui/AltosSiteMapPreload.java b/altosui/AltosSiteMapPreload.java
index 676b0790..fd648abc 100644
--- a/altosui/AltosSiteMapPreload.java
+++ b/altosui/AltosSiteMapPreload.java
@@ -18,22 +18,15 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.image.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.MouseInputAdapter;
-import javax.imageio.ImageIO;
-import javax.swing.table.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.lang.Math;
-import java.awt.geom.Point2D;
-import java.awt.geom.Line2D;
 import java.net.URL;
 import java.net.URLConnection;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib_1.*;
 
 class AltosMapPos extends Box {
 	AltosUI		owner;
@@ -184,7 +177,7 @@ class AltosSites extends Thread {
 	public void run() {
 		try {
 			URLConnection uc = url.openConnection();
-			int length = uc.getContentLength();
+			//int length = uc.getContentLength();
 			
 			InputStreamReader in_stream = new InputStreamReader(uc.getInputStream(), Altos.unicode_set);
 			BufferedReader in = new BufferedReader(in_stream);
@@ -213,7 +206,7 @@ class AltosSites extends Thread {
 	}
 }
 
-public class AltosSiteMapPreload extends AltosDialog implements ActionListener, ItemListener {
+public class AltosSiteMapPreload extends AltosUIDialog implements ActionListener, ItemListener {
 	AltosUI		owner;
 	AltosSiteMap	map;