Changeset 32692 in osm for applications

Timestamp:

2016-07-21T15:01:49+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/junctionchecking: fix build

• ​http://errorprone.info/bugpattern/GetClassOnClass
• ​http://errorprone.info/bugpattern/StringEquality

Location:

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker

Files:

• datastructure/OSMRelation.java (modified) (2 diffs)
• reader/OSMXMLReader.java (modified) (1 diff)

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java

@@ -42 +42 @@
     public String toString() {
         String s = ("Relation-ID: " + this.getId() + " Relation-Type: " + this.getRelationType("type") +"\n");
-        for (int i = 0; i < members.size(); i++) {
-            s += ("Member: " + members.get(i).getRole() + ", ref:" + members.get(i).getId() + ", type:" + members.get(i).getType().getClass().getName());
+        for (Member member : members) {
+            s += member.toString();
         }
         return s;
@@ -86 +86 @@
             return role;
         }
+
+        @Override
+        public String toString() {
+            return "Member: " + getRole() + ", ref:" + getId() + ", type:" + getType().getName();
+        }
     }
 }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/OSMXMLReader.java

@@ -156 +156 @@
 
                 case XMLStreamConstants.END_ELEMENT:
-                    if (parser.getLocalName() == "node") {
+                    if (parser.getLocalName().equals("node")) {
                         node.setHashmap(hashmap);
                         osmgraph.addNode(node);
                     }
 
-                    if (parser.getLocalName() == "way") {
+                    if (parser.getLocalName().equals("way")) {
                         way.setHashmap(hashmap);
                         osmgraph.addWay(way);