Index: applications/editors/josm/plugins/editgpx/build.xml
===================================================================
--- applications/editors/josm/plugins/editgpx/build.xml	(revision 16793)
+++ applications/editors/josm/plugins/editgpx/build.xml	(revision 17369)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast." />
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx" />
-                <attribute name="Plugin-Mainversion" value="1893" />
+                <attribute name="Plugin-Mainversion" value="2012" />
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 16793)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 17369)
@@ -151,5 +151,5 @@
 
             ArrayList<WayPoint> trkseg = null;
-            for (Node n : w.nodes) {
+            for (Node n : w.getNodes()) {
                 if (n.incomplete || n.deleted) {
                     trkseg = null;
@@ -191,6 +191,6 @@
             wpt.setTime();
 
-            if (n.keys != null && n.keys.containsKey("name")) {
-                wpt.attr.put("name", n.keys.get("name"));
+            if (n.getKeys() != null && n.keySet().contains("name")) {
+                wpt.attr.put("name", n.get("name"));
             }
             gpxData.waypoints.add(wpt);
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 16793)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 17369)
@@ -120,5 +120,5 @@
                                 n.setTimestamp(DateUtils.fromString(timestr));
                             dataSet.nodes.add(n);
-                            w.nodes.add(n); //TODO what to do with these while deletion
+                            w.addNode(n); //TODO what to do with these while deletion
                         }
                         dataSet.ways.add(w);