Index: trunk/.checkstyle
===================================================================
--- trunk/.checkstyle	(revision 8631)
+++ trunk/.checkstyle	(revision 8632)
@@ -2,5 +2,8 @@
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <fileset name="all" enabled="true" check-config-name="JOSM" local="false">
+  <local-check-config name="JOSM" location="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>
Index: trunk/.classpath
===================================================================
--- trunk/.classpath	(revision 8631)
+++ trunk/.classpath	(revision 8632)
@@ -26,4 +26,5 @@
 	<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.3.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
+	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: trunk/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- trunk/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 8631)
+++ trunk/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 8632)
@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-groovy.compiler.level=23
+groovy.compiler.level=24
Index: trunk/.settings/sf.eclipse.javacc.prefs
===================================================================
--- trunk/.settings/sf.eclipse.javacc.prefs	(revision 8631)
+++ trunk/.settings/sf.eclipse.javacc.prefs	(revision 8632)
@@ -5,7 +5,9 @@
 JJ_NATURE=true
 JTB_OPTIONS=-ia -jd -tk
+KEEP_DEL_FILES_IN_HISTORY=false
 MARK_GEN_FILES_AS_DERIVED=true
 RUNTIME_JJJAR=${project_loc}/tools/javacc.jar
 RUNTIME_JTBJAR=${eclipse_home}/plugins/sf.eclipse.javacc_1.5.27/jtb-1.4.7.jar
+RUNTIME_JVMOPTIONS=
 SUPPRESS_WARNINGS=false
 eclipse.preferences.version=1
Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 8631)
+++ trunk/build.xml	(revision 8632)
@@ -576,5 +576,6 @@
 
     <target name="checkstyle">
-        <taskdef resource="checkstyletask.properties" classpath="tools/checkstyle/checkstyle-6.7-all.jar"/>
+        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" 
+        	classpath="tools/checkstyle/checkstyle-6.8.1-all.jar"/>
         <checkstyle config="tools/checkstyle/josm_checks.xml">
             <fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java" 
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 8631)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 8632)
@@ -1288,5 +1288,5 @@
      * @param dashes The dash style to use. This is drawn using dashedColor. <code>null</code> if unused.
      * @param dashedColor The color of the dashes.
-     * @param offset
+     * @param offset The offset
      * @param showOrientation show arrows that indicate the technical orientation of
      *              the way (defined by order of nodes)
Index: trunk/src/org/openstreetmap/josm/gui/layer/ImageProcessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/ImageProcessor.java	(revision 8631)
+++ trunk/src/org/openstreetmap/josm/gui/layer/ImageProcessor.java	(revision 8632)
@@ -21,5 +21,4 @@
      * @return processed image
      */
-    public BufferedImage process(BufferedImage image);
-
+    BufferedImage process(BufferedImage image);
 }
Index: trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java	(revision 8631)
+++ trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java	(revision 8632)
@@ -6,8 +6,8 @@
  * @author Michael Zangl
  */
-public class PerformanceTestUtils {
+public final class PerformanceTestUtils {
     /**
      * A timer that measures the time from it's creation to the {@link #done()} call.
-    * @author Michael Zangl
+     * @author Michael Zangl
      */
     public static class PerformanceTestTimer {
Index: trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java	(revision 8631)
+++ trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java	(revision 8632)
@@ -26,5 +26,5 @@
     private static final int TEST_STRING_COUNT = 10000;
     private static final int STRING_INTERN_TESTS = 5000000;
-    private static final double[] TAG_NODE_RATIOS = new double[] { .05, .3, 3, 20, 200 };
+    private static final double[] TAG_NODE_RATIOS = new double[] {.05, .3, 3, 20, 200};
     private ArrayList<String> testStrings = new ArrayList<>();
     private Random random;
Index: trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java	(revision 8631)
+++ trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java	(revision 8632)
@@ -14,14 +14,18 @@
  * @author Michael Zangl
  */
-public class OsmDataGenerator {
+public final class OsmDataGenerator {
     private static final int DEFAULT_KEY_VALUE_RATIO = 3;
     private static final int DEFAULT_NODE_COUNT = 1000;
     private static final String DATA_DIR = "data_nodist" + File.separator + "osmfiles";
 
+    private OsmDataGenerator() {
+        // private constructor for utility classes
+    }
+
     /**
      * A generator that generates test data by filling a data set.
      * @author Michael Zangl
      */
-    public static abstract class DataGenerator {
+    public abstract static class DataGenerator {
         private String datasetName;
         protected final Random random;
@@ -57,5 +61,5 @@
         /**
          * Create a random node and add it to the dataset.
-         * @return
+         * @return a random node
          */
         protected Node createRandomNode(DataSet ds) {
@@ -94,5 +98,5 @@
     /**
      * A data generator that generates a bunch of random nodes.
-    * @author Michael Zangl
+     * @author Michael Zangl
      */
     public static class NodeDataGenerator extends DataGenerator {
@@ -100,5 +104,5 @@
         private final int nodeCount;
 
-        private NodeDataGenerator(String datasetName, int nodeCount) {
+        protected NodeDataGenerator(String datasetName, int nodeCount) {
             super(datasetName);
             this.nodeCount = nodeCount;
@@ -124,7 +128,7 @@
     /**
      * A data generator that generates a bunch of random nodes and fills them with keys/values.
-    * @author Michael Zangl
-     */
-    public static class KeyValueDataGenerator extends NodeDataGenerator {
+     * @author Michael Zangl
+     */
+    public static final class KeyValueDataGenerator extends NodeDataGenerator {
 
         private static final int VALUE_COUNT = 200;
Index: trunk/tools/checkstyle/josm_checks.xml
===================================================================
--- trunk/tools/checkstyle/josm_checks.xml	(revision 8631)
+++ trunk/tools/checkstyle/josm_checks.xml	(revision 8632)
@@ -113,5 +113,5 @@
   </module>
   <module name="SuppressionFilter">
-    <property name="file" value="tools/checkstyle/josm_filters.xml"/>
+    <property name="file" value="${basedir}/tools/checkstyle/josm_filters.xml"/>
   </module>
 </module>