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

This code isn't really new anymore...

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

9 files changed, 28 insertions, 29 deletions

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 9b4a18bc..63f8c670 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -40,7 +40,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosDescent	descent;
 	AltosLanded	landed;
 	AltosCompanionInfo	companion;
-	AltosUIMapNew      sitemap;
+	AltosUIMap      sitemap;
 	boolean		has_map;
 	boolean		has_companion;
 	boolean		has_state;
@@ -289,7 +289,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		has_companion = false;
 		has_state = false;
 
-		sitemap = new AltosUIMapNew();
+		sitemap = new AltosUIMap();
 		displays.add(sitemap);
 		has_map = false;
 
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index be63c6e6..32b59977 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -35,7 +35,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 	JTabbedPane		pane;
 	AltosGraph		graph;
 	AltosUIEnable		enable;
-	AltosUIMapNew		map;
+	AltosUIMap		map;
 	AltosState		state;
 	AltosGraphDataSet	graphDataSet;
 	AltosFlightStats	stats;
@@ -47,7 +47,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 		for (AltosState state : states) {
 			if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
 				if (map == null)
-					map = new AltosUIMapNew();
+					map = new AltosUIMap();
 				map.show(state, null);
 				has_gps = true;
 			}
diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 8d0d807e..1a992946 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -35,7 +35,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 	AltosFlightStatus	flightStatus;
 	AltosIgnitor		ignitor;
 	AltosIdleMonitor	thread;
-	AltosUIMapNew      	sitemap;
+	AltosUIMap      	sitemap;
 	int			serial;
 	boolean			remote;
 	boolean			has_ignitor;
@@ -275,7 +275,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
 		ignitor = new AltosIgnitor();
 
-		sitemap = new AltosUIMapNew();
+		sitemap = new AltosUIMap();
 
 		/* Make the tabbed pane use the rest of the window space */
 		bag.add(pane, constraints(0, 4, GridBagConstraints.BOTH));
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 88ae8530..5768fd49 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -295,7 +295,7 @@ public class AltosUI extends AltosUIFrame {
 	}
 
 	void LoadMaps() {
-		new AltosUIMapPreloadNew(AltosUI.this);
+		new AltosUIMapPreload(AltosUI.this);
 	}
 
 	void LaunchController() {
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 \
diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index d347fe41..2897e06a 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -72,7 +72,7 @@ public class TeleGPS
 
 	JTabbedPane		pane;
 
-	AltosUIMapNew  		map;
+	AltosUIMap  		map;
 	TeleGPSInfo		gps_info;
 	TeleGPSState		gps_state;
 	AltosInfoTable		info_table;
@@ -174,7 +174,7 @@ public class TeleGPS
 	}
 
 	void load_maps() {
-		new AltosUIMapPreloadNew(this);
+		new AltosUIMapPreload(this);
 	}
 
 	void disconnect() {
@@ -567,7 +567,7 @@ public class TeleGPS
 		/* Make the tabbed pane use the rest of the window space */
 		bag.add(pane, constraints(0, 3, GridBagConstraints.BOTH));
 
-		map = new AltosUIMapNew();
+		map = new AltosUIMap();
 		pane.add(map.getName(), map);
 		displays.add(map);
 
diff --git a/telegps/TeleGPSGraphUI.java b/telegps/TeleGPSGraphUI.java
index 701a7e30..8e2f6627 100644
--- a/telegps/TeleGPSGraphUI.java
+++ b/telegps/TeleGPSGraphUI.java
@@ -38,7 +38,7 @@ public class TeleGPSGraphUI extends AltosUIFrame
 	JTabbedPane		pane;
 	AltosGraph		graph;
 	AltosUIEnable		enable;
-	AltosUIMapNew		map;
+	AltosUIMap		map;
 	AltosState		state;
 	AltosFlightStats	stats;
 	AltosGraphDataSet	graphDataSet;
@@ -69,7 +69,7 @@ public class TeleGPSGraphUI extends AltosUIFrame
 		graph = new AltosGraph(enable, stats, graphDataSet);
 		statsTable = new AltosFlightStatsTable(stats);
 
-		map = new AltosUIMapNew();
+		map = new AltosUIMap();
 
 		pane.add("Graph", graph.panel);
 		pane.add("Configure Graph", enable);