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

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

@@ -27 +27 @@
                                 JRadioButton button = shapes.get(shp);
                                 if (button.isSelected()) {
-                                        dlg.panelMain.mark.setShape(shp);
-                                        dlg.panelMain.mark.setObject(objects.get(shp));
+                                        SmedAction.panelMain.mark.setShape(shp);
+                                        SmedAction.panelMain.mark.setObject(objects.get(shp));
                                         button.setBorderPainted(true);
                                 } else
                                         button.setBorderPainted(false);
                         }
-                        if (dlg.panelMain.mark.testValid()) {
-                                dlg.panelMain.panelChan.topmarkButton.setVisible(true);
-                                dlg.panelMain.mark.setObjPattern(Pat.VSTRP);
-                                dlg.panelMain.mark.setObjColour(Col.RED);
-                                dlg.panelMain.mark.addObjColour(Col.WHITE);
+                        if (SmedAction.panelMain.mark.testValid()) {
+                                SmedAction.panelMain.panelChan.topmarkButton.setVisible(true);
+                                SmedAction.panelMain.mark.setObjPattern(Pat.VSTRP);
+                                SmedAction.panelMain.mark.setObjColour(Col.RED);
+                                SmedAction.panelMain.mark.addObjColour(Col.WHITE);
                         } else {
-                                dlg.panelMain.panelChan.topmarkButton.setVisible(false);
+                                SmedAction.panelMain.panelChan.topmarkButton.setVisible(false);
                         }
-                        dlg.panelMain.panelMore.syncPanel();
+                        SmedAction.panelMain.panelMore.syncPanel();
                 }
         };
@@ -58 +58 @@
                 for (Shp shp : shapes.keySet()) {
                         JRadioButton button = shapes.get(shp);
-                        if (dlg.panelMain.mark.getShape() == shp) {
+                        if (SmedAction.panelMain.mark.getShape() == shp) {
                                 button.setBorderPainted(true);
                         } else
                                 button.setBorderPainted(false);
                 }
-                dlg.panelMain.mark.testValid();
+                SmedAction.panelMain.mark.testValid();
         }