Changeset 7012 in josm for trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

Timestamp:

2014-04-27T15:35:47+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - use String switch/case where applicable

File:

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

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

@@ -112 +112 @@
             if (value == null) {
                 throwException(tr("Missing mandatory attribute ''{0}''.", "open"));
-            } else if (value.equals("true")) {
+            } else if ("true".equals(value)) {
                 current.setOpen(true);
-            } else if (value.equals("false")) {
+            } else if ("false".equals(value)) {
                 current.setOpen(false);
             } else {
@@ -160 +160 @@
         @Override
         public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
-            if (qName.equals("osm")) {
+            switch (qName) {
+            case "osm":
                 if (atts == null) {
                     throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}.", "version", "osm"));
@@ -168 +169 @@
                     throwException(tr("Missing mandatory attribute ''{0}''.", "version"));
                 }
-                if (!(v.equals("0.6"))) {
+                if (!("0.6".equals(v))) {
                     throwException(tr("Unsupported version: {0}", v));
                 }
-            } else if (qName.equals("changeset")) {
+                break;
+            case "changeset":
                 current = new Changeset();
                 parseChangesetAttributes(current, atts);
-            } else if (qName.equals("tag")) {
+                break;
+            case "tag":
                 String key = atts.getValue("k");
                 String value = atts.getValue("v");
                 current.put(key, value);
-            } else {
+                break;
+            default:
                 throwException(tr("Undefined element ''{0}'' found in input stream. Aborting.", qName));
             }
@@ -185 +189 @@
         @Override
         public void endElement(String uri, String localName, String qName) throws SAXException {
-            if (qName.equals("changeset")) {
+            if ("changeset".equals(qName)) {
                 changesets.add(current);
             }