Changeset 2243 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-10-04T12:07:16+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3650: Double-click on items in history dialog should open history
fixed #3649: History dialog does not show moved nodes
fixed #3383: changeset tags in history dialog (partial fix, there's now a link to the server page for browsing changesets)

File:

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

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

@@ -12 +12 @@
 import javax.xml.parsers.SAXParserFactory;
 
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
@@ -80 +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 int getMandatoryAttributeInt(Attributes attr, String name) throws SAXException{
-            String v = attr.getValue(name);
-            if (v == null) {
-                throwException(tr("Missing mandatory attribute ''{0}''.", name));
-            }
-            Integer i = 0;
-            try {
-                i = Integer.parseInt(v);
-            } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''.", name, v));
-            }
-            if (i < 0) {
-                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''.", name, v));
-            }
-            return i;
-        }
-
-        protected double getMandatoryAttributeDouble(Attributes attr, String name) throws SAXException{
-            String v = attr.getValue(name);
-            if (v == null) {
-                throwException(tr("Missing mandatory attribute ''{0}''.", name));
-            }
-            double d = 0.0;
+        protected Double getMandatoryAttributeDouble(Attributes attr, String name) throws SAXException{
+            String v = attr.getValue(name);
+            if (v == null) {
+                throwException(tr("Missing mandatory attribute ''{0}''.", name));
+            }
+            double d = 0;
             try {
                 d = Double.parseDouble(v);
@@ -125 +92 @@
                 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;
         }
@@ -133 +103 @@
                 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)
-                v = defaultValue;
             return v;
         }
@@ -157 +120 @@
         protected  HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
             long id = getMandatoryAttributeLong(atts,"id");
-            long version = getMandatoryAttributeLong(atts, "version");
-            long changesetId = getMandatoryAttributeLong(atts, "changeset");
-            boolean visible = getMandatoryAttributeBoolean(atts, "visible");
-            long uid = getAttributeLong(atts, "uid", -1);
-            String user = getAttributeString(atts, "user", tr("<anonymous>"));
+            long version = getMandatoryAttributeLong(atts,"version");
+            long changesetId = getMandatoryAttributeLong(atts,"changeset");
+            boolean visible= getMandatoryAttributeBoolean(atts, "visible");
+            long uid = getMandatoryAttributeLong(atts, "uid");
+            String user = getMandatoryAttributeString(atts, "user");
             String v = getMandatoryAttributeString(atts, "timestamp");
             Date timestamp = DateUtils.fromString(v);
@@ -169 +132 @@
                 double lon = getMandatoryAttributeDouble(atts, "lon");
                 primitive = new HistoryNode(
-                        id,version,visible,user,uid,changesetId,timestamp,lat,lon
+                        id,version,visible,user,uid,changesetId,timestamp, new LatLon(lat,lon)
                 );
+
             } else if (type.equals(OsmPrimitiveType.WAY)) {
                 primitive = new HistoryWay(