Changeset 27151 in osm for applications/editors/josm/plugins/smed

Timestamp:

2011-11-25T16:17:53+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam

Files:

• msg/messages.properties (modified) (1 diff)
• msg/messages_de.properties (modified) (1 diff)
• msg/messages_en.properties (modified) (1 diff)
• panels/PanelSectors.java (modified) (2 diffs)
• seamarks/SeaMark.java (modified) (3 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties

@@ -277 +277 @@
 Windmill=Windmill
 SpireMinaret=Spire/Minaret
+
+NotDecimal=Not a valid decimal string
+TooBig=Maximum value exceeded

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties

@@ -277 +277 @@
 Windmill=Windmill
 SpireMinaret=Spire/Minaret
+
+NotDecimal=Not a valid decimal string
+TooBig=Maximum value exceeded

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties

@@ -277 +277 @@
 Windmill=Windmill
 SpireMinaret=Spire/Minaret
+
+NotDecimal=Not a valid decimal string
+TooBig=Maximum value exceeded

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java

@@ -183 +183 @@
                         case 10:
                         case 11:
-                                dlg.mark.setLightAtt(col - 1, row, dlg.mark.validDecimal((String) value));
+                                dlg.mark.setLightAtt(col - 1, row, value);
                                 break;
                         case 6:
                                 if ((Boolean) value == true) {
                                         dlg.mark.setLightAtt(Att.LIT, row, Lit.DIR);
+                                        dlg.mark.setLightAtt(Att.BEG, row, "");
+                                        dlg.mark.setLightAtt(Att.END, row, "");
                                 } else {
                                         dlg.mark.setLightAtt(Att.LIT, row, Lit.UNKNOWN);
@@ -196 +198 @@
                         case 8:
                                 if (dlg.mark.getLightAtt(Att.LIT, row) == Lit.DIR) {
-                                        dlg.mark.setLightAtt(Att.ORT, row, dlg.mark.validDecimal((String) value));
+                                        dlg.mark.setLightAtt(Att.ORT, row, value);
                                 } else {
-                                        dlg.mark.setLightAtt(Att.LIT, row, Lit.UNKNOWN);
-                                        dlg.mark.setLightAtt(col - 1, row, dlg.mark.validDecimal((String) value));
+                                        dlg.mark.setLightAtt(col - 1, row, value);
                                 }
                                 break;

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

@@ -9 +9 @@
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 
+import oseam.Messages;
 import oseam.dialogs.OSeaMAction;
 
@@ -1091 +1092 @@
         public String validDecimal(String str) {
                 str = str.trim().replace(',', '.');
-                if ((!str.isEmpty()) && (!str.matches("^[+-]??\\d+(\\.\\d+)??$"))) {
-                        dlg.manager.showVisualMessage("Not a valid decimal string");
+                if (!(str.isEmpty()) && !(str.matches("^[+-]??\\d+(\\.\\d+)??$"))) {
+                        dlg.manager.showVisualMessage(Messages.getString("NotDecimal"));
                         return "";
                 } else {
@@ -1100 +1101 @@
         }
 
-        public String validDecimal(String str, int max) {
+        public String validDecimal(String str, float max) {
                 str = validDecimal(str);
-                if (!(str.isEmpty()) && (new Integer(str) > max)) {
-                        dlg.manager.showVisualMessage("Maximum value exceeded");
+                if (!(str.isEmpty()) && (new Float(str) > max)) {
+                        dlg.manager.showVisualMessage(Messages.getString("TooBig"));
                         return "";
                 } else {