Changeset 27393 in osm for applications/editors/josm

Timestamp:

2012-01-02T15:39:21+01:00 (13 years ago)

Author:

jttt

Message:

Update to last josm

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (3 diffs)
• src/reverter/ChangesetReverter.java (modified) (4 diffs)
• src/reverter/corehacks/OsmChangesetContentParser.java (modified) (2 diffs)

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

@@ -32 +32 @@
     <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="4602"/>
+    <property name="plugin.main.version" value="4734"/>
     <!--
       ************************************************
@@ -149 +149 @@
     </target>
     <!--
-    ************************** Publishing the plugin *********************************** 
-    -->
-    <!--
-        ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+    ************************** Publishing the plugin ***********************************
+    -->
+    <!--
+        ** extracts the JOSM release for the JOSM version in ../core and saves it in the
         ** property ${coreversion.info.entry.revision}
         **
@@ -198 +198 @@
     </target>
     <!--
-        ** commits the plugin.jar 
+        ** commits the plugin.jar
         -->
     <target name="commit-dist">
         <echo>
     ***** Properties of published ${plugin.jar} *****
-    Commit message    : '${commit.message}'                 
+    Commit message    : '${commit.message}'
     Plugin-Mainversion: ${plugin.main.version}
     JOSM build version: ${coreversion.info.entry.revision}
     Plugin-Version    : ${version.entry.commit.revision}
-    ***** / Properties of published ${plugin.jar} *****                 
-                        
+    ***** / Properties of published ${plugin.jar} *****
+
     Now commiting ${plugin.jar} ...
     </echo>

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.Way;
@@ -28 +29 @@
 import org.openstreetmap.josm.data.osm.history.HistoryRelation;
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
-import org.openstreetmap.josm.data.osm.history.RelationMember;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -35 +35 @@
 
 import reverter.corehacks.ChangesetDataSet;
-import reverter.corehacks.OsmServerChangesetReader;
 import reverter.corehacks.ChangesetDataSet.ChangesetDataSetEntry;
 import reverter.corehacks.ChangesetDataSet.ChangesetModificationType;
+import reverter.corehacks.OsmServerChangesetReader;
 
 /**
@@ -253 +253 @@
             List<org.openstreetmap.josm.data.osm.RelationMember> currentMembers =
                 ((Relation)current).getMembers();
-            List<RelationMember> historyMembers = ((HistoryRelation)history).getMembers();
+            List<RelationMemberData> historyMembers = ((HistoryRelation)history).getMembers();
             if (currentMembers.size() != historyMembers.size()) return false;
             for (int i = 0; i < currentMembers.size(); i++) {
                 org.openstreetmap.josm.data.osm.RelationMember currentMember =
                     currentMembers.get(i);
-                RelationMember historyMember = historyMembers.get(i);
+                RelationMemberData historyMember = historyMembers.get(i);
                 if (!currentMember.getRole().equals(historyMember.getRole())) return false;
                 if (!currentMember.getMember().getPrimitiveId().equals(new SimplePrimitiveId(
-                        historyMember.getPrimitiveId(),historyMember.getPrimitiveType()))) return false;
+                        historyMember.getMemberId(),historyMember.getMemberType()))) return false;
             }
             return true;

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.RelationMemberData;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
@@ -205 +206 @@
             }
             String role = getMandatoryAttributeString(atts, "role");
-            org.openstreetmap.josm.data.osm.history.RelationMember member = new org.openstreetmap.josm.data.osm.history.RelationMember(role, type,ref);
+            RelationMemberData member = new RelationMemberData(role, type,ref);
             ((HistoryRelation)currentPrimitive).addMember(member);
         }