Changeset 26706 in osm

Timestamp:

2011-09-24T21:30:31+02:00 (13 years ago)

Author:

malcolmh

Message:

'Bug fix release'

Location:

applications/editors/josm/plugins/toms/src/toms

Files:

• dialogs/SmpDialogAction.java (modified) (1 diff)
• seamarks/buoys/Buoy.java (modified) (12 diffs)

applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java

@@ -1323 +1323 @@
                         cbM01Sector.addItem(Messages.getString("SmpDialogAction.202")); //$NON-NLS-1$
                         cbM01Sector.addItem(Messages.getString("SmpDialogAction.203")); //$NON-NLS-1$
+                        cbM01Sector.addItem("10");
+                        cbM01Sector.addItem("11");
+                        cbM01Sector.addItem("12");
+                        cbM01Sector.addItem("13");
+                        cbM01Sector.addItem("14");
+                        cbM01Sector.addItem("15");
+                        cbM01Sector.addItem("16");
+                        cbM01Sector.addItem("17");
+                        cbM01Sector.addItem("18");
+                        cbM01Sector.addItem("19");
                         cbM01Sector.addActionListener(new ActionListener() {
                                 public void actionPerformed(ActionEvent e) {

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java

@@ -261 +261 @@
         }
 
-        private String[] LightChar = new String[10];
+        private String[] LightChar = new String[20];
 
         public String getLightChar() {
@@ -273 +273 @@
         }
 
-        private String[] LightColour = new String[10];
+        private String[] LightColour = new String[20];
 
         public String getLightColour() {
@@ -285 +285 @@
         }
 
-        private String[] LightGroup = new String[10];
+        private String[] LightGroup = new String[20];
 
         public String getLightGroup() {
@@ -305 +305 @@
         }
 
-        private String[] Height = new String[10];
+        private String[] Height = new String[20];
 
         public String getHeight() {
@@ -317 +317 @@
         }
 
-        private String[] Range = new String[10];
+        private String[] Range = new String[20];
 
         public String getRange() {
@@ -329 +329 @@
         }
 
-        private String[] Sequence = new String[10];
+        private String[] Sequence = new String[20];
 
         public String getSeq() {
@@ -341 +341 @@
         }
 
-        private String[] Bearing1 = new String[10];
+        private String[] Bearing1 = new String[20];
 
         public String getBearing1() {
@@ -353 +353 @@
         }
 
-        private String[] Bearing2 = new String[10];
+        private String[] Bearing2 = new String[20];
 
         public String getBearing2() {
@@ -365 +365 @@
         }
 
-        private String[] Radius = new String[10];
+        private String[] Radius = new String[20];
 
         public String getRadius() {
@@ -377 +377 @@
         }
 
-        private String[] LightPeriod = new String[10];
+        private String[] LightPeriod = new String[20];
 
         public String getLightPeriod() {
@@ -470 +470 @@
                                 int index = 0;
                                 key = key.substring(14);
-                                if (key.matches("^\\d:.*")) {
+                                if (key.matches("^\\d\\d:.*")) {
+                                        index = ((key.charAt(0) - '0') * 10) + key.charAt(1) - '0';
+                                        key = key.substring(3);
+                                } else if (key.matches("^\\d:.*")) {
+                                                index = key.charAt(0) - '0';
+                                                key = key.substring(2);
+                                } else if ((key.matches("^\\d$")) || (key.matches("^\\d\\d$"))) {
                                         index = key.charAt(0) - '0';
-                                        key = key.substring(2);
-                                } else if (key.matches("^\\d$")) {
-                                        index = key.charAt(0) - '0';
+                                        if (key.matches("^\\d\\d$")) {
+                                                index = (index * 10) + key.charAt(1) - '0';
+                                        }
                                         String values[] = value.split(":");
                                         if (values[0].equals("red"))
@@ -971 +977 @@
                                                 "seamark:light:radius", Radius[0]));
 
-                        for (int i = 1; i < 10; i++) {
+                        for (int i = 1; i < 20; i++) {
 
                                 if (LightColour[i] != null) {