Changeset 14095 in josm

Timestamp:

2018-08-05T21:58:40+02:00 (6 years ago)

Author:

Don-vip

Message:

fix error_prone warnings

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/Bounds.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/UserIdentityManager.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/ChangesetQuery.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/audio/AudioPlayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/bugreport/ReportedException.java (modified) (1 diff)

trunk/build.xml

@@ -346 +346 @@
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
+            <compilerarg value="-Xep:CatchAndPrintStackTrace:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>

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

@@ -160 +160 @@
     /**
      * Constructs bounds out of two points. Coords will be rounded.
-     * @param minlat min lat
-     * @param minlon min lon
-     * @param maxlat max lat
-     * @param maxlon max lon
-     */
-    public Bounds(double minlat, double minlon, double maxlat, double maxlon) {
-        this(minlat, minlon, maxlat, maxlon, true);
+     * @param minLat min lat
+     * @param minLon min lon
+     * @param maxLat max lat
+     * @param maxLon max lon
+     */
+    public Bounds(double minLat, double minLon, double maxLat, double maxLon) {
+        this(minLat, minLon, maxLat, maxLon, true);
     }
 
     /**
      * Constructs bounds out of two points.
-     * @param minlat min lat
-     * @param minlon min lon
-     * @param maxlat max lat
-     * @param maxlon max lon
+     * @param minLat min lat
+     * @param minLon min lon
+     * @param maxLat max lat
+     * @param maxLon max lon
      * @param roundToOsmPrecision defines if lat/lon will be rounded
      */
-    public Bounds(double minlat, double minlon, double maxlat, double maxlon, boolean roundToOsmPrecision) {
+    public Bounds(double minLat, double minLon, double maxLat, double maxLon, boolean roundToOsmPrecision) {
         if (roundToOsmPrecision) {
-            this.minLat = LatLon.roundToOsmPrecision(minlat);
-            this.minLon = LatLon.roundToOsmPrecision(minlon);
-            this.maxLat = LatLon.roundToOsmPrecision(maxlat);
-            this.maxLon = LatLon.roundToOsmPrecision(maxlon);
-        } else {
-            this.minLat = minlat;
-            this.minLon = minlon;
-            this.maxLat = maxlat;
-            this.maxLon = maxlon;
+            this.minLat = LatLon.roundToOsmPrecision(minLat);
+            this.minLon = LatLon.roundToOsmPrecision(minLon);
+            this.maxLat = LatLon.roundToOsmPrecision(maxLat);
+            this.maxLon = LatLon.roundToOsmPrecision(maxLon);
+        } else {
+            this.minLat = minLat;
+            this.minLon = minLon;
+            this.maxLat = maxLat;
+            this.maxLon = maxLon;
         }
     }

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

@@ -241 +241 @@
      * Replies true if the user with name <code>username</code> is the current user
      *
-     * @param username the user name
+     * @param userName the user name
      * @return true if the user with name <code>username</code> is the current user
      */
-    public boolean isCurrentUser(String username) {
-        return this.userName != null && this.userName.equals(username);
+    public boolean isCurrentUser(String userName) {
+        return this.userName != null && this.userName.equals(userName);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java

@@ -92 +92 @@
         public final float defaultMajorZIndex;
 
-        LineType(String prefix, float defaultMajorZindex) {
+        LineType(String prefix, float defaultMajorZIndex) {
             this.prefix = prefix;
-            this.defaultMajorZIndex = defaultMajorZindex;
+            this.defaultMajorZIndex = defaultMajorZIndex;
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java

@@ -58 +58 @@
     /**
      * Construct a new StyleElement
-     * @param majorZindex like z-index, but higher priority
+     * @param majorZIndex like z-index, but higher priority
      * @param zIndex order the objects are drawn
-     * @param objectZindex like z-index, but lower priority
+     * @param objectZIndex like z-index, but lower priority
      * @param isModifier if false, a default line or node symbol is generated
      * @param defaultSelectedHandling true if default behavior for selected objects
      * is enabled, false if a style for selected state is given explicitly
      */
-    public StyleElement(float majorZindex, float zIndex, float objectZindex, boolean isModifier, boolean defaultSelectedHandling) {
-        this.majorZIndex = majorZindex;
+    public StyleElement(float majorZIndex, float zIndex, float objectZIndex, boolean isModifier, boolean defaultSelectedHandling) {
+        this.majorZIndex = majorZIndex;
         this.zIndex = zIndex;
-        this.objectZIndex = objectZindex;
+        this.objectZIndex = objectZIndex;
         this.isModifier = isModifier;
         this.defaultSelectedHandling = defaultSelectedHandling;

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

@@ -107 +107 @@
      * {@link #forUser(int)} to restrict the query to a specific user.
      *
-     * @param username the username. Must not be null.
+     * @param userName the username. Must not be null.
      * @return the query object with the applied restriction
      * @throws IllegalArgumentException if username is null.
      * @see #forUser(int)
      */
-    public ChangesetQuery forUser(String username) {
-        CheckParameterUtil.ensureParameterNotNull(username, "username");
-        this.userName = username;
+    public ChangesetQuery forUser(String userName) {
+        CheckParameterUtil.ensureParameterNotNull(userName, "userName");
+        this.userName = userName;
         this.uid = null;
         return this;

trunk/src/org/openstreetmap/josm/io/audio/AudioPlayer.java

@@ -352 +352 @@
 
     @Override
-    public void playing(URL playingURL) {
-        this.playingUrl = playingURL;
+    public void playing(URL playingUrl) {
+        this.playingUrl = playingUrl;
     }
 }

trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java

@@ -72 +72 @@
             BugReportQueue.getInstance().submit(this);
         } catch (RuntimeException e) { // NOPMD
-            e.printStackTrace();
+            Logging.error(e);
         }
     }