Changeset 27395 in osm for applications/editors/josm/plugins/undelete

Timestamp:

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

Author:

jttt

Message:

update to latest josm

Location:

applications/editors/josm/plugins/undelete

Files:

• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/undelete/Undelete.java (modified) (5 diffs)

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

@@ -32 +32 @@
     <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
     <!-- 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"/>
     <!--
       ************************************************
@@ -145 +145 @@
     </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}
         **
@@ -194 +194 @@
     </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/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.User;
@@ -70 +71 @@
       }
 
-      public void actionPerformed(ActionEvent e) {
+      @Override
+        public void actionPerformed(ActionEvent e) {
         JCheckBox layer = new JCheckBox(tr("Separate Layer"));
         layer.setToolTipText(tr("Select if the data should be added into a new layer"));
@@ -120 +122 @@
         Main.pref.put("undelete.osmid", Long.toString(tfId.getOsmId()));
         List<Long> ids=new ArrayList<Long>();
-        ids.add((long)tfId.getOsmId());
+        ids.add(tfId.getOsmId());
         undelete(layer.isSelected(), cbType.getType(), ids, 0);
       }
@@ -149 +151 @@
 
         Runnable r = new Runnable() {
-            public void run() {
+            @Override
+                        public void run() {
               List<Node> nodes=new ArrayList<Node>();
               for (long id: ids)
@@ -225 +228 @@
 
                       List<RelationMember> members = new ArrayList<RelationMember>(hRel.getNumMembers());
-                      for (org.openstreetmap.josm.data.osm.history.RelationMember m : hRel.getMembers()) {
-                        OsmPrimitive p = datas.getPrimitiveById(m.getPrimitiveId(), m.getPrimitiveType());
+                      for (RelationMemberData m : hRel.getMembers()) {
+                        OsmPrimitive p = datas.getPrimitiveById(m.getMemberId(), m.getMemberType());
                         if (p == null) {
-                            switch (m.getPrimitiveType()) {
-                            case NODE: p = new Node(m.getPrimitiveId()); break;
-                            case WAY: p = new Way(m.getPrimitiveId()); break;
-                            case RELATION: p = new Relation(m.getPrimitiveId()); break;
+                            switch (m.getMemberType()) {
+                            case NODE: p = new Node(m.getMemberId()); break;
+                            case WAY: p = new Way(m.getMemberId()); break;
+                            case RELATION: p = new Relation(m.getMemberId()); break;
                             }
                             datas.addPrimitive(p);