diff options
| -rw-r--r-- | altosui/AltosConfigFC.java (renamed from altosui/AltosConfig.java) | 12 | ||||
| -rw-r--r-- | altosui/AltosConfigFCUI.java (renamed from altosui/AltosConfigUI.java) | 8 | ||||
| -rw-r--r-- | altosui/AltosConfigPyroUI.java | 8 | ||||
| -rw-r--r-- | altosui/AltosUI.java | 2 | ||||
| -rw-r--r-- | altosui/Makefile-standalone | 4 | ||||
| -rw-r--r-- | altosui/Makefile.am | 4 |
6 files changed, 19 insertions, 19 deletions
diff --git a/altosui/AltosConfig.java b/altosui/AltosConfigFC.java index bf2b8166..beff71b7 100644 --- a/altosui/AltosConfig.java +++ b/altosui/AltosConfigFC.java @@ -26,7 +26,7 @@ import java.text.*; import org.altusmetrum.altoslib_12.*; import org.altusmetrum.altosuilib_12.*; -public class AltosConfig implements ActionListener { +public class AltosConfigFC implements ActionListener { class int_ref { int value; @@ -62,7 +62,7 @@ public class AltosConfig implements ActionListener { boolean remote; AltosConfigData data; - AltosConfigUI config_ui; + AltosConfigFCUI config_ui; boolean serial_started; boolean made_visible; @@ -96,7 +96,7 @@ public class AltosConfig implements ActionListener { final static int serial_mode_reboot = 2; class SerialData implements Runnable { - AltosConfig config; + AltosConfigFC config; int serial_mode; void callback(String in_cmd) { @@ -182,7 +182,7 @@ public class AltosConfig implements ActionListener { } } - public SerialData(AltosConfig in_config, int in_serial_mode) { + public SerialData(AltosConfigFC in_config, int in_serial_mode) { config = in_config; serial_mode = in_serial_mode; } @@ -195,7 +195,7 @@ public class AltosConfig implements ActionListener { } void init_ui () throws InterruptedException, TimeoutException { - config_ui = new AltosConfigUI(owner, remote); + config_ui = new AltosConfigFCUI(owner, remote); config_ui.addActionListener(this); serial_line.set_frame(owner); set_ui(); @@ -275,7 +275,7 @@ public class AltosConfig implements ActionListener { } } - public AltosConfig(JFrame given_owner) { + public AltosConfigFC(JFrame given_owner) { owner = given_owner; device = AltosDeviceUIDialog.show(owner, Altos.product_any); diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigFCUI.java index 270131b8..c0c37254 100644 --- a/altosui/AltosConfigUI.java +++ b/altosui/AltosConfigFCUI.java @@ -26,7 +26,7 @@ import java.text.*; import org.altusmetrum.altoslib_12.*; import org.altusmetrum.altosuilib_12.*; -public class AltosConfigUI +public class AltosConfigFCUI extends AltosUIDialog implements ActionListener, ItemListener, DocumentListener, AltosConfigValues, AltosUnitsListener { @@ -159,9 +159,9 @@ public class AltosConfigUI /* A window listener to catch closing events and tell the config code */ class ConfigListener extends WindowAdapter { - AltosConfigUI ui; + AltosConfigFCUI ui; - public ConfigListener(AltosConfigUI this_ui) { + public ConfigListener(AltosConfigFCUI this_ui) { ui = this_ui; } @@ -270,7 +270,7 @@ public class AltosConfigUI } /* Build the UI using a grid bag */ - public AltosConfigUI(JFrame in_owner, boolean remote) { + public AltosConfigFCUI(JFrame in_owner, boolean remote) { super (in_owner, "Configure Flight Computer", false); owner = in_owner; diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java index 5016ea63..cd887c00 100644 --- a/altosui/AltosConfigPyroUI.java +++ b/altosui/AltosConfigPyroUI.java @@ -30,7 +30,7 @@ public class AltosConfigPyroUI extends AltosUIDialog implements ItemListener, DocumentListener, AltosUnitsListener, ActionListener { - AltosConfigUI owner; + AltosConfigFCUI owner; Container pane; static Insets il = new Insets(4,4,4,4); @@ -347,9 +347,9 @@ public class AltosConfigPyroUI /* A window listener to catch closing events and tell the config code */ class ConfigListener extends WindowAdapter { AltosConfigPyroUI ui; - AltosConfigUI owner; + AltosConfigFCUI owner; - public ConfigListener(AltosConfigPyroUI this_ui, AltosConfigUI this_owner) { + public ConfigListener(AltosConfigPyroUI this_ui, AltosConfigFCUI this_owner) { ui = this_ui; owner = this_owner; } @@ -367,7 +367,7 @@ public class AltosConfigPyroUI setVisible(false); } - public AltosConfigPyroUI(AltosConfigUI in_owner, AltosPyro[] pyros, double pyro_firing_time) { + public AltosConfigPyroUI(AltosConfigFCUI in_owner, AltosPyro[] pyros, double pyro_firing_time) { super(in_owner, "Configure Pyro Channels", false); diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index a5a2078d..4bc2a5f8 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -276,7 +276,7 @@ public class AltosUI extends AltosUIFrame { } void ConfigureTeleMetrum() { - new AltosConfig(AltosUI.this); + new AltosConfigFC(AltosUI.this); } void ConfigureTeleDongle() { diff --git a/altosui/Makefile-standalone b/altosui/Makefile-standalone index cbaf9743..e5f41639 100644 --- a/altosui/Makefile-standalone +++ b/altosui/Makefile-standalone @@ -4,8 +4,8 @@ CLASSPATH=classes:./*:/usr/share/java/* CLASSFILES=\ Altos.class \ AltosChannelMenu.class \ - AltosConfig.class \ - AltosConfigUI.class \ + AltosConfigFC.class \ + AltosConfigFCUI.class \ AltosConvert.class \ AltosCRCException.class \ AltosCSV.class \ diff --git a/altosui/Makefile.am b/altosui/Makefile.am index df022c40..720cae7f 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -14,8 +14,8 @@ altosui_JAVA = \ AltosAscent.java \ AltosChannelMenu.java \ AltosCompanionInfo.java \ - AltosConfig.java \ - AltosConfigUI.java \ + AltosConfigFC.java \ + AltosConfigFCUI.java \ AltosConfigPyroUI.java \ AltosConfigureUI.java \ AltosConfigTD.java \ |