Changeset 8345 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-05-11T10:52:33+02:00 (10 years ago)

Author:

Don-vip

Message:

code style - Useless parentheses around expressions should be removed to prevent any misunderstanding

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ColorHelper.java (modified) (1 diff)
• Geometry.java (modified) (3 diffs)
• I18n.java (modified) (1 diff)
• OsmUrlToBounds.java (modified) (1 diff)
• Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/ColorHelper.java

@@ -32 +32 @@
                     Integer.parseInt(html.substring(2,4),16),
                     Integer.parseInt(html.substring(4,6),16),
-                    (html.length() == 8 ? Integer.parseInt(html.substring(6,8),16) : 255));
+                    html.length() == 8 ? Integer.parseInt(html.substring(6,8),16) : 255);
         } catch (NumberFormatException e) {
             return null;

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -449 +449 @@
         CheckParameterUtil.ensureValidCoordinates(secondNode, "secondNode");
 
-        double dy1 = (firstNode.getY() - commonNode.getY());
-        double dy2 = (secondNode.getY() - commonNode.getY());
-        double dx1 = (firstNode.getX() - commonNode.getX());
-        double dx2 = (secondNode.getX() - commonNode.getX());
+        double dy1 = firstNode.getY() - commonNode.getY();
+        double dy2 = secondNode.getY() - commonNode.getY();
+        double dx1 = firstNode.getX() - commonNode.getX();
+        double dx2 = secondNode.getX() - commonNode.getX();
 
         return dy1 * dx2 - dx1 * dy2 > 0;
@@ -651 +651 @@
         dlat = lat2 - lat1;
 
-        double a = (Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2));
+        double a = Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2);
         double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
         return 6367000 * c;
@@ -668 +668 @@
         dlat = lat2 - lat1;
 
-        double a = (Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2));
+        double a = Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2);
         double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
         return 6367000 * c;

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -694 +694 @@
         switch(pluralMode) {
         case MODE_NOTONE: /* bg, da, de, el, en, en_GB, es, et, eu, fi, gl, is, it, iw_IL, nb, nl, sv */
-            return ((n != 1) ? 1 : 0);
+            return (n != 1) ? 1 : 0;
         case MODE_NONE: /* id, ja, km, tr, zh_CN, zh_TW */
             return 0;
         case MODE_GREATERONE: /* fr, pt_BR */
-            return ((n > 1) ? 1 : 0);
+            return (n > 1) ? 1 : 0;
         case MODE_CS:
-            return ((n == 1) ? 0 : (((n >= 2) && (n <= 4)) ? 1 : 2));
+            return (n == 1) ? 0 : (((n >= 2) && (n <= 4)) ? 1 : 2);
         //case MODE_AR:
         //    return ((n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((((n % 100) >= 3)
         //            && ((n % 100) <= 10)) ? 3 : ((((n % 100) >= 11) && ((n % 100) <= 99)) ? 4 : 5)))));
         case MODE_PL:
-            return ((n == 1) ? 0 : (((((n % 10) >= 2) && ((n % 10) <= 4))
-                    && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
+            return (n == 1) ? 0 : (((((n % 10) >= 2) && ((n % 10) <= 4))
+                    && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2);
         //case MODE_RO:
         //    return ((n == 1) ? 0 : ((((n % 100) > 19) || (((n % 100) == 0) && (n != 0))) ? 2 : 1));
         case MODE_LT:
-            return (((n % 10) == 1) && ((n % 100) != 11) ? 0 : (((n % 10) >= 2)
-                    && (((n % 100) < 10) || ((n % 100) >= 20)) ? 1 : 2));
+            return ((n % 10) == 1) && ((n % 100) != 11) ? 0 : (((n % 10) >= 2)
+                    && (((n % 100) < 10) || ((n % 100) >= 20)) ? 1 : 2);
         case MODE_RU:
-            return ((((n % 10) == 1) && ((n % 100) != 11)) ? 0 : (((((n % 10) >= 2)
-                    && ((n % 10) <= 4)) && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
+            return (((n % 10) == 1) && ((n % 100) != 11)) ? 0 : (((((n % 10) >= 2)
+                    && ((n % 10) <= 4)) && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2);
         case MODE_SK:
-            return ((n == 1) ? 1 : (((n >= 2) && (n <= 4)) ? 2 : 0));
+            return (n == 1) ? 1 : (((n >= 2) && (n <= 4)) ? 2 : 0);
         //case MODE_SL:
         //    return (((n % 100) == 1) ? 1 : (((n % 100) == 2) ? 2 : ((((n % 100) == 3)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -291 +291 @@
     public static String getURL(double dlat, double dlon, int zoom) {
         // Truncate lat and lon to something more sensible
-        int decimals = (int) Math.pow(10, (zoom / 3));
-        double lat = (Math.round(dlat * decimals));
+        int decimals = (int) Math.pow(10, zoom / 3);
+        double lat = Math.round(dlat * decimals);
         lat /= decimals;
-        double lon = (Math.round(dlon * decimals));
+        double lon = Math.round(dlon * decimals);
         lon /= decimals;
         return Main.getOSMWebsite() + "/#map="+zoom+"/"+lat+"/"+lon;

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -148 +148 @@
     // create a shortcut object from an string as saved in the preferences
     private Shortcut(String prefString) {
-        List<String> s = (new ArrayList<>(Main.pref.getCollection(prefString)));
+        List<String> s = new ArrayList<>(Main.pref.getCollection(prefString));
         this.shortText = prefString.substring(15);
         this.longText = s.get(0);