Changeset 34894 in osm for applications/editors/josm/plugins/smed/src

Timestamp:

2019-02-15T13:45:05+01:00 (6 years ago)

Author:

malcolmh

Message:

New release

Location:

applications/editors/josm/plugins/smed/src/org/openstreetmap/josm/plugins/seamapeditor

Files:

• panels/PanelSectors.java (modified) (2 diffs)
• seamarks/SeaMark.java (modified) (5 diffs)

applications/editors/josm/plugins/smed/src/org/openstreetmap/josm/plugins/seamapeditor/panels/PanelSectors.java

@@ -36 +36 @@
 public class PanelSectors extends JFrame {
 
-    private SmedAction dlg;
     private JPanel panel;
     private TableModel model;
@@ -70 +69 @@
     public PanelSectors(SmedAction dia) {
         super(Messages.getString("SectorTable"));
-        dlg = dia;
         setLayout(null);
         setSize(900, 100);

applications/editors/josm/plugins/smed/src/org/openstreetmap/josm/plugins/seamapeditor/seamarks/SeaMark.java

@@ -730 +730 @@
 
     public enum Att {
-        COL, CHR, GRP, SEQ, PER, LIT, BEG, END, RAD, HGT, RNG, VIS, EXH, ORT, MLT, ALT
-    }
-
-    public Object[] sector = {Col.UNKCOL, "", "", "", "", Lit.UNKLIT, "", "",
+        COL, CHR, GRP, SEQ, PER, LIT, BEG, END, HGT, RNG, VIS, EXH, ORT, MLT, ALT
+    }
+
+    public Object[] sector = {Col.UNKCOL, "", "", "", "", Lit.UNKLIT, "",
             "", "", "", Vis.UNKVIS, Exh.UNKEXH, "", "", Col.UNKCOL };
 
@@ -770 +770 @@
             case 8:
             case 9:
-            case 10:
                 sectors.get(i)[att] = validDecimal((String) obj);
                 break;
             case 6:
             case 7:
-            case 13:
+            case 12:
                 sectors.get(i)[att] = validDecimal((String) obj, 360);
                 break;
@@ -1840 +1839 @@
                 setLightAtt(Att.END, i, keys.get("seamark:light" + secStr + ":sector_end"));
             }
-            if (keys.containsKey("seamark:light" + secStr + ":radius")) {
-                setLightAtt(Att.RAD, i, keys.get("seamark:light" + secStr + ":radius"));
-            }
             if (keys.containsKey("seamark:light" + secStr + ":height")) {
                 setLightAtt(Att.HGT, i, keys.get("seamark:light" + secStr + ":height"));
@@ -2790 +2786 @@
                 String secStr = (i == 0) ? "" : (":" + Integer.toString(i));
                 if (sectors.get(i)[0] != Col.UNKCOL)
-                    if ((sectors.get(i)[15] != Col.UNKCOL) && ((String) sectors.get(i)[1]).contains("Al")) {
+                    if ((sectors.get(i)[14] != Col.UNKCOL) && ((String) sectors.get(i)[1]).contains("Al")) {
                         undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":colour",
-                                (ColSTR.get(sectors.get(i)[0])) + ";" + ColSTR.get(sectors.get(i)[15])));
+                                (ColSTR.get(sectors.get(i)[0])) + ";" + ColSTR.get(sectors.get(i)[14])));
                     } else {
                         undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":colour",
@@ -2833 +2829 @@
                 }
                 if (!((String) sectors.get(i)[8]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":radius", (String) sectors.get(i)[8]));
+                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":height", (String) sectors.get(i)[8]));
                 } else if (!((String) sectors.get(0)[8]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":radius", (String) sectors.get(0)[8]));
+                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":height", (String) sectors.get(0)[8]));
                 }
                 if (!((String) sectors.get(i)[9]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":height", (String) sectors.get(i)[9]));
+                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":range", (String) sectors.get(i)[9]));
                 } else if (!((String) sectors.get(0)[9]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":height", (String) sectors.get(0)[9]));
-                }
-                if (!((String) sectors.get(i)[10]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":range", (String) sectors.get(i)[10]));
-                } else if (!((String) sectors.get(0)[10]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":range", (String) sectors.get(0)[10]));
-                }
-                if (sectors.get(i)[11] != Vis.UNKVIS) {
+                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":range", (String) sectors.get(0)[9]));
+                }
+                if (sectors.get(i)[10] != Vis.UNKVIS) {
                     undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":visibility",
-                            VisSTR.get(sectors.get(i)[11])));
-                } else if (sectors.get(0)[11] != Vis.UNKVIS) {
+                            VisSTR.get(sectors.get(i)[10])));
+                } else if (sectors.get(0)[10] != Vis.UNKVIS) {
                     undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":visibility",
-                            VisSTR.get(sectors.get(0)[11])));
-                }
-                if (sectors.get(i)[12] != Exh.UNKEXH) {
+                            VisSTR.get(sectors.get(0)[10])));
+                }
+                if (sectors.get(i)[11] != Exh.UNKEXH) {
                     undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":exhibition",
-                            ExhSTR.get(sectors.get(i)[12])));
-                } else if (sectors.get(0)[12] != Exh.UNKEXH) {
+                            ExhSTR.get(sectors.get(i)[11])));
+                } else if (sectors.get(0)[11] != Exh.UNKEXH) {
                     undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":exhibition",
-                            ExhSTR.get(sectors.get(0)[12])));
+                            ExhSTR.get(sectors.get(0)[11])));
+                }
+                if (!((String) sectors.get(i)[12]).isEmpty()) {
+                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":orientation",
+                            (String) sectors.get(i)[12]));
                 }
                 if (!((String) sectors.get(i)[13]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":orientation",
-                            (String) sectors.get(i)[13]));
-                }
-                if (!((String) sectors.get(i)[14]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":multiple", (String) sectors.get(i)[14]));
-                } else if (!((String) sectors.get(0)[14]).isEmpty()) {
-                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":multiple", (String) sectors.get(0)[14]));
+                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":multiple", (String) sectors.get(i)[13]));
+                } else if (!((String) sectors.get(0)[13]).isEmpty()) {
+                    undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":multiple", (String) sectors.get(0)[13]));
                 }
             }