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 17530)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 18426)
@@ -57,5 +57,5 @@
     public void initializeImport() {
         try {
-            if(dataSet.nodes.isEmpty() ) {
+            if(dataSet.getNodes().isEmpty() ) {
                 layerImport.activateImport();
             }
@@ -111,5 +111,5 @@
         //don't iterate through dataSet whiling making changes
         synchronized(layerImport.importing) {
-            for(Node n: dataSet.nodes) {
+            for(Node n: dataSet.getNodes()) {
                 if (!n.isDeleted()) {
                     Point pnt = Main.map.mapView.getPoint(n.getEastNorth());
@@ -142,5 +142,5 @@
         HashSet<Node> doneNodes = new HashSet<Node>();
         //add all ways
-        for (Way w : dataSet.ways) {
+        for (Way w : dataSet.getWays()) {
             if (w.incomplete || w.isDeleted()) continue;
             GpxTrack trk = new GpxTrack();
@@ -178,5 +178,5 @@
 
         // add nodes as waypoints
-        for (Node n : dataSet.nodes) {
+        for (Node n : dataSet.getNodes()) {
             if (n.incomplete || n.isDeleted() || doneNodes.contains(n)) continue;
 
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java	(revision 17530)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java	(revision 18426)
@@ -13,5 +13,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -67,5 +66,5 @@
 
             //go through nodes and mark the ones in the selection rect as deleted
-            for (Node n: dataSet.nodes) {
+            for (Node n: dataSet.getNodes()) {
                 Point p = Main.map.mapView.getPoint(n);
                 if (r.contains(p)) {
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 17530)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 18426)
@@ -119,8 +119,8 @@
                             if(timestr != null)
                                 n.setTimestamp(DateUtils.fromString(timestr));
-                            dataSet.nodes.add(n);
+                            dataSet.addPrimitive(n);
                             w.addNode(n); //TODO what to do with these while deletion
                         }
-                        dataSet.ways.add(w);
+                        dataSet.addPrimitive(w);
                     }
                 }