Changeset 13196 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-12-06T19:19:04+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15643 - make sure OSM IDs do not use thousands separators in log and error messages

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• AbstractReader.java (modified) (5 diffs)
• OsmReader.java (modified) (5 diffs)

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

@@ -95 +95 @@
                         throw new IllegalDataException(
                                 tr("Way with external ID ''{0}'' includes missing node with external ID ''{1}''.",
-                                        externalWayId,
-                                        id));
+                                        Long.toString(externalWayId),
+                                        Long.toString(id)));
                     // create an incomplete node if necessary
                     n = (Node) ds.getPrimitiveById(id, OsmPrimitiveType.NODE);
@@ -105 +105 @@
                 }
                 if (n.isDeleted()) {
-                    Logging.info(tr("Deleted node {0} is part of way {1}", id, w.getId()));
+                    Logging.info(tr("Deleted node {0} is part of way {1}", Long.toString(id), Long.toString(w.getId())));
                 } else {
                     wayNodes.add(n);
@@ -113 +113 @@
             if (w.hasIncompleteNodes()) {
                 Logging.info(tr("Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data.",
-                          externalWayId, w.getNodesCount()));
+                        Long.toString(externalWayId), w.getNodesCount()));
             }
             ds.addPrimitive(w);
@@ -153 +153 @@
                         throw new IllegalDataException(
                                 tr("Relation with external id ''{0}'' refers to a missing primitive with external id ''{1}''.",
-                                        externalRelationId,
-                                        rm.getMemberId()));
+                                        Long.toString(externalRelationId),
+                                        Long.toString(rm.getMemberId())));
 
                     // member refers to OSM primitive which was not present in the parsed data
@@ -176 +176 @@
                 }
                 if (primitive.isDeleted()) {
-                    Logging.info(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId()));
+                    Logging.info(tr("Deleted member {0} is used by relation {1}",
+                            Long.toString(primitive.getId()), Long.toString(relation.getId())));
                 } else {
                     relationMembers.add(new RelationMember(rm.getRole(), primitive));

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

@@ -277 +277 @@
         }
         if (w.isDeleted() && !nodeIds.isEmpty()) {
-            Logging.info(tr("Deleted way {0} contains nodes", w.getUniqueId()));
+            Logging.info(tr("Deleted way {0} contains nodes", Long.toString(w.getUniqueId())));
             nodeIds = new ArrayList<>();
         }
@@ -287 +287 @@
         if (parser.getAttributeValue(null, "ref") == null) {
             throwException(
-                    tr("Missing mandatory attribute ''{0}'' on <nd> of way {1}.", "ref", w.getUniqueId())
+                    tr("Missing mandatory attribute ''{0}'' on <nd> of way {1}.", "ref", Long.toString(w.getUniqueId()))
             );
         }
@@ -293 +293 @@
         if (id == 0) {
             throwException(
-                    tr("Illegal value of attribute ''ref'' of element <nd>. Got {0}.", id)
+                    tr("Illegal value of attribute ''ref'' of element <nd>. Got {0}.", Long.toString(id))
             );
         }
@@ -327 +327 @@
         }
         if (r.isDeleted() && !members.isEmpty()) {
-            Logging.info(tr("Deleted relation {0} contains members", r.getUniqueId()));
+            Logging.info(tr("Deleted relation {0} contains members", Long.toString(r.getUniqueId())));
             members = new ArrayList<>();
         }
@@ -339 +339 @@
         String value = parser.getAttributeValue(null, "ref");
         if (value == null) {
-            throwException(tr("Missing attribute ''ref'' on member in relation {0}.", r.getUniqueId()));
+            throwException(tr("Missing attribute ''ref'' on member in relation {0}.", Long.toString(r.getUniqueId())));
         }
         try {