Changeset 9252 in josm for trunk

Timestamp:

2016-01-02T00:54:32+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10684 - update to checkstyle 6.14.1

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/ImageResource.java (modified) (1 diff)
• tools/checkstyle/checkstyle-6.14-all.jar (deleted)
• tools/checkstyle/checkstyle-6.14.1-all.jar (added)

trunk/build.xml

@@ -609 +609 @@
     <target name="checkstyle">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" 
-             classpath="tools/checkstyle/checkstyle-6.14-all.jar"/>
+             classpath="tools/checkstyle/checkstyle-6.14.1-all.jar"/>
         <checkstyle config="tools/checkstyle/josm_checks.xml">
             <fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java" 

trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreference.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.preferences.server;
 

trunk/src/org/openstreetmap/josm/tools/ImageResource.java

@@ -164 +164 @@
             realHeight = svg.getHeight();
             /* extend small images to the possible maximum, may get reduced later again */
-            if(maxSize.width != -1 && realWidth < maxSize.width) {
+            if (maxSize.width != -1 && realWidth < maxSize.width) {
                 realHeight *= maxSize.width/realWidth;
                 realWidth = maxSize.width;
             }
-            if(maxSize.height != -1 && realHeight < maxSize.height) {
+            if (maxSize.height != -1 && realHeight < maxSize.height) {
                 realWidth *= maxSize.height/realHeight;
                 realHeight = maxSize.height;