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

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

@@ -24 +24 @@
                                 int idx = categories.get(cat);
                                 if (dlg.node != null && (idx == categoryBox.getSelectedIndex()))
-                                        dlg.panelMain.mark.setCategory(cat);
+                                        SmedAction.panelMain.mark.setCategory(cat);
                         }
                 }
@@ -35 +35 @@
                                 int idx = moorings.get(cat);
                                 if (dlg.node != null && (idx == mooringBox.getSelectedIndex())) {
-                                        dlg.panelMain.mark.setCategory(cat);
+                                        SmedAction.panelMain.mark.setCategory(cat);
                                         if ((cat == Cat.INB_CALM) || (cat == Cat.INB_SBM)) {
-                                                dlg.panelMain.mark.setObject(Obj.BOYINB);
-                                                dlg.panelMain.mark.setShape(Shp.UNKSHP);
+                                                SmedAction.panelMain.mark.setObject(Obj.BOYINB);
+                                                SmedAction.panelMain.mark.setShape(Shp.UNKSHP);
                                         } else {
-                                                dlg.panelMain.mark.setObject(Obj.MORFAC);
+                                                SmedAction.panelMain.mark.setObject(Obj.MORFAC);
                                                 if (cat != Cat.MOR_BUOY)
-                                                        dlg.panelMain.mark.setShape(Shp.UNKSHP);
+                                                        SmedAction.panelMain.mark.setShape(Shp.UNKSHP);
                                         }
                                 }
@@ -66 +66 @@
         public ActionListener alShape = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        if ((dlg.panelMain.mark.getObject() != Obj.MORFAC) || (dlg.panelMain.mark.getCategory() == Cat.MOR_BUOY)) {
+                        if ((SmedAction.panelMain.mark.getObject() != Obj.MORFAC) || (SmedAction.panelMain.mark.getCategory() == Cat.MOR_BUOY)) {
                                 for (Shp shp : shapes.keySet()) {
                                         JRadioButton button = shapes.get(shp);
                                         if (button.isSelected()) {
-                                                dlg.panelMain.mark.setShape(shp);
-                                                if (SeaMark.EntMAP.get(dlg.panelMain.mark.getObject()) != Ent.MOORING) {
-                                                        dlg.panelMain.mark.setObject(objects.get(shp));
-                                                        if (dlg.panelMain.mark.getObjColour(0) == Col.UNKCOL) {
-                                                                dlg.panelMain.mark.setObjPattern(Pat.NOPAT);
-                                                                dlg.panelMain.mark.setObjColour(Col.YELLOW);
+                                                SmedAction.panelMain.mark.setShape(shp);
+                                                if (SeaMark.EntMAP.get(SmedAction.panelMain.mark.getObject()) != Ent.MOORING) {
+                                                        SmedAction.panelMain.mark.setObject(objects.get(shp));
+                                                        if (SmedAction.panelMain.mark.getObjColour(0) == Col.UNKCOL) {
+                                                                SmedAction.panelMain.mark.setObjPattern(Pat.NOPAT);
+                                                                SmedAction.panelMain.mark.setObjColour(Col.YELLOW);
                                                         }
                                                         if (button == cairnButton) {
-                                                                dlg.panelMain.mark.setObjPattern(Pat.NOPAT);
-                                                                dlg.panelMain.mark.setObjColour(Col.UNKCOL);
+                                                                SmedAction.panelMain.mark.setObjPattern(Pat.NOPAT);
+                                                                SmedAction.panelMain.mark.setObjColour(Col.UNKCOL);
                                                         }
-                                                        topmarkButton.setVisible(dlg.panelMain.mark.testValid());
+                                                        topmarkButton.setVisible(SmedAction.panelMain.mark.testValid());
                                                 }
                                                 button.setBorderPainted(true);
@@ -87 +87 @@
                                                 button.setBorderPainted(false);
                                 }
-                                dlg.panelMain.panelMore.syncPanel();
+                                SmedAction.panelMain.panelMore.syncPanel();
                         }
                 }
@@ -95 +95 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         if (topmarkButton.isSelected()) {
-                                dlg.panelMain.mark.setTopmark(Top.X_SHAPE);
-                                dlg.panelMain.mark.setTopPattern(Pat.NOPAT);
-                                dlg.panelMain.mark.setTopColour(Col.YELLOW);
+                                SmedAction.panelMain.mark.setTopmark(Top.X_SHAPE);
+                                SmedAction.panelMain.mark.setTopPattern(Pat.NOPAT);
+                                SmedAction.panelMain.mark.setTopColour(Col.YELLOW);
                                 topmarkButton.setBorderPainted(true);
                         } else {
-                                dlg.panelMain.mark.setTopmark(Top.NOTOP);
-                                dlg.panelMain.mark.setTopPattern(Pat.NOPAT);
-                                dlg.panelMain.mark.setTopColour(Col.UNKCOL);
+                                SmedAction.panelMain.mark.setTopmark(Top.NOTOP);
+                                SmedAction.panelMain.mark.setTopPattern(Pat.NOPAT);
+                                SmedAction.panelMain.mark.setTopColour(Col.UNKCOL);
                                 topmarkButton.setBorderPainted(false);
                         }
-                        dlg.panelMain.panelTop.syncPanel();
+                        SmedAction.panelMain.panelTop.syncPanel();
                 }
         };
@@ -111 +111 @@
         private ActionListener alNotice = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        dlg.panelMain.mark.clrMark();
+                        SmedAction.panelMain.mark.clrMark();
                         if (noticeButton.isSelected()) {
-                                dlg.panelMain.mark.setObject(Obj.NOTMRK);
+                                SmedAction.panelMain.mark.setObject(Obj.NOTMRK);
                                 noticeButton.setBorderPainted(true);
                         } else {
-                                dlg.panelMain.mark.setObject(Obj.UNKOBJ);
+                                SmedAction.panelMain.mark.setObject(Obj.UNKOBJ);
                                 noticeButton.setBorderPainted(false);
                         }
-                        dlg.panelMain.syncPanel();
+                        SmedAction.panelMain.syncPanel();
                 }
         };
@@ -125 +125 @@
         private ActionListener alMooring = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        dlg.panelMain.mark.setObject(Obj.UNKOBJ);
-                        dlg.panelMain.mark.setCategory(Cat.NOCAT);
-                        dlg.panelMain.mark.setTopmark(Top.NOTOP);
+                        SmedAction.panelMain.mark.setObject(Obj.UNKOBJ);
+                        SmedAction.panelMain.mark.setCategory(Cat.NOCAT);
+                        SmedAction.panelMain.mark.setTopmark(Top.NOTOP);
                         if (mooringButton.isSelected()) {
-                                dlg.panelMain.mark.setObject(Obj.MORFAC);
+                                SmedAction.panelMain.mark.setObject(Obj.MORFAC);
                                 categoryBox.setVisible(false);
                                 mooringBox.setVisible(true);
@@ -234 +234 @@
 
         public void syncPanel() {
-                if (SeaMark.EntMAP.get(dlg.panelMain.mark.getObject()) == Ent.MOORING) {
+                if (SeaMark.EntMAP.get(SmedAction.panelMain.mark.getObject()) == Ent.MOORING) {
                         mooringButton.setBorderPainted(true);
                         categoryBox.setVisible(false);
@@ -248 +248 @@
                         for (Cat cat : moorings.keySet()) {
                                 int item = moorings.get(cat);
-                                if (dlg.panelMain.mark.getCategory() == cat)
+                                if (SmedAction.panelMain.mark.getCategory() == cat)
                                         mooringBox.setSelectedIndex(item);
                         }
@@ -262 +262 @@
                         cairnButton.setEnabled(true);
                         noticeButton.setEnabled(true);
-                        topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NOTOP);
-                        topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NOTOP);
-                        topmarkButton.setVisible(dlg.panelMain.mark.testValid());
+                        topmarkButton.setBorderPainted(SmedAction.panelMain.mark.getTopmark() != Top.NOTOP);
+                        topmarkButton.setSelected(SmedAction.panelMain.mark.getTopmark() != Top.NOTOP);
+                        topmarkButton.setVisible(SmedAction.panelMain.mark.testValid());
                         for (Cat cat : categories.keySet()) {
                                 int item = categories.get(cat);
-                                if (dlg.panelMain.mark.getCategory() == cat)
+                                if (SmedAction.panelMain.mark.getCategory() == cat)
                                         categoryBox.setSelectedIndex(item);
                         }
@@ -273 +273 @@
                 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
@@ -279 +279 @@
                 }
                 noticeButton.setBorderPainted(false);
-                dlg.panelMain.mark.testValid();
+                SmedAction.panelMain.mark.testValid();
         }