Changeset 11294 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

Timestamp:

2016-11-22T16:07:59+01:00 (7 years ago)

Author:

simon04

Message:

Fix ​http://errorprone.info/bugpattern/NarrowingCompoundAssignment

File:

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

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

@@ -806 +806 @@
             LineMetrics metrics = text.font.getLineMetrics(s, frc);
             if (bs.vAlign == VerticalTextAlignment.ABOVE) {
-                y -= -box.y + metrics.getDescent();
+                y -= -box.y + (int) metrics.getDescent();
             } else if (bs.vAlign == VerticalTextAlignment.TOP) {
-                y -= -box.y - metrics.getAscent();
+                y -= -box.y - (int) metrics.getAscent();
             } else if (bs.vAlign == VerticalTextAlignment.CENTER) {
-                y += (metrics.getAscent() - metrics.getDescent()) / 2;
+                y += (int) ((metrics.getAscent() - metrics.getDescent()) / 2);
             } else if (bs.vAlign == VerticalTextAlignment.BELOW) {
-                y += box.y + box.height + metrics.getAscent() + 2;
+                y += box.y + box.height + (int) metrics.getAscent() + 2;
             } else throw new AssertionError();
         }