Changeset 16208 in josm for trunk

Timestamp:

2020-03-28T09:34:21+01:00 (5 years ago)

Author:

simon04

Message:

StyledMapRenderer.drawArea: fix redundant local variable, unboxed float

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -425 +425 @@
      * Worker function for drawing areas.
      *
-     * @param path the path object for the area that should be drawn; in case
+     * @param area the path object for the area that should be drawn; in case
      * of multipolygons, this can path can be a complex shape with one outer
      * polygon and one or more inner polygons
@@ -437 +437 @@
      * @param disabled If this should be drawn with a special disabled style.
      */
-    protected void drawArea(MapViewPath path, Color color,
+    protected void drawArea(MapViewPath area, Color color,
             MapImage fillImage, Float extent, MapViewPath pfClip, boolean disabled) {
         if (!isOutlineOnly && color.getAlpha() != 0) {
-            Shape area = path;
             g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
             if (fillImage == null) {
@@ -457 +456 @@
                     Logging.warn("Unable to get image from " + fillImage);
                 }
-                Float alpha = fillImage.getAlphaFloat();
+                float alpha = fillImage.getAlphaFloat();
                 if (!Utils.equalsEpsilon(alpha, 1f)) {
                     g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));