Changeset 27159 in osm for applications/editors/josm/plugins

Timestamp:

2011-11-26T15:34:06+01:00 (13 years ago)

Author:

upliner

Message:

'Update reverter for 4602'

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/corehacks/OsmChangesetContentParser.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/build.xml

@@ -30 +30 @@
 <project name="reverter" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="reverter: add support for remotecontrol for curl-scripted reverts"/>
+    <property name="commit.message" value="Update reverter for 4602"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4602"/>
     <!--
       ************************************************

applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -148 +149 @@
             long changesetId = getMandatoryAttributeLong(atts,"changeset");
             boolean visible= getMandatoryAttributeBoolean(atts, "visible");
-            long uid = getAttributeLong(atts, "uid",-1);
-            String user = getAttributeString(atts, "user", tr("<anonymous>"));
             String v = getMandatoryAttributeString(atts, "timestamp");
             Date timestamp = DateUtils.fromString(v);
             HistoryOsmPrimitive primitive = null;
+            // Hack: reverter doesn't need user information, so always use User.getAnonymous()
+            // TODO: Update OsmChangesetContentParser from the core or update core OsmChangesetContentParser to make it usable with reverter
             if (type.equals(OsmPrimitiveType.NODE)) {
                 double lat = getMandatoryAttributeDouble(atts, "lat");
                 double lon = getMandatoryAttributeDouble(atts, "lon");
                 primitive = new HistoryNode(
-                        id,version,visible,user,uid,changesetId,timestamp, new LatLon(lat,lon)
+                        id,version,visible,User.getAnonymous(),changesetId,timestamp, new LatLon(lat,lon)
                 );
 
             } else if (type.equals(OsmPrimitiveType.WAY)) {
                 primitive = new HistoryWay(
-                        id,version,visible,user,uid,changesetId,timestamp
+                        id,version,visible,User.getAnonymous(),changesetId,timestamp
                 );
             }if (type.equals(OsmPrimitiveType.RELATION)) {
                 primitive = new HistoryRelation(
-                        id,version,visible,user,uid,changesetId,timestamp
+                        id,version,visible,User.getAnonymous(),changesetId,timestamp
                 );
             }