Changeset 2244 in josm for trunk/src/org

Timestamp:

2009-10-04T12:39:37+02:00 (15 years ago)

Author:

Gubaer

Message:

Fixes provided by stoeckr, got accidentally overwritten in r2243

File:

• trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (modified) (5 diffs)

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

@@ -81 +81 @@
         }
 
+        protected long getAttributeLong(Attributes attr, String name, long defaultValue) throws SAXException{
+            String v = attr.getValue(name);
+            if (v == null)
+                return defaultValue;
+            Long l = 0l;
+            try {
+                l = Long.parseLong(v);
+            } catch(NumberFormatException e) {
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
+            }
+            if (l < 0) {
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
+            }
+            return l;
+        }
+
         protected Double getMandatoryAttributeDouble(Attributes attr, String name) throws SAXException{
             String v = attr.getValue(name);
@@ -86 +102 @@
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
-            double d = 0;
+            double d = 0.0;
             try {
                 d = Double.parseDouble(v);
@@ -92 +108 @@
                 throwException(tr("Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''.", name, v));
             }
-            if (d < 0) {
-                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type double (>=0). Got ''{1}''.", name, v));
-            }
             return d;
         }
@@ -103 +116 @@
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
+            return v;
+        }
+
+        protected String getAttributeString(Attributes attr, String name, String defaultValue) {
+            String v = attr.getValue(name);
+            if (v == null)
+                return defaultValue;
             return v;
         }
@@ -123 +143 @@
             long changesetId = getMandatoryAttributeLong(atts,"changeset");
             boolean visible= getMandatoryAttributeBoolean(atts, "visible");
-            long uid = getMandatoryAttributeLong(atts, "uid");
-            String user = getMandatoryAttributeString(atts, "user");
+            long uid = getAttributeLong(atts, "uid",-1);
+            String user = getAttributeString(atts, "user", tr("<anonymous>"));
             String v = getMandatoryAttributeString(atts, "timestamp");
             Date timestamp = DateUtils.fromString(v);