Changeset 10760 in josm for trunk

Timestamp:

2016-08-07T17:49:25+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2153 - Boxing and unboxing should not be immediately reversed

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Files:

• AreaElement.java (modified) (2 diffs)
• NodeElement.java (modified) (1 diff)

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

@@ -54 +54 @@
             );
 
-            fillImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255))));
+            fillImage.alpha = Math.min(255, Math.max(0, Main.pref.getInteger("mappaint.fill-image-alpha", 255)));
             Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class));
             if (pAlpha != null) {
@@ -69 +69 @@
                     // right, especially as named map colors can be changed in
                     // the preference GUI and written to the preferences file.
-                    alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
+                    alpha = Math.min(255, Math.max(0, Main.pref.getInteger("mappaint.fillalpha", 50)));
                 }
                 Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class));

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

@@ -184 +184 @@
         mapImage.offsetY = Math.round(offsetYF);
 
-        mapImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.icon-image-alpha", 255))));
+        mapImage.alpha = Math.min(255, Math.max(0, Main.pref.getInteger("mappaint.icon-image-alpha", 255)));
         Integer pAlpha = Utils.colorFloat2int(c.get(keys[ICON_OPACITY_IDX], null, float.class));
         if (pAlpha != null) {