Changeset 11675 in josm

Timestamp:

2017-03-05T00:31:00+01:00 (7 years ago)

Author:

Don-vip

Message:

update to error_prone 2.0.18

Location:

trunk

Files:

• README (modified) (1 diff)
• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/GpxReader.java (modified) (1 diff)
• tools/error_prone_ant-2.0.15.jar (deleted)
• tools/error_prone_ant-2.0.18.jar (added)

trunk/README

@@ -123 +123 @@
                             problems in source code); can be launched as an ant target in build.xml
     - commons-cli-1.3.1.jar dependency of Groovy Ant task
-    - error_prone_ant-2.0.15.jar
+    - error_prone_ant-2.0.18.jar
                             used to detect code errors during compilation
     - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential

trunk/build.xml

@@ -26 +26 @@
         <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
         <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.8.jar"/>
-        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.15.jar"/>
+        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.18.jar"/>
         <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <!-- build parameter: compression level (ant -Dclevel=N)
@@ -313 +313 @@
             <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:ImmutableEnumChecker:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>

trunk/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java

@@ -29 +29 @@
     private int[] tileYMax;
     private double[] degreesPerTile;
-    private static final float SCALE_DENOMINATOR_ZOOM_LEVEL_1 = 559082264.0287178f;
+    private static final double SCALE_DENOMINATOR_ZOOM_LEVEL_1 = 559082264.0287178d;
 
     /**

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -1080 +1080 @@
         private void refreshRecentTags() {
             switch (PROPERTY_REFRESH_RECENT.get()) {
-                case REFRESH: cacheRecentTags(); // break missing intentionally
-                case STATUS: suggestRecentlyAddedTags(); break;
+                case REFRESH:
+                    cacheRecentTags();
+                    suggestRecentlyAddedTags();
+                    break;
+                case STATUS:
+                    suggestRecentlyAddedTags();
+                    break;
                 default: // Do nothing
             }

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -339 +339 @@
                         }
                         currentState = states.pop();
-                        break;
-                    }
+                    }
+                    break;
                 case "bounds":
                     // do nothing, has been parsed on startElement