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

Use WindowConstants.EXIT_ON_CLOSE instead of JFrame.EXIT_ON_CLOSE

parent b7ae5a61
Branches
Tags v1.2.0-6800
No related merge requests found
...@@ -27,6 +27,7 @@ import javax.swing.LayoutStyle.ComponentPlacement; ...@@ -27,6 +27,7 @@ import javax.swing.LayoutStyle.ComponentPlacement;
import javax.swing.SpinnerDateModel; import javax.swing.SpinnerDateModel;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import javax.swing.WindowConstants;
import org.cdma.gui.databrowser.DataBrowser; import org.cdma.gui.databrowser.DataBrowser;
...@@ -403,7 +404,7 @@ public class OptionsPanel extends JPanel implements ActionListener { ...@@ -403,7 +404,7 @@ public class OptionsPanel extends JPanel implements ActionListener {
final OptionsPanel optionsPanel = new OptionsPanel(); final OptionsPanel optionsPanel = new OptionsPanel();
JFrame frame = new JFrame("Test options panel"); JFrame frame = new JFrame("Test options panel");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.setContentPane(optionsPanel); frame.setContentPane(optionsPanel);
......
...@@ -17,6 +17,7 @@ import javax.swing.JFrame; ...@@ -17,6 +17,7 @@ import javax.swing.JFrame;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.WindowConstants;
import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
import javax.swing.plaf.basic.BasicComboBoxEditor; import javax.swing.plaf.basic.BasicComboBoxEditor;
...@@ -192,7 +193,7 @@ public class DevicePanel extends Panel implements DocumentListener { ...@@ -192,7 +193,7 @@ public class DevicePanel extends Panel implements DocumentListener {
DevicePanel devicePanel = new DevicePanel(); DevicePanel devicePanel = new DevicePanel();
JFrame frame = new JFrame("Test device panel"); JFrame frame = new JFrame("Test device panel");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.setContentPane(devicePanel); frame.setContentPane(devicePanel);
......
...@@ -17,6 +17,7 @@ import javax.swing.JComponent; ...@@ -17,6 +17,7 @@ import javax.swing.JComponent;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.WindowConstants;
import org.cdma.gui.databrowser.util.ReverseLabelUI; import org.cdma.gui.databrowser.util.ReverseLabelUI;
...@@ -153,7 +154,7 @@ public class ScalarRowPanel extends JPanel { ...@@ -153,7 +154,7 @@ public class ScalarRowPanel extends JPanel {
public static void main(String[] args) { public static void main(String[] args) {
JFrame frame = new JFrame(); JFrame frame = new JFrame();
frame.setTitle("Test ScalarRowPanel"); frame.setTitle("Test ScalarRowPanel");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
JPanel mainPanel = new JPanel(); JPanel mainPanel = new JPanel();
GridBagConstraints gbc = new GridBagConstraints(); GridBagConstraints gbc = new GridBagConstraints();
...@@ -167,15 +168,15 @@ public class ScalarRowPanel extends JPanel { ...@@ -167,15 +168,15 @@ public class ScalarRowPanel extends JPanel {
"*************mon super attribute qui a un très long nom de malade**************************"); "*************mon super attribute qui a un très long nom de malade**************************");
// TextArea textArea = new TextArea(); // TextArea textArea = new TextArea();
AdaptableTextArea adaptableTextArea = new AdaptableTextArea(); AdaptableTextArea adaptableTextArea = new AdaptableTextArea();
adaptableTextArea adaptableTextArea.setText(
.setText("la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************"); "la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************");
CheckBox c2b = new CheckBox(); CheckBox c2b = new CheckBox();
ScalarRowPanel panel = new ScalarRowPanel(label, adaptableTextArea, c2b); ScalarRowPanel panel = new ScalarRowPanel(label, adaptableTextArea, c2b);
JLabel label2 = new JLabel("*************mon super attribute 2 **************************"); JLabel label2 = new JLabel("*************mon super attribute 2 **************************");
TextArea textArea2 = new TextArea(); TextArea textArea2 = new TextArea();
textArea2 textArea2.setText(
.setText("la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************"); "la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************");
CheckBox cb = new CheckBox(); CheckBox cb = new CheckBox();
ScalarRowPanel panel2 = new ScalarRowPanel(label2, textArea2, cb); ScalarRowPanel panel2 = new ScalarRowPanel(label2, textArea2, cb);
......
...@@ -18,6 +18,7 @@ import javax.swing.JList; ...@@ -18,6 +18,7 @@ import javax.swing.JList;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel; import javax.swing.ListSelectionModel;
import javax.swing.WindowConstants;
public class SelectDataNumberMatrix extends JDialog { public class SelectDataNumberMatrix extends JDialog {
...@@ -150,6 +151,6 @@ public class SelectDataNumberMatrix extends JDialog { ...@@ -150,6 +151,6 @@ public class SelectDataNumberMatrix extends JDialog {
f.setSize(400, 200); f.setSize(400, 200);
f.setVisible(true); f.setVisible(true);
f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
} }
} }
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JTabbedPane; import javax.swing.JTabbedPane;
import javax.swing.WindowConstants;
import org.cdma.gui.databrowser.DataBrowser; import org.cdma.gui.databrowser.DataBrowser;
import org.cdma.gui.databrowser.DataBrowserController; import org.cdma.gui.databrowser.DataBrowserController;
...@@ -148,9 +149,9 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer { ...@@ -148,9 +149,9 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
dockingArea = getDockingArea(); dockingArea = getDockingArea();
if (dockingArea != null && tabChartSpectrumViewer != null) { if (dockingArea != null && tabChartSpectrumViewer != null) {
IView createView = controller.getDockingUtil() IView createView = controller.getDockingUtil().createView(name,
.createView(name, DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), name, DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), name, tabChartSpectrumViewer,
tabChartSpectrumViewer, dockingArea); dockingArea);
spectrumViewerMap.put(name, createView); spectrumViewerMap.put(name, createView);
createView.setClosable(true); createView.setClosable(true);
} }
...@@ -249,7 +250,7 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer { ...@@ -249,7 +250,7 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
frame.setContentPane(new SpectrumViewer(null, false)); frame.setContentPane(new SpectrumViewer(null, false));
frame.setVisible(true); frame.setVisible(true);
frame.setSize(500, 500); frame.setSize(500, 500);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment