Changeset 8632 in josm for trunk

Timestamp:

2015-08-01T17:54:08+02:00 (9 years ago)

Author:

Don-vip

Message:

update Checkstyle to 6.8.1, update Eclipse project, fix checkstyle issues

Location:

trunk

Files:

• .checkstyle (modified) (1 diff)
• .classpath (modified) (1 diff)
• .settings/org.eclipse.jdt.groovy.core.prefs (modified) (1 diff)
• .settings/sf.eclipse.javacc.prefs (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/ImageProcessor.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/PerformanceTestUtils.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java (modified) (5 diffs)
• tools/checkstyle/checkstyle-6.7-all.jar (deleted)
• tools/checkstyle/checkstyle-6.8.1-all.jar (added)
• tools/checkstyle/josm_checks.xml (modified) (1 diff)

trunk/.checkstyle

@@ -2 +2 @@
 
 <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>

trunk/.classpath

@@ -26 +26 @@
         <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>

trunk/.settings/org.eclipse.jdt.groovy.core.prefs

@@ -1 +1 @@
 eclipse.preferences.version=1
-groovy.compiler.level=23
+groovy.compiler.level=24

trunk/.settings/sf.eclipse.javacc.prefs

@@ -5 +5 @@
 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

trunk/build.xml

@@ -576 +576 @@
 
     <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" 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1288 +1288 @@
      * @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)

trunk/src/org/openstreetmap/josm/gui/layer/ImageProcessor.java

@@ -21 +21 @@
      * @return processed image
      */
-    public BufferedImage process(BufferedImage image);
-
+    BufferedImage process(BufferedImage image);
 }

trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java

@@ -6 +6 @@
  * @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 {

trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java

@@ -26 +26 @@
     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;

trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java

@@ -14 +14 @@
  * @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 +61 @@
         /**
          * Create a random node and add it to the dataset.
-         * @return
+         * @return a random node
          */
         protected Node createRandomNode(DataSet ds) {
@@ -94 +98 @@
     /**
      * A data generator that generates a bunch of random nodes.
-    * @author Michael Zangl
+     * @author Michael Zangl
      */
     public static class NodeDataGenerator extends DataGenerator {
@@ -100 +104 @@
         private final int nodeCount;
 
-        private NodeDataGenerator(String datasetName, int nodeCount) {
+        protected NodeDataGenerator(String datasetName, int nodeCount) {
             super(datasetName);
             this.nodeCount = nodeCount;
@@ -124 +128 @@
     /**
      * 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;

trunk/tools/checkstyle/josm_checks.xml

@@ -113 +113 @@
   </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>