Index: /trunk/README
===================================================================
--- /trunk/README	(revision 11674)
+++ /trunk/README	(revision 11675)
@@ -123,5 +123,5 @@
                             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
Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 11674)
+++ /trunk/build.xml	(revision 11675)
@@ -26,5 +26,5 @@
         <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,4 +313,7 @@
             <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>
Index: /trunk/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java	(revision 11674)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java	(revision 11675)
@@ -29,5 +29,5 @@
     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;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 11674)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 11675)
@@ -1080,6 +1080,11 @@
         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
             }
Index: /trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 11674)
+++ /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 11675)
@@ -339,6 +339,6 @@
                         }
                         currentState = states.pop();
-                        break;
-                    }
+                    }
+                    break;
                 case "bounds":
                     // do nothing, has been parsed on startElement