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

Timestamp:

2014-10-19T01:27:04+02:00 (12 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/PanelLit.java (modified) (15 diffs)

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

@@ -21 +21 @@
         private FocusListener flGroup = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setLightAtt(Att.GRP, 0, groupBox.getText());
+                        SmedAction.panelMain.mark.setLightAtt(Att.GRP, 0, groupBox.getText());
                 }
         };
@@ -28 +28 @@
         private FocusListener flPeriod = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setLightAtt(Att.PER, 0, periodBox.getText());
+                        SmedAction.panelMain.mark.setLightAtt(Att.PER, 0, periodBox.getText());
                 }
         };
@@ -35 +35 @@
         private FocusListener flSequence = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setLightAtt(Att.SEQ, 0, sequenceBox.getText());
+                        SmedAction.panelMain.mark.setLightAtt(Att.SEQ, 0, sequenceBox.getText());
                 }
         };
@@ -46 +46 @@
                                 int idx = visibilities.get(vis);
                                 if (idx == visibilityBox.getSelectedIndex())
-                                        dlg.panelMain.mark.setLightAtt(Att.VIS, 0, vis);
+                                        SmedAction.panelMain.mark.setLightAtt(Att.VIS, 0, vis);
                         }
                 }
@@ -54 +54 @@
         private FocusListener flHeight = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setLightAtt(Att.HGT, 0, heightBox.getText());
+                        SmedAction.panelMain.mark.setLightAtt(Att.HGT, 0, heightBox.getText());
                 }
         };
@@ -61 +61 @@
         private FocusListener flRange = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setLightAtt(Att.RNG, 0, rangeBox.getText());
+                        SmedAction.panelMain.mark.setLightAtt(Att.RNG, 0, rangeBox.getText());
                 }
         };
@@ -68 +68 @@
         private FocusListener flOrientation = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setLightAtt(Att.ORT, 0, orientationBox.getText());
+                        SmedAction.panelMain.mark.setLightAtt(Att.ORT, 0, orientationBox.getText());
                 }
         };
@@ -75 +75 @@
         private FocusListener flMultiple = new FocusAdapter() {
                 public void focusLost(java.awt.event.FocusEvent e) {
-                        dlg.panelMain.mark.setLightAtt(Att.MLT, 0, multipleBox.getText());
+                        SmedAction.panelMain.mark.setLightAtt(Att.MLT, 0, multipleBox.getText());
                 }
         };
@@ -86 +86 @@
                                 int idx = categories.get(lit);
                                 if (idx == categoryBox.getSelectedIndex())
-                                        dlg.panelMain.mark.setLightAtt(Att.LIT, 0, lit);
-                        }
-                        if (dlg.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.DIR) {
-                                dlg.panelMain.mark.setLightAtt(Att.MLT, 0, "");
+                                        SmedAction.panelMain.mark.setLightAtt(Att.LIT, 0, lit);
+                        }
+                        if (SmedAction.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.DIR) {
+                                SmedAction.panelMain.mark.setLightAtt(Att.MLT, 0, "");
                                 multipleBox.setText("");
                                 orientationLabel.setVisible(true);
@@ -95 +95 @@
                                 multipleLabel.setVisible(false);
                                 multipleBox.setVisible(false);
-                        } else if ((dlg.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.VERT) || (dlg.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.HORIZ)) {
-                                dlg.panelMain.mark.setLightAtt(Att.ORT, 0, "");
+                        } else if ((SmedAction.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.VERT) || (SmedAction.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.HORIZ)) {
+                                SmedAction.panelMain.mark.setLightAtt(Att.ORT, 0, "");
                                 orientationBox.setText("");
                                 orientationLabel.setVisible(false);
@@ -103 +103 @@
                                 multipleBox.setVisible(true);
                         } else {
-                                dlg.panelMain.mark.setLightAtt(Att.MLT, 0, "");
+                                SmedAction.panelMain.mark.setLightAtt(Att.MLT, 0, "");
                                 multipleBox.setText("");
-                                dlg.panelMain.mark.setLightAtt(Att.ORT, 0, "");
+                                SmedAction.panelMain.mark.setLightAtt(Att.ORT, 0, "");
                                 orientationBox.setText("");
                                 orientationLabel.setVisible(false);
@@ -122 +122 @@
                                 int idx = exhibitions.get(exh);
                                 if (idx == exhibitionBox.getSelectedIndex())
-                                        dlg.panelMain.mark.setLightAtt(Att.EXH, 0, exh);
+                                        SmedAction.panelMain.mark.setLightAtt(Att.EXH, 0, exh);
                         }
                 }
@@ -137 +137 @@
                         } else {
                                 panelSector.setVisible(false);
-                                while (dlg.panelMain.mark.getSectorCount() > 1)
-                                        dlg.panelMain.mark.delLight(1);
+                                while (SmedAction.panelMain.mark.getSectorCount() > 1)
+                                        SmedAction.panelMain.mark.delLight(1);
                         }
                 }
@@ -285 +285 @@
                 multipleLabel.setVisible(false);
                 multipleBox.setVisible(false);
-                groupBox.setText((String)dlg.panelMain.mark.getLightAtt(Att.GRP, 0));
-                periodBox.setText((String)dlg.panelMain.mark.getLightAtt(Att.PER, 0));
-                sequenceBox.setText((String)dlg.panelMain.mark.getLightAtt(Att.SEQ, 0));
-                heightBox.setText((String)dlg.panelMain.mark.getLightAtt(Att.HGT, 0));
-                rangeBox.setText((String)dlg.panelMain.mark.getLightAtt(Att.RNG, 0));
-                orientationBox.setText((String)dlg.panelMain.mark.getLightAtt(Att.ORT, 0));
-                orientationBox.setVisible(dlg.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.DIR);
-                multipleBox.setText((String)dlg.panelMain.mark.getLightAtt(Att.MLT, 0));
-                multipleBox.setVisible((dlg.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.VERT) || (dlg.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.HORIZ));
+                groupBox.setText((String)SmedAction.panelMain.mark.getLightAtt(Att.GRP, 0));
+                periodBox.setText((String)SmedAction.panelMain.mark.getLightAtt(Att.PER, 0));
+                sequenceBox.setText((String)SmedAction.panelMain.mark.getLightAtt(Att.SEQ, 0));
+                heightBox.setText((String)SmedAction.panelMain.mark.getLightAtt(Att.HGT, 0));
+                rangeBox.setText((String)SmedAction.panelMain.mark.getLightAtt(Att.RNG, 0));
+                orientationBox.setText((String)SmedAction.panelMain.mark.getLightAtt(Att.ORT, 0));
+                orientationBox.setVisible(SmedAction.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.DIR);
+                multipleBox.setText((String)SmedAction.panelMain.mark.getLightAtt(Att.MLT, 0));
+                multipleBox.setVisible((SmedAction.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.VERT) || (SmedAction.panelMain.mark.getLightAtt(Att.LIT, 0) == Lit.HORIZ));
                 for (Vis vis : visibilities.keySet()) {
                         int item = visibilities.get(vis);
-                        if (dlg.panelMain.mark.getLightAtt(Att.VIS, 0) == vis)
+                        if (SmedAction.panelMain.mark.getLightAtt(Att.VIS, 0) == vis)
                                 visibilityBox.setSelectedIndex(item);
                 }
                 for (Lit lit : categories.keySet()) {
                         int item = categories.get(lit);
-                        if (dlg.panelMain.mark.getLightAtt(Att.LIT, 0) == lit)
+                        if (SmedAction.panelMain.mark.getLightAtt(Att.LIT, 0) == lit)
                                 categoryBox.setSelectedIndex(item);
                 }
                 for (Exh exh : exhibitions.keySet()) {
                         int item = exhibitions.get(exh);
-                        if (dlg.panelMain.mark.getLightAtt(Att.EXH, 0) == exh)
+                        if (SmedAction.panelMain.mark.getLightAtt(Att.EXH, 0) == exh)
                                 exhibitionBox.setSelectedIndex(item);
                 }
-                if (dlg.panelMain.mark.isSectored()) {
+                if (SmedAction.panelMain.mark.isSectored()) {
                         singleButton.setBorderPainted(false);
                         sectorButton.setBorderPainted(true);
@@ -317 +317 @@
                         sectorButton.setBorderPainted(false);
                         panelSector.setVisible(false);
-                        while (dlg.panelMain.mark.getSectorCount() > 1)
-                                dlg.panelMain.mark.delLight(dlg.panelMain.mark.getSectorCount() - 1);
+                        while (SmedAction.panelMain.mark.getSectorCount() > 1)
+                                SmedAction.panelMain.mark.delLight(SmedAction.panelMain.mark.getSectorCount() - 1);
                 }
                 panelCol.syncPanel();