altosuilib: Rename AltosUIMap*New.java to AltosUIMap*.java

This code isn't really new anymore...

Signed-off-by: Keith Packard <keithp@keithp.com>

3 files changed, 16 insertions, 17 deletions

diff --git a/altosuilib/AltosUIMapNew.java b/altosuilib/AltosUIMap.java
index 42c9aa7a..36454054 100644
--- a/altosuilib/AltosUIMapNew.java
+++ b/altosuilib/AltosUIMap.java
@@ -29,7 +29,7 @@ import java.util.concurrent.*;
 import javax.imageio.*;
 import org.altusmetrum.altoslib_11.*;
 
-public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, AltosMapInterface {
+public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface {
 
 	AltosMap	map;
 	Graphics2D	g;
@@ -52,10 +52,10 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 					   RenderingHints.VALUE_ANTIALIAS_ON);
 			g.setStroke(new BasicStroke(stroke_width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
 
-			if (0 <= state && state < AltosUIMapNew.stateColors.length)
-				g.setColor(AltosUIMapNew.stateColors[state]);
+			if (0 <= state && state < AltosUIMap.stateColors.length)
+				g.setColor(AltosUIMap.stateColors[state]);
 			else
-				g.setColor(AltosUIMapNew.stateColors[AltosLib.ao_flight_invalid]);
+				g.setColor(AltosUIMap.stateColors[AltosLib.ao_flight_invalid]);
 
 			g.drawOval((int)pt.x-5, (int)pt.y-5, 10, 10);
 			g.drawOval((int)pt.x-20, (int)pt.y-20, 40, 40);
@@ -227,10 +227,10 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 					Rectangle	bounds = line.getBounds();
 
 					if (g.hitClip(bounds.x, bounds.y, bounds.width, bounds.height)) {
-						if (0 <= point.state && point.state < AltosUIMapNew.stateColors.length)
-							g.setColor(AltosUIMapNew.stateColors[point.state]);
+						if (0 <= point.state && point.state < AltosUIMap.stateColors.length)
+							g.setColor(AltosUIMap.stateColors[point.state]);
 						else
-							g.setColor(AltosUIMapNew.stateColors[AltosLib.ao_flight_invalid]);
+							g.setColor(AltosUIMap.stateColors[AltosLib.ao_flight_invalid]);
 
 						g.draw(line);
 					}
@@ -427,7 +427,7 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 
 	MapView	view;
 
-	public AltosUIMapNew() {
+	public AltosUIMap() {
 
 		set_font();
 
diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreload.java
index d043e9e3..42fdd301 100644
--- a/altosuilib/AltosUIMapPreloadNew.java
+++ b/altosuilib/AltosUIMapPreload.java
@@ -118,9 +118,9 @@ class AltosUIMapPos extends Box {
 	}
 }
 
-public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener, ItemListener, AltosLaunchSiteListener, AltosMapLoaderListener, AltosUnitsListener, AltosFontListener  {
+public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, ItemListener, AltosLaunchSiteListener, AltosMapLoaderListener, AltosUnitsListener, AltosFontListener  {
 	AltosUIFrame	owner;
-	AltosUIMapNew	map;
+	AltosUIMap	map;
 
 	AltosUIMapPos	lat;
 	AltosUIMapPos	lon;
@@ -290,7 +290,6 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 
 		radius.removeAllItems();
 		for (Double r : radii) {
-			System.out.printf("adding radius %f\n",r);
 			radius.addItem(r);
 		}
 		radius.setSelectedItem(radii[2]);
@@ -306,7 +305,7 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 		map.font_size_changed(font_size);
 	}
 
-	public AltosUIMapPreloadNew(AltosUIFrame in_owner) {
+	public AltosUIMapPreload(AltosUIFrame in_owner) {
 		owner = in_owner;
 
 		Container		pane = getContentPane();
@@ -320,8 +319,8 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
-					AltosUIPreferences.unregister_font_listener(AltosUIMapPreloadNew.this);
-					AltosPreferences.unregister_units_listener(AltosUIMapPreloadNew.this);
+					AltosUIPreferences.unregister_font_listener(AltosUIMapPreload.this);
+					AltosPreferences.unregister_units_listener(AltosUIMapPreload.this);
 				}
 			});
 
@@ -329,7 +328,7 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 		AltosPreferences.register_units_listener(this);
 		AltosUIPreferences.register_font_listener(this);
 
-		map = new AltosUIMapNew();
+		map = new AltosUIMap();
 
 		c.fill = GridBagConstraints.BOTH;
 		c.anchor = GridBagConstraints.CENTER;
diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index a00e4a12..d18006b5 100644
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -57,8 +57,8 @@ altosuilib_JAVA = \
 	AltosBTDeviceIterator.java \
 	AltosBTManage.java \
 	AltosBTKnown.java \
-	AltosUIMapNew.java \
-	AltosUIMapPreloadNew.java \
+	AltosUIMap.java \
+	AltosUIMapPreload.java \
 	AltosUIFlightTab.java \
 	AltosUIIndicator.java \
 	AltosUIUnitsIndicator.java \