Index: applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- applications/editors/josm/plugins/livegps/build.xml	(revision 36119)
+++ applications/editors/josm/plugins/livegps/build.xml	(revision 36120)
@@ -17,3 +17,14 @@
     <import file="../build-common.xml"/>
 
+    <target name="checkstyle" depends="checkstyle-compile">
+        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties">
+            <classpath refid="checkstyle.classpath"/>
+            <classpath path="${checkstyle-build.dir}"/>
+        </taskdef>
+        <checkstyle config="checkstyle-config.xml">
+            <fileset dir="${basedir}/src" includes="**/*.java" />
+            <formatter type="xml" toFile="checkstyle-josm-${ant.project.name}.xml"/>
+        </checkstyle>
+    </target>
+
 </project>
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java	(revision 36119)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java	(revision 36120)
@@ -24,4 +24,7 @@
 import org.openstreetmap.josm.tools.Logging;
 
+/**
+ * Acquires NMEA data from a GPSD
+ */
 public class LiveGpsAcquirer implements Runnable {
     private String gpsdHost;
@@ -153,7 +156,7 @@
 
                 if (JSONProtocol == true)
-                    gpsData = ParseJSON(line);
+                    gpsData = parseJSON(line);
                 else
-                    gpsData = ParseOld(line);
+                    gpsData = parseOld(line);
 
                 if (gpsData == null)
@@ -278,5 +281,5 @@
     }
 
-    private LiveGpsData ParseJSON(String line) {
+    private LiveGpsData parseJSON(String line) {
         JsonObject report;
         double lat, lon;
@@ -319,5 +322,5 @@
     }
 
-    private LiveGpsData ParseOld(String line) {
+    private LiveGpsData parseOld(String line) {
         String[] words;
         double lat = 0;
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirerNMEA.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirerNMEA.java	(revision 36119)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirerNMEA.java	(revision 36120)
@@ -142,5 +142,5 @@
                     int c = serReader.read();
                     if (c == '$') {
-                        Logging.trace("Parsing NMEA: " + sb.toString().replaceAll("[\r\n]",""));
+                        Logging.trace("Parsing NMEA: " + sb.toString().replaceAll("[\r\n]", ""));
                         parser.parseNMEASentence(sb.toString());
                         sb.delete(0, sb.length());
@@ -155,5 +155,5 @@
                         Collection<WayPoint> wpts = parser.getAndDropWaypoints();
                         for (WayPoint w : wpts) {
-                            if(w.getInstant() == null)
+                            if (w.getInstant() == null)
                                 continue;
                             if (w.getInstant().equals(lasttime)) {
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsData.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsData.java	(revision 36119)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsData.java	(revision 36120)
@@ -4,5 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Point;
 import java.text.DecimalFormat;
 
@@ -14,9 +13,7 @@
 import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Geometry;
@@ -33,5 +30,5 @@
     private float epx, epy;
     private String wayString;
-    private WayPoint wp;
+    private WayPoint waypoint;
     private static final DecimalFormat offsetFormat = new DecimalFormat("0.00");
 
@@ -57,13 +54,13 @@
      */
     public WayPoint getWaypoint() {
-        return this.wp;
+        return this.waypoint;
     }
 
     /**
      * Set the waypoint to transfer additional data form NMEA input
-     * @param wp waypoint to set
-     */
-    public void setWaypoint(WayPoint wp) {
-        this.wp = wp;
+     * @param waypoint waypoint to set
+     */
+    public void setWaypoint(WayPoint waypoint) {
+        this.waypoint = waypoint;
     }
 
@@ -186,4 +183,5 @@
                      protected void decorateNameWithId(StringBuilder name, IPrimitive primitive) {
                      }
+
                      @Override
                      protected void decorateNameWithNodes(StringBuilder name, IWay way) {
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java	(revision 36119)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java	(revision 36120)
@@ -140,7 +140,10 @@
             public void run() {
                 /* prevent flickering - skip the connecting message when NMEA input is working */
-                if (!(oldStatus.getStatus() == LiveGpsStatus.GpsStatus.CONNECTION_FAILED && status.getStatus() == LiveGpsStatus.GpsStatus.CONNECTING && nmeaStatus.getStatus() == LiveGpsStatus.GpsStatus.CONNECTED))
+                if (!(oldStatus.getStatus() == LiveGpsStatus.GpsStatus.CONNECTION_FAILED
+                && status.getStatus() == LiveGpsStatus.GpsStatus.CONNECTING
+                && nmeaStatus.getStatus() == LiveGpsStatus.GpsStatus.CONNECTED))
                     statusLabel.setText(status.getStatusMessage());
-                if (status.getStatus() != LiveGpsStatus.GpsStatus.CONNECTED && nmeaStatus.getStatus() != LiveGpsStatus.GpsStatus.CONNECTED) {
+                if (status.getStatus() != LiveGpsStatus.GpsStatus.CONNECTED
+                && nmeaStatus.getStatus() != LiveGpsStatus.GpsStatus.CONNECTED) {
                     panel.setBackground(Color.RED);
                 } else {
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDrawHelper.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDrawHelper.java	(revision 36119)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDrawHelper.java	(revision 36120)
@@ -14,4 +14,7 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 
+/**
+ * Painting the LiveGPS data layer, especially the current position arrow
+ */
 public class LiveGpsDrawHelper extends GpxDrawHelper {
     private final LiveGpsLayer layer;
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java	(revision 36119)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java	(revision 36120)
@@ -22,4 +22,7 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 
+/**
+ * The LiveGPS layer
+ */
 public class LiveGpsLayer extends GpxLayer implements PropertyChangeListener {
     public static final String LAYER_NAME = tr("LiveGPS layer");
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java	(revision 36119)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java	(revision 36120)
@@ -29,4 +29,7 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Main LiveGPS plugin class
+ */
 public class LiveGpsPlugin extends Plugin implements LayerChangeListener {
     private boolean enabled = false;
Index: applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 36119)
+++ applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 36120)
@@ -11,4 +11,7 @@
 import org.openstreetmap.josm.data.gpx.WithAttributes;
 
+/**
+ * LiveGPS track which gets step by step expanded with new data
+ */
 public class SingleSegmentGpxTrack extends WithAttributes implements IGpxTrack {