Changeset 10136 in josm for trunk/src/org

Timestamp:

2016-04-10T18:13:08+02:00 (9 years ago)

Author:

Don-vip

Message:

fix note parsing broken by r10134

File:

• trunk/src/org/openstreetmap/josm/io/NoteReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/NoteReader.java

@@ -9 +9 @@
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -116 +117 @@
                 }
                 commentUsername = attrs.getValue("user");
-                noteAction = Action.valueOf(attrs.getValue("action"));
+                noteAction = Action.valueOf(attrs.getValue("action").toUpperCase(Locale.ENGLISH));
                 commentCreateDate = DateUtils.fromString(attrs.getValue("timestamp"));
                 String isNew = attrs.getValue("is_new");
@@ -161 +162 @@
                 break;
             case "status":
-                thisNote.setState(Note.State.valueOf(buffer.toString()));
+                thisNote.setState(Note.State.valueOf(buffer.toString().toUpperCase(Locale.ENGLISH)));
                 break;
             case "date_created":
@@ -183 +184 @@
                 break;
             case "action":
-                noteAction = Action.valueOf(buffer.toString());
+                noteAction = Action.valueOf(buffer.toString().toUpperCase(Locale.ENGLISH));
                 break;
             case "note": //nothing to do for comment or note, already handled above