Changeset 8632 in josm


Ignore:
Timestamp:
2015-08-01T17:54:08+02:00 (4 years ago)
Author:
Don-vip
Message:

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

Location:
trunk
Files:
1 added
1 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/.checkstyle

    r8528 r8632  
    22
    33<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
    4   <fileset name="all" enabled="true" check-config-name="JOSM" local="false">
     4  <local-check-config name="JOSM" location="tools/checkstyle/josm_checks.xml" type="project" description="">
     5    <additional-data name="protect-config-file" value="false"/>
     6  </local-check-config>
     7  <fileset name="all" enabled="true" check-config-name="JOSM" local="true">
    58    <file-match-pattern match-pattern="." include-pattern="true"/>
    69  </fileset>
  • trunk/.classpath

    r8624 r8632  
    2626        <classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.3.jar"/>
    2727        <classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
     28        <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
    2829        <classpathentry kind="output" path="bin"/>
    2930</classpath>
  • trunk/.settings/org.eclipse.jdt.groovy.core.prefs

    r7980 r8632  
    11eclipse.preferences.version=1
    2 groovy.compiler.level=23
     2groovy.compiler.level=24
  • trunk/.settings/sf.eclipse.javacc.prefs

    r7326 r8632  
    55JJ_NATURE=true
    66JTB_OPTIONS=-ia -jd -tk
     7KEEP_DEL_FILES_IN_HISTORY=false
    78MARK_GEN_FILES_AS_DERIVED=true
    89RUNTIME_JJJAR=${project_loc}/tools/javacc.jar
    910RUNTIME_JTBJAR=${eclipse_home}/plugins/sf.eclipse.javacc_1.5.27/jtb-1.4.7.jar
     11RUNTIME_JVMOPTIONS=
    1012SUPPRESS_WARNINGS=false
    1113eclipse.preferences.version=1
  • trunk/build.xml

    r8535 r8632  
    576576
    577577    <target name="checkstyle">
    578         <taskdef resource="checkstyletask.properties" classpath="tools/checkstyle/checkstyle-6.7-all.jar"/>
     578        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
     579                classpath="tools/checkstyle/checkstyle-6.8.1-all.jar"/>
    579580        <checkstyle config="tools/checkstyle/josm_checks.xml">
    580581            <fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java"
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r8616 r8632  
    12881288     * @param dashes The dash style to use. This is drawn using dashedColor. <code>null</code> if unused.
    12891289     * @param dashedColor The color of the dashes.
    1290      * @param offset
     1290     * @param offset The offset
    12911291     * @param showOrientation show arrows that indicate the technical orientation of
    12921292     *              the way (defined by order of nodes)
  • trunk/src/org/openstreetmap/josm/gui/layer/ImageProcessor.java

    r8625 r8632  
    2121     * @return processed image
    2222     */
    23     public BufferedImage process(BufferedImage image);
    24 
     23    BufferedImage process(BufferedImage image);
    2524}
  • trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java

    r8623 r8632  
    66 * @author Michael Zangl
    77 */
    8 public class PerformanceTestUtils {
     8public final class PerformanceTestUtils {
    99    /**
    1010     * A timer that measures the time from it's creation to the {@link #done()} call.
    11     * @author Michael Zangl
     11     * @author Michael Zangl
    1212     */
    1313    public static class PerformanceTestTimer {
  • trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java

    r8623 r8632  
    2626    private static final int TEST_STRING_COUNT = 10000;
    2727    private static final int STRING_INTERN_TESTS = 5000000;
    28     private static final double[] TAG_NODE_RATIOS = new double[] { .05, .3, 3, 20, 200 };
     28    private static final double[] TAG_NODE_RATIOS = new double[] {.05, .3, 3, 20, 200};
    2929    private ArrayList<String> testStrings = new ArrayList<>();
    3030    private Random random;
  • trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java

    r8623 r8632  
    1414 * @author Michael Zangl
    1515 */
    16 public class OsmDataGenerator {
     16public final class OsmDataGenerator {
    1717    private static final int DEFAULT_KEY_VALUE_RATIO = 3;
    1818    private static final int DEFAULT_NODE_COUNT = 1000;
    1919    private static final String DATA_DIR = "data_nodist" + File.separator + "osmfiles";
    2020
     21    private OsmDataGenerator() {
     22        // private constructor for utility classes
     23    }
     24
    2125    /**
    2226     * A generator that generates test data by filling a data set.
    2327     * @author Michael Zangl
    2428     */
    25     public static abstract class DataGenerator {
     29    public abstract static class DataGenerator {
    2630        private String datasetName;
    2731        protected final Random random;
     
    5761        /**
    5862         * Create a random node and add it to the dataset.
    59          * @return
     63         * @return a random node
    6064         */
    6165        protected Node createRandomNode(DataSet ds) {
     
    9498    /**
    9599     * A data generator that generates a bunch of random nodes.
    96     * @author Michael Zangl
     100     * @author Michael Zangl
    97101     */
    98102    public static class NodeDataGenerator extends DataGenerator {
     
    100104        private final int nodeCount;
    101105
    102         private NodeDataGenerator(String datasetName, int nodeCount) {
     106        protected NodeDataGenerator(String datasetName, int nodeCount) {
    103107            super(datasetName);
    104108            this.nodeCount = nodeCount;
     
    124128    /**
    125129     * A data generator that generates a bunch of random nodes and fills them with keys/values.
    126     * @author Michael Zangl
    127      */
    128     public static class KeyValueDataGenerator extends NodeDataGenerator {
     130     * @author Michael Zangl
     131     */
     132    public static final class KeyValueDataGenerator extends NodeDataGenerator {
    129133
    130134        private static final int VALUE_COUNT = 200;
  • trunk/tools/checkstyle/josm_checks.xml

    r8540 r8632  
    113113  </module>
    114114  <module name="SuppressionFilter">
    115     <property name="file" value="tools/checkstyle/josm_filters.xml"/>
     115    <property name="file" value="${basedir}/tools/checkstyle/josm_filters.xml"/>
    116116  </module>
    117117</module>
Note: See TracChangeset for help on using the changeset viewer.