Changeset 9793 in josm for trunk

Timestamp:

2016-02-13T20:49:22+01:00 (8 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• test/performance/org/openstreetmap/josm/PerformanceTestUtils.java (modified) (2 diffs)
• test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1086 +1086 @@
                 Set evalue = (Set) e.getValue();
                 JsonArrayBuilder a = Json.createArrayBuilder();
-                for (Object evo: (Collection) evalue) {
+                for (Object evo: evalue) {
                     a.add(evo.toString());
                 }
@@ -1418 +1418 @@
      * setting, add it to the list here with an expiry date (written as comment). If you
      * see something with an expiry date in the past, remove it from the list.
+     * @param loadedVersion JOSM version when the preferences file was written
      */
     private void removeObsolete(int loadedVersion) {

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

@@ -33 +33 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -261 +260 @@
         }
     }
+
     /* can be set by tests, if detailed benchmark data is requested */
     public BenchmarkData benchmarkData = null;

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

@@ -2 +2 @@
 package org.openstreetmap.josm;
 
+import org.openstreetmap.josm.io.XmlWriter;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-import org.openstreetmap.josm.io.XmlWriter;
 
 /**
@@ -63 +63 @@
     /**
      * Emit one data value for the Jenkins Measurement Plots Plugin.
-     * 
+     *
      * The plugin collects the values over multiple builds and plots them in a diagram.
-     * 
-     * @see https://wiki.jenkins-ci.org/display/JENKINS/Measurement+Plots+Plugin
+     *
      * @param name the name / title of the measurement
      * @param value the value
+     * @see https://wiki.jenkins-ci.org/display/JENKINS/Measurement+Plots+Plugin
      */
     public static void measurementPlotsPluginOutput(String name, double value) {

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java

@@ -68 +68 @@
         }
     }
+
     private static final EnumMap<Feature, BooleanStyleSetting> filters = new EnumMap<>(Feature.class);
 
@@ -112 +113 @@
 
         MapCSSStyleSource defaultStyle = null;
-        for (int i = 0; i< sources.size(); i++) {
+        for (int i = 0; i < sources.size(); i++) {
             StyleSource s = sources.get(i);
             if ("resource://styles/standard/elemstyles.mapcss".equals(s.url)) {
@@ -199 +200 @@
                 try {
                     Thread.sleep(300);
-                } catch (InterruptedException ex) {}
+                } catch (InterruptedException ex) {
+                    Main.warn(ex);
+                }
                 StyledMapRenderer.BenchmarkData data = new StyledMapRenderer.BenchmarkData();
                 data.skipDraw = skipDraw;