Changeset 34652 in osm for applications/editors/josm/plugins/seachart/src/render/Renderer.java

Timestamp:

2018-09-15T13:50:24+02:00 (6 years ago)

Author:

donvip

Message:

fix UnnecessaryParentheses warnings

File:

• applications/editors/josm/plugins/seachart/src/render/Renderer.java (modified) (4 diffs)

applications/editors/josm/plugins/seachart/src/render/Renderer.java

@@ -423 +423 @@
         if (delta == null) delta = new Delta(Handle.CC);
         if (bg == null) bg = new Color(0x00000000, true);
-        if ((str == null) || (str.isEmpty())) str = " ";
+        if (str == null || str.isEmpty()) str = " ";
         FontRenderContext frc = g2.getFontRenderContext();
-        GlyphVector gv = font.deriveFont((float) (font.getSize())).createGlyphVector(frc, str.equals(" ") ? "M" : str);
+        GlyphVector gv = font.deriveFont((float) font.getSize()).createGlyphVector(frc, str.equals(" ") ? "M" : str);
         Rectangle2D bounds = gv.getVisualBounds();
         double width = bounds.getWidth();
@@ -593 +593 @@
                     pos.translate((mid.getX() - centre.getX()), (mid.getY() - centre.getY()));
                     Symbol label = new Symbol();
-                    label.add(new Instr(Form.BBOX, new Rectangle2D.Double((-width / 2), (-height), width, height)));
+                    label.add(new Instr(Form.BBOX, new Rectangle2D.Double((-width / 2), -height, width, height)));
                     label.add(new Instr(Form.TEXT, new Caption(str, font, colour, new Delta(Handle.BC))));
                     Symbols.drawSymbol(g2, label, sScale, centre.getX(), centre.getY(), null, new Delta(Handle.BC, pos));
@@ -603 +603 @@
     public static void lightSector(Color col1, Color col2, double radius, double s1, double s2, Double dir, String str) {
         if ((zoom >= 16) && (radius > 0.2)) {
-            radius /= (Math.pow(2, zoom-15));
+            radius /= Math.pow(2, zoom-15);
         }
         double mid = (((s1 + s2) / 2) + (s1 > s2 ? 180 : 0)) % 360;
@@ -632 +632 @@
                     2 * (radial - arcWidth), -(s1 + 90), ((s1 < s2) ? (s1 - s2) : (s1 - s2 - 360)), Arc2D.OPEN));
         }
-        if ((str != null) && (!str.isEmpty())) {
+        if (str != null && !str.isEmpty()) {
             Font font = new Font("Arial", Font.PLAIN, 40);
             double arc = (s2 > s1) ? (s2 - s1) : (s2 - s1 + 360);