diff options
author | Bdale Garbee <bdale@gag.com> | 2017-08-12 00:59:03 -0400 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2017-08-12 00:59:03 -0400 |
commit | 59c6167b9f1e9de30455af1632e9a0b65d64ad63 (patch) | |
tree | d27e4b3df53300081aa6ac0a30820c58a1c968ef /altosui/AltosConfigPyroUI.java | |
parent | 41eedf88751910ea9c0a299444fbac769edb8427 (diff) | |
parent | fccfa54bb3b746cecfcdc1fd497cf736bbfe3ef3 (diff) |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'altosui/AltosConfigPyroUI.java')
-rw-r--r-- | altosui/AltosConfigPyroUI.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java index 2d4b216c..cd887c00 100644 --- a/altosui/AltosConfigPyroUI.java +++ b/altosui/AltosConfigPyroUI.java @@ -23,14 +23,14 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; -import org.altusmetrum.altoslib_11.*; -import org.altusmetrum.altosuilib_11.*; +import org.altusmetrum.altoslib_12.*; +import org.altusmetrum.altosuilib_12.*; 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); |