Changeset 34652 in osm for applications/editors/josm/plugins/seachart/src/render/Signals.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/Signals.java (modified) (10 diffs)

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

@@ -125 +125 @@
                         case BCNSAW:
                         case BCNSPP:
-                                if ((feature.objs.containsKey(Obj.TOPMAR)) || (feature.objs.containsKey(Obj.DAYMAR))) {
+                                if (feature.objs.containsKey(Obj.TOPMAR) || feature.objs.containsKey(Obj.DAYMAR)) {
                                         Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -140)));
                                 } else {
@@ -134 +134 @@
                         case LITVES:
                         case BOYINB:
-                                if ((feature.objs.containsKey(Obj.TOPMAR)) || (feature.objs.containsKey(Obj.DAYMAR))) {
+                                if (feature.objs.containsKey(Obj.TOPMAR) || feature.objs.containsKey(Obj.DAYMAR)) {
                                         Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -110)));
                                 } else {
@@ -142 +142 @@
                         case LITMAJ:
                         case LITMIN:
-                                if ((feature.objs.containsKey(Obj.TOPMAR)) || (feature.objs.containsKey(Obj.DAYMAR))) {
+                                if (feature.objs.containsKey(Obj.TOPMAR) || feature.objs.containsKey(Obj.DAYMAR)) {
                                         Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -90)));
                                 } else {
@@ -153 +153 @@
                         case BOYSAW:
                         case BOYSPP:
-                                if ((feature.objs.containsKey(Obj.TOPMAR)) || (feature.objs.containsKey(Obj.DAYMAR))) {
+                                if (feature.objs.containsKey(Obj.TOPMAR) || feature.objs.containsKey(Obj.DAYMAR)) {
                                         if (testAttribute(feature.type, Att.BOYSHP, BoySHP.BOY_PILR) || testAttribute(feature.type, Att.BOYSHP, BoySHP.BOY_SPAR)) {
                                                 Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(50, -160)));
@@ -181 +181 @@
                                 String str = "";
                                 if (atts.containsKey(Att.CATFOG)) {
-                                        str += fogSignals.get(((ArrayList<?>) (atts.get(Att.CATFOG).val)).get(0));
+                                        str += fogSignals.get(((ArrayList<?>) atts.get(Att.CATFOG).val).get(0));
                                 }
                                 if (atts.containsKey(Att.SIGGRP)) {
@@ -440 +440 @@
                                                                                 continue;
                                                                         if (srad == radius) {
-                                                                                ArrayList<CatLIT> scats = (ArrayList<CatLIT>) ((satts.containsKey(Att.CATLIT)) ? (ArrayList<CatLIT>) satts.get(Att.CATLIT).val : new ArrayList<>());
+                                                                                ArrayList<CatLIT> scats = (ArrayList<CatLIT>) (satts.containsKey(Att.CATLIT) ? (ArrayList<CatLIT>) satts.get(Att.CATLIT).val : new ArrayList<>());
                                                                                 if (scats.contains(CatLIT.LIT_DIR)) {
                                                                                         if (satts.containsKey(Att.ORIENT)) {
@@ -557 +557 @@
                                                 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;
@@ -616 +616 @@
                                                 }
                                                 LitSect tmp = group.get(0);
-                                                str = (tmp.dir) ? "Dir" : "";
+                                                str = tmp.dir ? "Dir" : "";
                                                 str += LightCharacters.get(tmp.chr);
                                                 if (!tmp.grp.isEmpty())
@@ -645 +645 @@
                                                 cats = (ArrayList<CatLIT>) atts.get(Att.CATLIT).val;
                                         }
-                                        str = (cats.contains(CatLIT.LIT_DIR)) ? "Dir" : "";
-                                        str += (atts.containsKey(Att.MLTYLT)) ? atts.get(Att.MLTYLT).val : "";
+                                        str = cats.contains(CatLIT.LIT_DIR) ? "Dir" : "";
+                                        str += atts.containsKey(Att.MLTYLT) ? atts.get(Att.MLTYLT).val : "";
                                         if (atts.containsKey(Att.LITCHR)) {
                                                 LitCHR chr = ((ArrayList<LitCHR>) atts.get(Att.LITCHR).val).get(0);
@@ -680 +680 @@
                                                 }
                                         }
-                                        str += (cats.contains(CatLIT.LIT_VERT)) ? "(vert)" : "";
-                                        str += (cats.contains(CatLIT.LIT_HORI)) ? "(hor)" : "";
+                                        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 += (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" : "";
-                                        str += (atts.containsKey(Att.VALNMR)) ? df.format(atts.get(Att.VALNMR).val) + "M" : "";
-                                        str += (cats.contains(CatLIT.LIT_FRNT)) ? "(Front)" : "";
-                                        str += (cats.contains(CatLIT.LIT_REAR)) ? "(Rear)" : "";
-                                        str += (cats.contains(CatLIT.LIT_UPPR)) ? "(Upper)" : "";
-                                        str += (cats.contains(CatLIT.LIT_LOWR)) ? "(Lower)" : "";
+                                        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" : "";
+                                        str += atts.containsKey(Att.VALNMR) ? df.format(atts.get(Att.VALNMR).val) + "M" : "";
+                                        str += cats.contains(CatLIT.LIT_FRNT) ? "(Front)" : "";
+                                        str += cats.contains(CatLIT.LIT_REAR) ? "(Rear)" : "";
+                                        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)));
                                 }