Changeset 30738 in osm for applications/editors/josm/plugins/smed/src/panels/PanelRadar.java

Timestamp:

2014-10-19T01:27:04+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

File:

• applications/editors/josm/plugins/smed/src/panels/PanelRadar.java (modified) (10 diffs)

applications/editors/josm/plugins/smed/src/panels/PanelRadar.java

@@ -35 +35 @@
                                 int idx = radioCats.get(cat);
                                 if (dlg.node != null && (idx == radioCatBox.getSelectedIndex())) {
-                                        dlg.panelMain.mark.setRadio(cat);
+                                        SmedAction.panelMain.mark.setRadio(cat);
                                 }
                         }
@@ -52 +52 @@
                                 JRadioButton button = rads.get(rtb);
                                 if (button.isSelected()) {
-                                        dlg.panelMain.mark.setRadar(rtb);
+                                        SmedAction.panelMain.mark.setRadar(rtb);
                                 }
                         }
@@ -62 +62 @@
         private FocusListener flGroup = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setRaconGroup(groupBox.getText());
+                        SmedAction.panelMain.mark.setRaconGroup(groupBox.getText());
                 }
         };
@@ -69 +69 @@
         private FocusListener flPeriod = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setRaconPeriod(periodBox.getText());
+                        SmedAction.panelMain.mark.setRaconPeriod(periodBox.getText());
                 }
         };
@@ -76 +76 @@
         private FocusListener flSeq = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setRaconSequence(seqBox.getText());
+                        SmedAction.panelMain.mark.setRaconSequence(seqBox.getText());
                 }
         };
@@ -83 +83 @@
         private FocusListener flRange = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setRaconRange(rangeBox.getText());
+                        SmedAction.panelMain.mark.setRaconRange(rangeBox.getText());
                 }
         };
@@ -90 +90 @@
         private FocusListener flSector1 = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setRaconSector1(sector1Box.getText());
+                        SmedAction.panelMain.mark.setRaconSector1(sector1Box.getText());
                 }
         };
@@ -97 +97 @@
         private FocusListener flSector2 = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setRaconSector2(sector2Box.getText());
+                        SmedAction.panelMain.mark.setRaconSector2(sector2Box.getText());
                 }
         };
@@ -204 +204 @@
 
         public void syncPanel() {
-                boolean rad = ((dlg.panelMain.mark.getRadar() != Rtb.NORTB) && (dlg.panelMain.mark.getRadar() != Rtb.REFLECTOR));
+                boolean rad = ((SmedAction.panelMain.mark.getRadar() != Rtb.NORTB) && (SmedAction.panelMain.mark.getRadar() != Rtb.REFLECTOR));
                 groupLabel.setVisible(rad);
                 groupBox.setVisible(rad);
@@ -219 +219 @@
                 sectorsLabel.setVisible(rad);
                 for (Rtb rtb : rads.keySet()) {
-                        rads.get(rtb).setBorderPainted(dlg.panelMain.mark.getRadar() == rtb);
-                }
-                groupBox.setText(dlg.panelMain.mark.getRaconGroup());
-                seqBox.setText(dlg.panelMain.mark.getRaconSequence());
-                periodBox.setText(dlg.panelMain.mark.getRaconPeriod());
-                rangeBox.setText(dlg.panelMain.mark.getRaconRange());
-                sector1Box.setText(dlg.panelMain.mark.getRaconSector1());
-                sector2Box.setText(dlg.panelMain.mark.getRaconSector2());
-                aisButton.setSelected(dlg.panelMain.mark.getRadio() != Cat.NOROS);
+                        rads.get(rtb).setBorderPainted(SmedAction.panelMain.mark.getRadar() == rtb);
+                }
+                groupBox.setText(SmedAction.panelMain.mark.getRaconGroup());
+                seqBox.setText(SmedAction.panelMain.mark.getRaconSequence());
+                periodBox.setText(SmedAction.panelMain.mark.getRaconPeriod());
+                rangeBox.setText(SmedAction.panelMain.mark.getRaconRange());
+                sector1Box.setText(SmedAction.panelMain.mark.getRaconSector1());
+                sector2Box.setText(SmedAction.panelMain.mark.getRaconSector2());
+                aisButton.setSelected(SmedAction.panelMain.mark.getRadio() != Cat.NOROS);
                 aisButton.setBorderPainted(aisButton.isSelected());
-                radioCatBox.setVisible(dlg.panelMain.mark.getRadio() != Cat.NOROS);
+                radioCatBox.setVisible(SmedAction.panelMain.mark.getRadio() != Cat.NOROS);
         }