Index: /applications/editors/josm/plugins/dataimport/.checkstyle
===================================================================
--- /applications/editors/josm/plugins/dataimport/.checkstyle	(revision 33024)
+++ /applications/editors/josm/plugins/dataimport/.checkstyle	(revision 33024)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="JOSM" location="/JOSM/tools/checkstyle/josm_checks.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="JOSM" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="DerivedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src/org/openstreetmap/josm/plugins/dataimport/io/tcx"/>
+    <filter-data value="data"/>
+    <filter-data value="images"/>
+    <filter-data value="resources"/>
+    <filter-data value="styles"/>
+    <filter-data value="scripts"/>
+  </filter>
+</fileset-config>
Index: /applications/editors/josm/plugins/dataimport/.project
===================================================================
--- /applications/editors/josm/plugins/dataimport/.project	(revision 33023)
+++ /applications/editors/josm/plugins/dataimport/.project	(revision 33024)
@@ -17,7 +17,13 @@
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java	(revision 33023)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java	(revision 33024)
@@ -1,5 +1,3 @@
-/**
- * This plugin leverages JOSM to import files.
- */
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.dataimport;
 
@@ -21,5 +19,5 @@
      * @param info plugin information
      */
-    public DataImportPlugin(PluginInformation info) throws IOException{
+    public DataImportPlugin(PluginInformation info) throws IOException {
         super(info);
 
Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 33023)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 33024)
@@ -1,5 +1,3 @@
-/**
- *
- */
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.dataimport.io;
 
@@ -36,5 +34,5 @@
 
     public TangoGPS() {
-        super(new ExtensionFileFilter("log", "log",tr("TangoGPS Files (*.log)")));
+        super(new ExtensionFileFilter("log", "log", tr("TangoGPS Files (*.log)")));
     }
 
@@ -43,5 +41,5 @@
      * This function imports data from file and adds trackpoints to a layer.
      * Read a log file from TangoGPS. These are simple text files in the
-     * form: <lat>,<lon>,<elevation>,<speed>,<course>,<hdop>,<datetime>
+     * form: {@code <lat>,<lon>,<elevation>,<speed>,<course>,<hdop>,<datetime>}
      */
     @Override
@@ -76,5 +74,5 @@
             }
             failure = failure - imported;
-            if(imported > 0) {
+            if (imported > 0) {
                 GpxData data = new GpxData();
                 data.tracks.add(new ImmutableGpxTrack(Collections.singleton(currentTrackSeg), Collections.<String, Object>emptyMap()));
@@ -90,5 +88,5 @@
                 }
             }
-            showInfobox(imported,failure);
+            showInfobox(imported, failure);
         }
     }
@@ -104,5 +102,5 @@
     }
 
-    private void showInfobox(int success,int failure) {
+    private void showInfobox(int success, int failure) {
         String msg = tr("Coordinates imported: ") + success + " " + tr("Format errors: ") + failure + "\n";
         if (success > 0) {
Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 33023)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 33024)
@@ -47,13 +47,12 @@
  * The Garmin TCX Schema file can be downloaded from: <a
  * href="http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd</a>
- * The command used to generate the code is: <code>
- * xjc.bat -p org.openstreetmap.josm.io.tcx TrainingCenterDatabasev2.xsd -d <path to the src folder of JOSM>
- * </code>
+ * The command used to generate the code is:
+ * {@code xjc.bat -p org.openstreetmap.josm.io.tcx TrainingCenterDatabasev2.xsd -d <path to the src folder of JOSM>}
  * <p>
  * Note: if you get an exception that JAXB 2.1 is not supported on your system, you will have to add the jaxb-api.jar
  * to the endorsed directory (create it if necessary) of your JRE. Usually it is something like this:
- * \<program files>\Java\jre<java version>\lib\endorsed
+ * {@code \<program files>\Java\jre<java version>\lib\endorsed}
  *
- * @author adrian <as@nitegate.de>
+ * @author adrian &lt;as@nitegate.de&gt;
  *
  */
@@ -64,12 +63,8 @@
     private GpxData gpxData;
 
-
     public Tcx() {
-        super(new ExtensionFileFilter("tcx", "tcx",tr("TCX Files (*.tcx)")));
-    }
-
-    /**
-     * @param tcxFile
-     */
+        super(new ExtensionFileFilter("tcx", "tcx", tr("TCX Files (*.tcx)")));
+    }
+
     @Override
     public void importData(File tcxFile, ProgressMonitor progressMonitor) throws IOException {
@@ -80,9 +75,7 @@
         GpxLayer gpxLayer = new GpxLayer(gpxData, tcxFile.getName());
         Main.getLayerManager().addLayer(gpxLayer);
-        if (Main.pref.getBoolean("marker.makeautomarkers", true))
-        {
+        if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
             MarkerLayer ml = new MarkerLayer(gpxData, tr("Markers from {0}", tcxFile.getName()), tcxFile, gpxLayer);
-            if (ml.data.size() > 0)
-            {
+            if (ml.data.size() > 0) {
                 Main.getLayerManager().addLayer(ml);
             }
@@ -98,5 +91,5 @@
                     .newInstance(TrainingCenterDatabaseT.class);
             Unmarshaller unmarshaller = jc.createUnmarshaller();
-            JAXBElement<TrainingCenterDatabaseT> element = (JAXBElement<TrainingCenterDatabaseT>)unmarshaller
+            JAXBElement<TrainingCenterDatabaseT> element = (JAXBElement<TrainingCenterDatabaseT>) unmarshaller
                     .unmarshal(tcxFile);
 
@@ -145,7 +138,4 @@
     }
 
-    /**
-     * @param tcd
-     */
     private void parseDataFromActivities(TrainingCenterDatabaseT tcd) {
         int lap = 0;
@@ -188,7 +178,4 @@
     }
 
-    /**
-     * @param tcd
-     */
     private void parseDataFromCourses(TrainingCenterDatabaseT tcd) {
         if ((tcd.getCourses() != null)