Changeset 32907 in osm for applications/editors/josm/plugins/seachart/src/render/Signals.java

Timestamp:

2016-09-03T16:43:42+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle

File:

• applications/editors/josm/plugins/seachart/src/render/Signals.java (modified) (13 diffs)

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

@@ -1 @@
-/* Copyright 2014 Malcolm Herring
- *
- * This is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * For a copy of the GNU General Public License, see <http://www.gnu.org/licenses/>.
- */
-
+// License: GPL. For details, see LICENSE file.
 package render;
 
@@ -35 +27 @@
 import symbols.Topmarks;
 
+/**
+ * @author Malcolm Herring
+ */
 public class Signals extends Rules {
 
@@ -194 +189 @@
                 }
                 if (!str.isEmpty()) {
-                    Renderer.labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.TR, AffineTransform.getTranslateInstance(-60, -30)));
+                    Renderer.labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black,
+                            new Delta(Handle.TR, AffineTransform.getTranslateInstance(-60, -30)));
                 }
             }
@@ -241 +237 @@
             }
             if (!bstr.isEmpty()) {
-                Renderer.labelText(bstr, new Font("Arial", Font.PLAIN, 40), Symbols.Msymb, new Delta(Handle.TR, AffineTransform.getTranslateInstance(-30, -70)));
+                Renderer.labelText(bstr, new Font("Arial", Font.PLAIN, 40), Symbols.Msymb,
+                        new Delta(Handle.TR, AffineTransform.getTranslateInstance(-30, -70)));
             }
         }
@@ -358 +355 @@
         if (Renderer.zoom >= 15) {
             if (vais) {
-                Renderer.labelText("V-AIS", new Font("Arial", Font.PLAIN, 40), Symbols.Msymb, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 70)));
+                Renderer.labelText("V-AIS", new Font("Arial", Font.PLAIN, 40), Symbols.Msymb,
+                        new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 70)));
             }
             if (!bstr.isEmpty()) {
-                Renderer.labelText(bstr, new Font("Arial", Font.PLAIN, 40), Symbols.Msymb, new Delta(Handle.TR, AffineTransform.getTranslateInstance(-30, -110)));
+                Renderer.labelText(bstr, new Font("Arial", Font.PLAIN, 40), Symbols.Msymb,
+                        new Delta(Handle.TR, AffineTransform.getTranslateInstance(-30, -110)));
             }
         }
@@ -398 +397 @@
             }
         }
-        Renderer.symbol(Beacons.LightFlare, new Scheme(LightColours.get(col)), new Delta(Handle.BC, AffineTransform.getRotateInstance(Math.toRadians(120))));
+        Renderer.symbol(Beacons.LightFlare, new Scheme(LightColours.get(col)),
+                new Delta(Handle.BC, AffineTransform.getRotateInstance(Math.toRadians(120))));
         if (Renderer.zoom >= 12) {
             String str = "";
@@ -438 +438 @@
                                     }
                                     if (srad == radius) {
-                                        ArrayList<CatLIT> scats = (satts.containsKey(Att.CATLIT)) ? (ArrayList<CatLIT>) satts.get(Att.CATLIT).val : new ArrayList<CatLIT>();
+                                        ArrayList<CatLIT> scats = (satts.containsKey(Att.CATLIT)) ?
+                                                (ArrayList<CatLIT>) satts.get(Att.CATLIT).val : new ArrayList<>();
                                         if (scats.contains(CatLIT.LIT_DIR)) {
                                             if (satts.containsKey(Att.ORIENT)) {
@@ -504 +505 @@
                     }
                     if ((s1 <= 360) && (s2 <= 360) && (s1 != s2))
-                        Renderer.lightSector(LightColours.get(col1), LightColours.get(col2), radius, s1, s2, dir, (Renderer.zoom >= 15) ? str : "");
+                        Renderer.lightSector(LightColours.get(col1), LightColours.get(col2), radius, s1, s2, dir,
+                                (Renderer.zoom >= 15) ? str : "");
                 }
                 if (Renderer.zoom >= 15) {
@@ -545 +547 @@
                         sect.rng = atts.containsKey(Att.VALNMR) ? (Double) atts.get(Att.VALNMR).val : 0.0;
                         sect.hgt = atts.containsKey(Att.HEIGHT) ? (Double) atts.get(Att.HEIGHT).val : 0.0;
-                        ArrayList<ColCOL> cols = (ArrayList<ColCOL>) (atts.containsKey(Att.COLOUR) ? atts.get(Att.COLOUR).val : new ArrayList<>());
+                        ArrayList<ColCOL> cols = (ArrayList<ColCOL>)
+                                (atts.containsKey(Att.COLOUR) ? atts.get(Att.COLOUR).val : new ArrayList<>());
                         sect.col = cols.size() > 0 ? cols.get(0) : ColCOL.COL_UNK;
                         if ((sect.chr != LitCHR.CHR_UNKN) && (sect.col != null))
@@ -555 +558 @@
                         for (ArrayList<LitSect> group : groupings) {
                             LitSect mem = group.get(0);
-                            if ((lit.dir == mem.dir) && (lit.chr == mem.chr) && (lit.grp.equals(mem.grp)) && (lit.per == mem.per) && (lit.hgt == mem.hgt)) {
+                            if ((lit.dir == mem.dir) && (lit.chr == mem.chr) && (lit.grp.equals(mem.grp)) &&
+                                (lit.per == mem.per) && (lit.hgt == mem.hgt)) {
                                 group.add(lit);
                                 found = true;
@@ -630 +634 @@
                             str += df.format(tmp.hgt) + "m";
                         if (colrng.get(0).rng > 0)
-                            str += df.format(colrng.get(0).rng) + ((colrng.size() > 1) ? ((colrng.size() > 2) ? ("-" + df.format(colrng.get(colrng.size() - 1).rng)) : ("/" + df.format(colrng.get(1).rng))) : "") + "M";
-                        Renderer.labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.TL, AffineTransform.getTranslateInstance(60, y)));
+                            str += df.format(colrng.get(0).rng) + ((colrng.size() > 1) ? ((colrng.size() > 2) ?
+                                    ("-" + df.format(colrng.get(colrng.size() - 1).rng)) : ("/" + df.format(colrng.get(1).rng))) : "") + "M";
+                        Renderer.labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black,
+                                new Delta(Handle.TL, AffineTransform.getTranslateInstance(60, y)));
                         y += 40;
                         str = "";
@@ -680 +686 @@
                     str += (cats.contains(CatLIT.LIT_VERT)) ? "(vert)" : "";
                     str += (cats.contains(CatLIT.LIT_HORI)) ? "(hor)" : "";
-                    str += (!str.isEmpty() && (atts.containsKey(Att.SIGPER) || atts.containsKey(Att.HEIGHT) || atts.containsKey(Att.VALMXR)) && !str.endsWith(")")) ? "." : "";
+                    str += (!str.isEmpty() && (atts.containsKey(Att.SIGPER) || atts.containsKey(Att.HEIGHT) || atts.containsKey(Att.VALMXR))
+                            && !str.endsWith(")")) ? "." : "";
                     str += (atts.containsKey(Att.SIGPER)) ? df.format(atts.get(Att.SIGPER).val) + "s" : "";
                     str += (atts.containsKey(Att.HEIGHT)) ? df.format(atts.get(Att.HEIGHT).val) + "m" : "";
@@ -688 +695 @@
                     str += (cats.contains(CatLIT.LIT_UPPR)) ? "(Upper)" : "";
                     str += (cats.contains(CatLIT.LIT_LOWR)) ? "(Lower)" : "";
-                    Renderer.labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.TL, AffineTransform.getTranslateInstance(60, -30)));
+                    Renderer.labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black,
+                            new Delta(Handle.TL, AffineTransform.getTranslateInstance(60, -30)));
                 }
             }