projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Publish AltosSiteMap.centre. Add prefetchMaps with old API
[fw/altos]
/
altosui
/
AltosConfigPyroUI.java
diff --git
a/altosui/AltosConfigPyroUI.java
b/altosui/AltosConfigPyroUI.java
index 47b2b662bb5ac7b49d4804527384cfc2feb85599..9df2d87dc302e5c4755804daccfa6b6740ab9737 100644
(file)
--- a/
altosui/AltosConfigPyroUI.java
+++ b/
altosui/AltosConfigPyroUI.java
@@
-21,8
+21,8
@@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.*;
-import org.altusmetrum.altoslib_
3
.*;
-import org.altusmetrum.altosuilib_
1
.*;
+import org.altusmetrum.altoslib_
4
.*;
+import org.altusmetrum.altosuilib_
2
.*;
public class AltosConfigPyroUI
extends AltosUIDialog
public class AltosConfigPyroUI
extends AltosUIDialog
@@
-50,7
+50,7
@@
public class AltosConfigPyroUI
public int flag;
public JCheckBox enable;
public JTextField value;
public int flag;
public JCheckBox enable;
public JTextField value;
- public JComboBox combo;
+ public JComboBox
<String>
combo;
AltosConfigPyroUI ui;
boolean setting;
AltosConfigPyroUI ui;
boolean setting;
@@
-63,22
+63,22
@@
public class AltosConfigPyroUI
public void itemStateChanged(ItemEvent e) {
set_enable(enable.isSelected());
public void itemStateChanged(ItemEvent e) {
set_enable(enable.isSelected());
- if (!setting)
+ if (!setting)
ui.set_dirty();
}
public void changedUpdate(DocumentEvent e) {
ui.set_dirty();
}
public void changedUpdate(DocumentEvent e) {
- if (!setting)
+ if (!setting)
ui.set_dirty();
}
public void insertUpdate(DocumentEvent e) {
ui.set_dirty();
}
public void insertUpdate(DocumentEvent e) {
- if (!setting)
+ if (!setting)
ui.set_dirty();
}
public void removeUpdate(DocumentEvent e) {
ui.set_dirty();
}
public void removeUpdate(DocumentEvent e) {
- if (!setting)
+ if (!setting)
ui.set_dirty();
}
ui.set_dirty();
}
@@
-149,7
+149,7
@@
public class AltosConfigPyroUI
enable = new JCheckBox();
enable.addItemListener(this);
pane.add(enable, c);
enable = new JCheckBox();
enable.addItemListener(this);
pane.add(enable, c);
-
+
if ((flag & AltosPyro.pyro_no_value) == 0) {
c = new GridBagConstraints();
c.gridx = x+1; c.gridy = y;
if ((flag & AltosPyro.pyro_no_value) == 0) {
c = new GridBagConstraints();
c.gridx = x+1; c.gridy = y;
@@
-159,7
+159,7
@@
public class AltosConfigPyroUI
c.insets = il;
if ((flag & AltosPyro.pyro_state_value) != 0) {
make_state_names();
c.insets = il;
if ((flag & AltosPyro.pyro_state_value) != 0) {
make_state_names();
- combo = new JComboBox(state_names);
+ combo = new JComboBox
<String>
(state_names);
combo.addItemListener(this);
pane.add(combo, c);
} else {
combo.addItemListener(this);
pane.add(combo, c);
} else {
@@
-224,7
+224,7
@@
public class AltosConfigPyroUI
items = new PyroItem[nrow];
int row = 0;
items = new PyroItem[nrow];
int row = 0;
-
+
GridBagConstraints c;
c = new GridBagConstraints();
c.gridx = x; c.gridy = y;
GridBagConstraints c;
c = new GridBagConstraints();
c.gridx = x; c.gridy = y;
@@
-232,7
+232,7
@@
public class AltosConfigPyroUI
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
c.insets = il;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
c.insets = il;
- label = new JLabel(String.format("Pyro Channel %
d",
channel));
+ label = new JLabel(String.format("Pyro Channel %
c", 'A' +
channel));
pane.add(label, c);
y++;
pane.add(label, c);
y++;
@@
-371,7
+371,7
@@
public class AltosConfigPyroUI
pane.add(close, c);
close.addActionListener(this);
close.setActionCommand("Close");
pane.add(close, c);
close.addActionListener(this);
close.setActionCommand("Close");
-
+
addWindowListener(new ConfigListener(this, owner));
AltosPreferences.register_units_listener(this);
}
addWindowListener(new ConfigListener(this, owner));
AltosPreferences.register_units_listener(this);
}