Index: /applications/editors/josm/plugins/DirectDownload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/build.xml	(revision 29221)
+++ /applications/editors/josm/plugins/DirectDownload/build.xml	(revision 29222)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="5679"/>
     <!--
       ************************************************
Index: /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java	(revision 29221)
+++ /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java	(revision 29222)
@@ -65,12 +65,12 @@
 		    GpxReader r = new GpxReader(is);
 		    boolean parsedProperly = r.parse(true);
-		    GpxLayer gpxLayer = new GpxLayer(r.data, track.filename, true);
+		    GpxLayer gpxLayer = new GpxLayer(r.getGpxData(), track.filename, true);
 
-                    if (r.data.hasRoutePoints() || r.data.hasTrackPoints()) {
+                    if (r.getGpxData().hasRoutePoints() || r.getGpxData().hasTrackPoints()) {
                         Main.main.addLayer(gpxLayer);
                     }
 
-                    if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.data.waypoints.isEmpty()) {
-                        MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", track.filename), null, gpxLayer);
+                    if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.getGpxData().waypoints.isEmpty()) {
+                        MarkerLayer ml = new MarkerLayer(r.getGpxData(), tr("Markers from {0}", track.filename), null, gpxLayer);
                         if (ml.data.size() > 0) {
                             Main.main.addLayer(ml);
Index: /applications/editors/josm/plugins/dataimport/build.xml
===================================================================
--- /applications/editors/josm/plugins/dataimport/build.xml	(revision 29221)
+++ /applications/editors/josm/plugins/dataimport/build.xml	(revision 29222)
@@ -31,5 +31,5 @@
     <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="5681"/>
     <!--
       ************************************************
Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/SingleSegmentGpxTrack.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/SingleSegmentGpxTrack.java	(revision 29221)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/SingleSegmentGpxTrack.java	(revision 29222)
@@ -8,12 +8,12 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.WithAttributes;
 
-public class SingleSegmentGpxTrack implements GpxTrack {
+public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
 
-    private final Map<String, Object> attributes;
     private final GpxTrackSegment trackSegment;
 
     public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
-        this.attributes = Collections.unmodifiableMap(attributes);
+        this.attr = Collections.unmodifiableMap(attributes);
         this.trackSegment = trackSegment;
     }
@@ -21,5 +21,5 @@
 
     public Map<String, Object> getAttributes() {
-        return attributes;
+        return attr;
     }
 
Index: /applications/editors/josm/plugins/globalsat/build.xml
===================================================================
--- /applications/editors/josm/plugins/globalsat/build.xml	(revision 29221)
+++ /applications/editors/josm/plugins/globalsat/build.xml	(revision 29222)
@@ -32,5 +32,9 @@
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="5681"/>
+    <!--
+      ************************************************
+      ** should not be necessary to change the following properties
+     -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java
===================================================================
--- /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java	(revision 29221)
+++ /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java	(revision 29222)
@@ -8,18 +8,17 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.WithAttributes;
 
-public class SingleSegmentGpxTrack implements GpxTrack {
+public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
 
-    private final Map<String, Object> attributes;
     private final GpxTrackSegment trackSegment;
 
     public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
-        this.attributes = Collections.unmodifiableMap(attributes);
+        this.attr = Collections.unmodifiableMap(attributes);
         this.trackSegment = trackSegment;
     }
 
-
     public Map<String, Object> getAttributes() {
-        return attributes;
+        return attr;
     }
 
Index: /applications/editors/josm/plugins/gpxfilter/build.xml
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/build.xml	(revision 29221)
+++ /applications/editors/josm/plugins/gpxfilter/build.xml	(revision 29222)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="GPXFilter: moved to Alt-Shift-X"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="5679"/>
     <!--
       ************************************************
Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxGrabber.java
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxGrabber.java	(revision 29221)
+++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxGrabber.java	(revision 29222)
@@ -48,5 +48,5 @@
             GpxReader reader = new GpxReader(in);
             reader.parse(false);
-            GpxData result = reader.data;
+            GpxData result = reader.getGpxData();
             in.close();
             result.fromServer = true;
Index: /applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- /applications/editors/josm/plugins/livegps/build.xml	(revision 29221)
+++ /applications/editors/josm/plugins/livegps/build.xml	(revision 29222)
@@ -27,5 +27,9 @@
 <project name="livegps" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="5681"/>
+    <!--
+      ************************************************
+      ** should not be necessary to change the following properties
+     -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java
===================================================================
--- /applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 29221)
+++ /applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 29222)
@@ -8,12 +8,12 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.WithAttributes;
 
-public class SingleSegmentGpxTrack implements GpxTrack {
+public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
 
-    private final Map<String, Object> attributes;
     private final GpxTrackSegment trackSegment;
 
     public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
-        this.attributes = Collections.unmodifiableMap(attributes);
+        this.attr = Collections.unmodifiableMap(attributes);
         this.trackSegment = trackSegment;
     }
@@ -21,5 +21,5 @@
 
     public Map<String, Object> getAttributes() {
-        return attributes;
+        return attr;
     }
 
Index: /applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- /applications/editors/josm/plugins/openvisible/build.xml	(revision 29221)
+++ /applications/editors/josm/plugins/openvisible/build.xml	(revision 29222)
@@ -32,5 +32,9 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class; updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="5679"/>
+    <!--
+      ************************************************
+      ** should not be necessary to change the following properties
+     -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
===================================================================
--- /applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java	(revision 29221)
+++ /applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java	(revision 29222)
@@ -129,8 +129,8 @@
                 throw new IllegalStateException();
             }
-            r.data.storageFile = file;
-            GpxLayer gpxLayer = new GpxLayer(r.data, fn);
+            r.getGpxData().storageFile = file;
+            GpxLayer gpxLayer = new GpxLayer(r.getGpxData(), fn);
             Main.main.addLayer(gpxLayer);
-            Main.main.addLayer(new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer));
+            Main.main.addLayer(new MarkerLayer(r.getGpxData(), tr("Markers from {0}", fn), file, gpxLayer));
 
         } else {
Index: /applications/editors/josm/plugins/public_transport/build.xml
===================================================================
--- /applications/editors/josm/plugins/public_transport/build.xml	(revision 29221)
+++ /applications/editors/josm/plugins/public_transport/build.xml	(revision 29222)
@@ -17,9 +17,9 @@
 <project name="public_transport" default="dist" basedir=".">
     <property name="josm.basedir" location="../.."/>
+    <property name="plugin.main.version" value="5679"/>
     <!--
       ************************************************
       ** should not be necessary to change the following properties
      -->
-    <property name="plugin.main.version" value="5053"/>
     <property name="josm" location="${josm.basedir}/core/dist/josm-custom.jar"/>
     <property name="plugin.build.dir" value="build"/>
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 29221)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 29222)
@@ -209,5 +209,5 @@
       final GpxReader r = new GpxReader(is);
       final boolean parsedProperly = r.parse(true);
-      data = r.data;
+      data = r.getGpxData();
 
       if (!parsedProperly)