diff --git a/src/main/java/org/cdma/gui/databrowser/impl/cdma/db/OptionsPanel.java b/src/main/java/org/cdma/gui/databrowser/impl/cdma/db/OptionsPanel.java index 42dd8738fd785f43273061be70753251cd250e87..cf15a415cb2d2be78a789d2fd7ccf700694ca83d 100644 --- a/src/main/java/org/cdma/gui/databrowser/impl/cdma/db/OptionsPanel.java +++ b/src/main/java/org/cdma/gui/databrowser/impl/cdma/db/OptionsPanel.java @@ -27,6 +27,7 @@ import javax.swing.LayoutStyle.ComponentPlacement; import javax.swing.SpinnerDateModel; import javax.swing.SpinnerNumberModel; import javax.swing.SwingConstants; +import javax.swing.WindowConstants; import org.cdma.gui.databrowser.DataBrowser; @@ -403,7 +404,7 @@ public class OptionsPanel extends JPanel implements ActionListener { final OptionsPanel optionsPanel = new OptionsPanel(); JFrame frame = new JFrame("Test options panel"); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); frame.setContentPane(optionsPanel); diff --git a/src/main/java/org/cdma/gui/databrowser/impl/tango/DevicePanel.java b/src/main/java/org/cdma/gui/databrowser/impl/tango/DevicePanel.java index c2961e8b4b8fe63088653b2146954e762fc87aec..d4e07b2c447308c1194a7e0cff8621eb081b0b9e 100644 --- a/src/main/java/org/cdma/gui/databrowser/impl/tango/DevicePanel.java +++ b/src/main/java/org/cdma/gui/databrowser/impl/tango/DevicePanel.java @@ -17,6 +17,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; +import javax.swing.WindowConstants; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.plaf.basic.BasicComboBoxEditor; @@ -192,7 +193,7 @@ public class DevicePanel extends Panel implements DocumentListener { DevicePanel devicePanel = new DevicePanel(); JFrame frame = new JFrame("Test device panel"); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); frame.setContentPane(devicePanel); diff --git a/src/main/java/org/cdma/gui/databrowser/view/item/ScalarRowPanel.java b/src/main/java/org/cdma/gui/databrowser/view/item/ScalarRowPanel.java index fd1b119a332cb678611f9925036d779e70e7a76e..fa4612efd20b42a71106bb52933ebf4ac5d35985 100644 --- a/src/main/java/org/cdma/gui/databrowser/view/item/ScalarRowPanel.java +++ b/src/main/java/org/cdma/gui/databrowser/view/item/ScalarRowPanel.java @@ -17,6 +17,7 @@ import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.WindowConstants; import org.cdma.gui.databrowser.util.ReverseLabelUI; @@ -30,9 +31,9 @@ public class ScalarRowPanel extends JPanel { private static final long serialVersionUID = 2717045564359584102L; - //private static final Color BACKGROUND_SELECTION_COLOR = Color.CYAN; + // private static final Color BACKGROUND_SELECTION_COLOR = Color.CYAN; private static final int LABEL_WIDTH = 150; - //private static final int AREA_WIDTH = 500; + // private static final int AREA_WIDTH = 500; private static final int FIELD_WIDTH = 200; private static final int LABEL_HEIGHT = 25; // TODO avisto: we could use a matte border to highlight the selected row @@ -59,7 +60,7 @@ public class ScalarRowPanel extends JPanel { private void initComponents() { setLayout(new BorderLayout()); - //setBackground(BACKGROUND_SELECTION_COLOR); + // setBackground(BACKGROUND_SELECTION_COLOR); setSelected(false); } @@ -153,7 +154,7 @@ public class ScalarRowPanel extends JPanel { public static void main(String[] args) { JFrame frame = new JFrame(); frame.setTitle("Test ScalarRowPanel"); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); JPanel mainPanel = new JPanel(); GridBagConstraints gbc = new GridBagConstraints(); @@ -167,15 +168,15 @@ public class ScalarRowPanel extends JPanel { "*************mon super attribute qui a un très long nom de malade**************************"); // TextArea textArea = new TextArea(); AdaptableTextArea adaptableTextArea = new AdaptableTextArea(); - adaptableTextArea - .setText("la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************"); + adaptableTextArea.setText( + "la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************"); CheckBox c2b = new CheckBox(); ScalarRowPanel panel = new ScalarRowPanel(label, adaptableTextArea, c2b); JLabel label2 = new JLabel("*************mon super attribute 2 **************************"); TextArea textArea2 = new TextArea(); - textArea2 - .setText("la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************"); + textArea2.setText( + "la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************"); CheckBox cb = new CheckBox(); ScalarRowPanel panel2 = new ScalarRowPanel(label2, textArea2, cb); diff --git a/src/main/java/org/cdma/gui/databrowser/view/item/SelectDataNumberMatrix.java b/src/main/java/org/cdma/gui/databrowser/view/item/SelectDataNumberMatrix.java index f1f503ea1178917fd860637090bbbee47573d4f6..8ef14424771abe978f79b3ad9833b5ed52d41e8a 100644 --- a/src/main/java/org/cdma/gui/databrowser/view/item/SelectDataNumberMatrix.java +++ b/src/main/java/org/cdma/gui/databrowser/view/item/SelectDataNumberMatrix.java @@ -18,6 +18,7 @@ import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; +import javax.swing.WindowConstants; public class SelectDataNumberMatrix extends JDialog { @@ -150,6 +151,6 @@ public class SelectDataNumberMatrix extends JDialog { f.setSize(400, 200); f.setVisible(true); - f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); } } diff --git a/src/main/java/org/cdma/gui/databrowser/view/item/SpectrumViewer.java b/src/main/java/org/cdma/gui/databrowser/view/item/SpectrumViewer.java index 951d0dc0994233738f3ddbc20d502ad39721b2c8..3934fd6241e7f9d6d190563859cda6bb541ba78a 100644 --- a/src/main/java/org/cdma/gui/databrowser/view/item/SpectrumViewer.java +++ b/src/main/java/org/cdma/gui/databrowser/view/item/SpectrumViewer.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JTabbedPane; +import javax.swing.WindowConstants; import org.cdma.gui.databrowser.DataBrowser; import org.cdma.gui.databrowser.DataBrowserController; @@ -125,7 +126,7 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer { String name = "Custom chart n°" + String.valueOf(counter); manyTabChartSpectrum = new ChartSpectrumViewer(null); dockingArea = getDockingArea(); - + IView createView = controller.getDockingUtil().createView(name, DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), name, manyTabChartSpectrum, dockingArea); spectrumViewerMap.put(name, createView); @@ -148,9 +149,9 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer { dockingArea = getDockingArea(); if (dockingArea != null && tabChartSpectrumViewer != null) { - IView createView = controller.getDockingUtil() - .createView(name, DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), name, - tabChartSpectrumViewer, dockingArea); + IView createView = controller.getDockingUtil().createView(name, + DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), name, tabChartSpectrumViewer, + dockingArea); spectrumViewerMap.put(name, createView); createView.setClosable(true); } @@ -231,7 +232,7 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer { public boolean isOpenTabWithManyItem() { return openTabWithManyItem; } - + public void setOpenTabWithManyItem(boolean openTabWithManyItem) { this.openTabWithManyItem = openTabWithManyItem; } @@ -239,7 +240,7 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer { public boolean isAllItemsIsInTab() { return allItemsIsInTab; } - + public void setAllItemsIsInTab(boolean allItemsIsInTab) { this.allItemsIsInTab = allItemsIsInTab; } @@ -249,7 +250,7 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer { frame.setContentPane(new SpectrumViewer(null, false)); frame.setVisible(true); frame.setSize(500, 500); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); }