Skip to content
Snippets Groups Projects
Commit 7542a086 authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

prefer using ConstrainedCheckBox to JCheckBox (PROBLEM-1745)

parent 8fd174c6
Branches
Tags
No related merge requests found
......@@ -19,16 +19,16 @@ import fr.soleil.comete.swing.Panel;
public class CheckBoxPanel extends Panel implements ICheckBox, ActionListener, ItemListener {
private static final long serialVersionUID = 5558619697042095425L;
private static final long serialVersionUID = -4189092075168726364L;
private CheckBox checkBox;
private AccessibleCheckBox checkBox;
private Label label;
public CheckBoxPanel() {
setLayout(new BorderLayout());
label = new Label();
label.setOpaque(false);
checkBox = new CheckBox();
checkBox = new AccessibleCheckBox();
addCenter(label);
add((IComponent) checkBox, BorderLayout.WEST);
}
......@@ -41,13 +41,11 @@ public class CheckBoxPanel extends Panel implements ICheckBox, ActionListener, I
@Override
public void setSelected(boolean bool) {
checkBox.setSelected(bool);
}
@Override
public void setEditable(boolean b) {
checkBox.setEditable(b);
}
@Override
......@@ -57,25 +55,22 @@ public class CheckBoxPanel extends Panel implements ICheckBox, ActionListener, I
@Override
public void itemStateChanged(ItemEvent e) {
checkBox.itemStateChanged(e);
checkBox.transmitItemEvent(e);
}
@Override
public void actionPerformed(ActionEvent e) {
checkBox.actionPerformed(e);
checkBox.transmitActionEvent(e);
}
@Override
public void addCheckBoxListener(ICheckBoxListener listener) {
checkBox.addCheckBoxListener(listener);
}
@Override
public void removeCheckBoxListener(ICheckBoxListener listener) {
checkBox.removeCheckBoxListener(listener);
}
@Override
......@@ -86,7 +81,6 @@ public class CheckBoxPanel extends Panel implements ICheckBox, ActionListener, I
@Override
public void setFalseLabel(String falseLabel) {
checkBox.setFalseLabel(falseLabel);
}
@Override
......@@ -130,4 +124,22 @@ public class CheckBoxPanel extends Panel implements ICheckBox, ActionListener, I
checkBox.setCometeForeground(color);
}
protected static class AccessibleCheckBox extends CheckBox {
private static final long serialVersionUID = -826345267870475153L;
public AccessibleCheckBox() {
super();
}
@Override
public void transmitActionEvent(ActionEvent evt) {
super.transmitActionEvent(evt);
}
@Override
public void transmitItemEvent(ItemEvent evt) {
super.transmitItemEvent(evt);
}
}
}
......@@ -11,7 +11,6 @@ import java.util.Date;
import java.util.List;
import java.util.ResourceBundle;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import org.cdma.plugin.mambo.utils.MamboVCGenerator;
......@@ -26,10 +25,12 @@ import fr.soleil.comete.swing.FileBrowserFieldButton;
import fr.soleil.comete.swing.Panel;
import fr.soleil.comete.swing.ScrollPane;
import fr.soleil.comete.swing.TextArea;
import fr.soleil.lib.project.ObjectUtils;
import fr.soleil.lib.project.swing.ConstrainedCheckBox;
public class ArchivingPanel extends Panel {
private static final long serialVersionUID = 4152804760597320463L;
private static final long serialVersionUID = 4669817673447062259L;
private static final ResourceBundle MESSAGES = ResourceBundle
.getBundle("org.cdma.gui.databrowser.impl.cdma.db.messages");
......@@ -40,7 +41,7 @@ public class ArchivingPanel extends Panel {
private ISourceDevice allArchivedSource;
private IDeviceSelector archivingSelector;
private IComponent archivingComponent;
private JCheckBox longTerm;
private ConstrainedCheckBox longTerm;
private FileBrowserFieldButton fileBrowser;
private TextArea deviceArea;
......@@ -63,7 +64,8 @@ public class ArchivingPanel extends Panel {
setLayout(new BorderLayout());
if (archivingSelector != null) {
final JCheckBox currentAttributeCB = new JCheckBox(MESSAGES.getString("Mambo.CurrentArchived"));
final ConstrainedCheckBox currentAttributeCB = new ConstrainedCheckBox(
MESSAGES.getString("Mambo.CurrentArchived"));
currentAttributeCB.setSelected(true);
currentAttributeCB.addActionListener(new ActionListener() {
......@@ -94,7 +96,7 @@ public class ArchivingPanel extends Panel {
add(optionsPanel, BorderLayout.EAST);
JPanel southPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
final JCheckBox userFileCB = new JCheckBox("Save VC configuration");
final ConstrainedCheckBox userFileCB = new ConstrainedCheckBox("Save VC configuration");
southPanel.add(userFileCB);
userFileCB.addActionListener(new ActionListener() {
@Override
......@@ -103,7 +105,7 @@ public class ArchivingPanel extends Panel {
fileBrowser.setEnabled(selected);
fileBrowser.setEditable(selected);
if (!selected) {
fileBrowser.setText("");
fileBrowser.setText(ObjectUtils.EMPTY_STRING);
fileBrowser.setFile(null);
}
}
......@@ -117,7 +119,7 @@ public class ArchivingPanel extends Panel {
southPanel.add(fileBrowser);
if (!hdb) {
longTerm = new JCheckBox("Long term");
longTerm = new ConstrainedCheckBox("Long term");
southPanel.add(longTerm);
}
......
......@@ -17,7 +17,6 @@ import java.util.TimerTask;
import javax.swing.GroupLayout;
import javax.swing.GroupLayout.Alignment;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
......@@ -31,9 +30,11 @@ import javax.swing.WindowConstants;
import org.cdma.gui.databrowser.util.ApplicationUtil;
import fr.soleil.lib.project.swing.ConstrainedCheckBox;
public class OptionsPanel extends JPanel implements ActionListener {
private static final long serialVersionUID = -8035260160935330256L;
private static final long serialVersionUID = -6076963091951258987L;
private static final boolean USE_TIMER = true;
private static final boolean OVERRIDE_DEFAULT_VALUE = false;
......@@ -50,14 +51,12 @@ public class OptionsPanel extends JPanel implements ActionListener {
private static final String MONTH_VALUE = "MONTH";
private static enum SamplingPeriod {
NONE(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.None"), NONE_VALUE), SECOND(
DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Second"),
SECOND_VALUE), MINUTE(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Minute"),
MINUTE_VALUE), HOUR(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Hour"),
HOUR_VALUE), DAY(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Day"),
DAY_VALUE), MONTH(
DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Month"),
MONTH_VALUE);
NONE(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.None"), NONE_VALUE),
SECOND(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Second"), SECOND_VALUE),
MINUTE(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Minute"), MINUTE_VALUE),
HOUR(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Hour"), HOUR_VALUE),
DAY(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Day"), DAY_VALUE),
MONTH(DBDataSourceSeeker.MESSAGES.getString("Sampling.SamplingStep.Month"), MONTH_VALUE);
private String name;
private String value;
......@@ -78,17 +77,13 @@ public class OptionsPanel extends JPanel implements ActionListener {
}
private static enum TimeRange {
LAST_1H(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last1H"), 1 * HOUR_IN_SECONDS), LAST_4H(
DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last4H"),
4 * HOUR_IN_SECONDS), LAST_8H(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last8H"),
8 * HOUR_IN_SECONDS), LAST_1D(
DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last1D"),
1 * DAY_IN_SECONDS), LAST_3D(
DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last3D"),
3 * DAY_IN_SECONDS), LAST_7D(
DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last7D"),
7 * DAY_IN_SECONDS), LAST_30D(DBDataSourceSeeker.MESSAGES.getString(
"TimeRange.DynamicRange.Last30D"), 30 * DAY_IN_SECONDS);
LAST_1H(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last1H"), 1 * HOUR_IN_SECONDS),
LAST_4H(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last4H"), 4 * HOUR_IN_SECONDS),
LAST_8H(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last8H"), 8 * HOUR_IN_SECONDS),
LAST_1D(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last1D"), 1 * DAY_IN_SECONDS),
LAST_3D(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last3D"), 3 * DAY_IN_SECONDS),
LAST_7D(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last7D"), 7 * DAY_IN_SECONDS),
LAST_30D(DBDataSourceSeeker.MESSAGES.getString("TimeRange.DynamicRange.Last30D"), 30 * DAY_IN_SECONDS);
private String name;
private Long delta;
......@@ -110,8 +105,8 @@ public class OptionsPanel extends JPanel implements ActionListener {
private static final String HUMAN_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
private JCheckBox overrideCheckbox;
private JCheckBox dynamicCheckbox;
private ConstrainedCheckBox overrideCheckbox;
private ConstrainedCheckBox dynamicCheckbox;
private JComboBox<TimeRange> rangeCombo;
private JComboBox<SamplingPeriod> samplingCombo;
private JSpinner startField;
......@@ -134,10 +129,10 @@ public class OptionsPanel extends JPanel implements ActionListener {
}
private void initComponents() {
overrideCheckbox = new JCheckBox(DBDataSourceSeeker.MESSAGES.getString("TimeRange.Override"),
overrideCheckbox = new ConstrainedCheckBox(DBDataSourceSeeker.MESSAGES.getString("TimeRange.Override"),
OVERRIDE_DEFAULT_VALUE);
dynamicCheckbox = new JCheckBox(DBDataSourceSeeker.MESSAGES.getString("TimeRange.Dynamic"),
dynamicCheckbox = new ConstrainedCheckBox(DBDataSourceSeeker.MESSAGES.getString("TimeRange.Dynamic"),
DYNAMIC_DEFAULT_VALUE);
rangeCombo = new JComboBox<>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment