From e2fe220efe2ba375ddd925747a630c30c17d3bef Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 13 Jun 2017 10:50:37 -0700 Subject: [PATCH 1/1] altosuilib: Rename AltosGraphNew to AltosGraph Signed-off-by: Keith Packard --- altosui/AltosGraphUI.java | 4 ++-- altosuilib/{AltosGraphNew.java => AltosGraph.java} | 6 +++--- altosuilib/Makefile.am | 2 +- micropeak/MicroPeak.java | 4 ++-- telegps/TeleGPSGraphUI.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename altosuilib/{AltosGraphNew.java => AltosGraph.java} (98%) diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index 9b47211d..f8408112 100644 --- a/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java @@ -34,7 +34,7 @@ import org.jfree.ui.RefineryUtilities; public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener { JTabbedPane pane; - AltosGraphNew graph; + AltosGraph graph; AltosUIEnable enable; AltosUIMap map; AltosFlightStats stats; @@ -99,7 +99,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt stats = new AltosFlightStats(flight_series); - graph = new AltosGraphNew(enable, stats, flight_series); + graph = new AltosGraph(enable, stats, flight_series); statsTable = new AltosFlightStatsTable(stats); diff --git a/altosuilib/AltosGraphNew.java b/altosuilib/AltosGraph.java similarity index 98% rename from altosuilib/AltosGraphNew.java rename to altosuilib/AltosGraph.java index 01603c78..6f38c417 100644 --- a/altosuilib/AltosGraphNew.java +++ b/altosuilib/AltosGraph.java @@ -35,7 +35,7 @@ import org.jfree.chart.labels.*; import org.jfree.data.xy.*; import org.jfree.data.*; -public class AltosGraphNew extends AltosUIGraph { +public class AltosGraph extends AltosUIGraph { static final private Color height_color = new Color(194,31,31); static final private Color kalman_height_color = new Color(255,0,0); @@ -324,11 +324,11 @@ public class AltosGraphNew extends AltosUIGraph { set_series(setup(stats, flight_series)); } - public AltosGraphNew(AltosUIEnable enable) { + public AltosGraph(AltosUIEnable enable) { super(enable, "Flight"); } - public AltosGraphNew(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series) { + public AltosGraph(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series) { this(enable); set_series(setup(stats, flight_series)); } diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am index 57a7b297..4b5eb524 100644 --- a/altosuilib/Makefile.am +++ b/altosuilib/Makefile.am @@ -29,7 +29,7 @@ altosuilib_JAVA = \ AltosUIPreferences.java \ AltosUIFlightSeries.java \ AltosUIGraph.java \ - AltosGraphNew.java \ + AltosGraph.java \ AltosUSBDevice.java \ AltosVoice.java \ AltosDisplayThread.java \ diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java index 4ca4dd0f..2543f398 100644 --- a/micropeak/MicroPeak.java +++ b/micropeak/MicroPeak.java @@ -30,7 +30,7 @@ import org.altusmetrum.altosuilib_11.*; public class MicroPeak extends MicroFrame implements ActionListener, ItemListener { File filename; - AltosGraphNew graph; + AltosGraph graph; AltosUIEnable enable; AltosFlightStatsTable statsTable; MicroRaw raw; @@ -268,7 +268,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene enable = new AltosUIEnable(); - graph = new AltosGraphNew(enable); + graph = new AltosGraph(enable); statsTable = new AltosFlightStatsTable(); raw = new MicroRaw(); pane.add(graph.panel, "Graph"); diff --git a/telegps/TeleGPSGraphUI.java b/telegps/TeleGPSGraphUI.java index 85238d7b..89c6cea5 100644 --- a/telegps/TeleGPSGraphUI.java +++ b/telegps/TeleGPSGraphUI.java @@ -37,7 +37,7 @@ import org.jfree.ui.RefineryUtilities; public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener { JTabbedPane pane; - AltosGraphNew graph; + AltosGraph graph; AltosUIEnable enable; AltosUIMap map; AltosState state; @@ -105,7 +105,7 @@ public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A enable = new AltosUIEnable(); stats = new AltosFlightStats(flight_series); - graph = new AltosGraphNew(enable, stats, flight_series); + graph = new AltosGraph(enable, stats, flight_series); statsTable = new AltosFlightStatsTable(stats); -- 2.30.2