Changeset 30738 in osm for applications/editors/josm/plugins/smed/src/panels/PanelChr.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/PanelChr.java (modified) (5 diffs)

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

@@ -67 +67 @@
                         }
                         String str = charBox.getText();
-                        dlg.panelMain.mark.setLightAtt(Att.CHR, 0, str);
+                        SmedAction.panelMain.mark.setLightAtt(Att.CHR, 0, str);
                         if (!str.contains("Al")) {
-                                col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.COL, 0)));
-                                dlg.panelMain.mark.setLightAtt(Att.ALT, 0, Col.UNKCOL);
+                                col2Label.setBackground(SeaMark.ColMAP.get(SmedAction.panelMain.mark.getLightAtt(Att.COL, 0)));
+                                SmedAction.panelMain.mark.setLightAtt(Att.ALT, 0, Col.UNKCOL);
                         } else {
-                                col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.ALT, 0)));
+                                col2Label.setBackground(SeaMark.ColMAP.get(SmedAction.panelMain.mark.getLightAtt(Att.ALT, 0)));
                         }
                 }
@@ -80 +80 @@
                         public void focusLost(java.awt.event.FocusEvent e) {
                         String str = charBox.getText();
-                        dlg.panelMain.mark.setLightAtt(Att.CHR, 0, str);
+                        SmedAction.panelMain.mark.setLightAtt(Att.CHR, 0, str);
                         EnumSet<Chr> set = EnumSet.noneOf(Chr.class);
                         for (EnumSet<Chr> map : SeaMark.ChrMAP.keySet()) {
@@ -99 +99 @@
                         }
                         if (!str.contains("Al")) {
-                                col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.COL, 0)));
-                                dlg.panelMain.mark.setLightAtt(Att.ALT, 0, Col.UNKCOL);
+                                col2Label.setBackground(SeaMark.ColMAP.get(SmedAction.panelMain.mark.getLightAtt(Att.COL, 0)));
+                                SmedAction.panelMain.mark.setLightAtt(Att.ALT, 0, Col.UNKCOL);
                         } else {
-                                col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.ALT, 0)));
+                                col2Label.setBackground(SeaMark.ColMAP.get(SmedAction.panelMain.mark.getLightAtt(Att.ALT, 0)));
                         }
                 }
@@ -141 +141 @@
 
         public void syncPanel() {
-                String str = (String)dlg.panelMain.mark.getLightAtt(Att.CHR, 0);
+                String str = (String)SmedAction.panelMain.mark.getLightAtt(Att.CHR, 0);
                 charBox.setText(str);
                 EnumSet<Chr> set = EnumSet.noneOf(Chr.class);
@@ -151 +151 @@
                 }
                 if (!str.contains("Al")) {
-                        col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.COL, 0)));
+                        col2Label.setBackground(SeaMark.ColMAP.get(SmedAction.panelMain.mark.getLightAtt(Att.COL, 0)));
                 } else {
-                        col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.ALT, 0)));
+                        col2Label.setBackground(SeaMark.ColMAP.get(SmedAction.panelMain.mark.getLightAtt(Att.ALT, 0)));
                 }
-                col1Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.COL, 0)));
+                col1Label.setBackground(SeaMark.ColMAP.get(SmedAction.panelMain.mark.getLightAtt(Att.COL, 0)));
                 for (Chr chr : buttons.keySet()) {
                         JToggleButton button = buttons.get(chr);