Changeset 34652 in osm for applications/editors/josm/plugins/seachart/src/s57

Timestamp:

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

Author:

donvip

Message:

fix UnnecessaryParentheses warnings

Location:

applications/editors/josm/plugins/seachart/src/s57

Files:

• S57map.java (modified) (2 diffs)
• S57obj.java (modified) (1 diff)
• S57osm.java (modified) (3 diffs)
• S57val.java (modified) (1 diff)

applications/editors/josm/plugins/seachart/src/s57/S57map.java

@@ -908 +908 @@
                             first = false;
                         } else {
-                            sarc += (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
+                            sarc += Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat));
                         }
                         llat = lat;
@@ -931 +931 @@
                             first = false;
                         } else {
-                            sarc = (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
+                            sarc = Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat));
                             if (sarc > harc)
                                 break;

applications/editors/josm/plugins/seachart/src/s57/S57obj.java

@@ -163 +163 @@
 
     public static Obj enumType(String type) { // Convert OSM object string to SCM object enumeration
-        if ((type != null) && !type.isEmpty() && (StrObj.containsKey(type)))
+        if (type != null && !type.isEmpty() && StrObj.containsKey(type))
             return StrObj.get(type);
         else

applications/editors/josm/plugins/seachart/src/s57/S57osm.java

@@ -9 +9 @@
 import s57.S57map.Snode;
 import s57.S57obj.Obj;
-import s57.S57val.CatBUA;
 import s57.S57val.CatROD;
 import s57.S57val.Conv;
@@ -131 +130 @@
                     }
                 } else {
-                    if ((inNode || inWay || inRel) && (ln.contains("<tag"))) {
+                    if ((inNode || inWay || inRel) && ln.contains("<tag")) {
                         k = v = "";
                         String[] token = ln.split("k=");
@@ -205 +204 @@
                                     ref = Long.parseLong(token.split("[\"\']")[1]);
                                 } else if (token.matches("^type=.+")) {
-                                    type = (token.split("[\"\']")[1]);
+                                    type = token.split("[\"\']")[1];
                                 } else if (token.matches("^role=.+")) {
                                     String[] str = token.split("[\"\']");
                                     if (str.length > 1) {
-                                        role = (token.split("[\"\']")[1]);
+                                        role = token.split("[\"\']")[1];
                                     }
                                 }

applications/editors/josm/plugins/seachart/src/s57/S57val.java

@@ -1654 +1654 @@
 
     public static Enum<?> unknAtt(Att att) {
-        return (Enum<?>) (keys.get(att).map.keySet().toArray()[0]);
+        return (Enum<?>) keys.get(att).map.keySet().toArray()[0];
     }
 }