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

Timestamp:

2015-05-11T10:52:33+02:00 (9 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/data

Files:

• cache/JCSCacheManager.java (modified) (1 diff)
• cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• coor/EastNorth.java (modified) (1 diff)
• coor/QuadTiling.java (modified) (2 diffs)
• imagery/WmsCache.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (1 diff)
• osm/Way.java (modified) (2 diffs)
• osm/visitor/paint/AbstractMapRenderer.java (modified) (1 diff)
• osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• projection/datum/NTV2GridShiftFile.java (modified) (1 diff)
• projection/proj/LambertConformalConic.java (modified) (1 diff)
• projection/proj/TransverseMercator.java (modified) (3 diffs)
• validation/routines/DomainValidator.java (modified) (1 diff)
• validation/routines/RegexValidator.java (modified) (1 diff)
• validation/tests/Coastlines.java (modified) (1 diff)
• validation/tests/DuplicateRelation.java (modified) (1 diff)
• validation/tests/DuplicateWay.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -52 +52 @@
         File cacheDir = new File(Main.pref.getCacheDirectory(), "jcs");
 
-        if ((!cacheDir.exists() && !cacheDir.mkdirs()))
+        if (!cacheDir.exists() && !cacheDir.mkdirs())
             throw new IOException("Cannot access cache directory");
 

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -439 +439 @@
         urlConn.setRequestMethod("HEAD");
         long lastModified = urlConn.getLastModified();
-        return (
-                (attributes.getEtag() != null && attributes.getEtag().equals(urlConn.getRequestProperty("ETag"))) ||
-                (lastModified != 0 && lastModified <= attributes.getLastModification())
-                );
+        return (attributes.getEtag() != null && attributes.getEtag().equals(urlConn.getRequestProperty("ETag"))) ||
+               (lastModified != 0 && lastModified <= attributes.getLastModification());
     }
 

trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -132 +132 @@
      */
     public boolean equalsEpsilon(EastNorth other, double e) {
-        return (Math.abs(x - other.x) < e && Math.abs(y - other.y) < e);
+        return Math.abs(x - other.x) < e && Math.abs(y - other.y) < e;
     }
 }

trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java

@@ -9 +9 @@
 
     public static final int NR_LEVELS = 24;
-    public static final double WORLD_PARTS = (1 << NR_LEVELS);
+    public static final double WORLD_PARTS = 1 << NR_LEVELS;
 
     public static final int TILES_PER_LEVEL_SHIFT = 2; // Has to be 2. Other parts of QuadBuckets code rely on it
@@ -53 +53 @@
         for (i = NR_LEVELS-1; i >= 0; i--)
         {
-            long xbit = ((x >> i) & 1);
-            long ybit = ((y >> i) & 1);
+            long xbit = (x >> i) & 1;
+            long ybit = (y >> i) & 1;
             tile <<= 2;
             // Note that x is the MSB

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -360 +360 @@
     public synchronized boolean hasExactMatch(Projection projection, double pixelPerDegree, double east, double north) {
         ProjectionEntries projectionEntries = getProjectionEntries(projection);
-        CacheEntry entry = findEntry(projectionEntries, pixelPerDegree, east, north);
-        return (entry != null);
+        return findEntry(projectionEntries, pixelPerDegree, east, north) != null;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -519 +519 @@
      */
     public boolean isDisabledAndHidden() {
-        return (((flags & FLAG_DISABLED) != 0) && ((flags & FLAG_HIDE_IF_DISABLED) != 0));
+        return ((flags & FLAG_DISABLED) != 0) && ((flags & FLAG_HIDE_IF_DISABLED) != 0);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -363 +363 @@
         boolean locked = writeLock();
         try {
-            boolean closed = (lastNode() == n && firstNode() == n);
+            boolean closed = lastNode() == n && firstNode() == n;
             int i;
             List<Node> copy = getNodes();
@@ -391 +391 @@
         boolean locked = writeLock();
         try {
-            boolean closed = (lastNode() == firstNode() && selection.contains(lastNode()));
+            boolean closed = lastNode() == firstNode() && selection.contains(lastNode());
             List<Node> copy = new ArrayList<>();
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -184 +184 @@
         double xd = Math.abs(p1.getX()-p2.getX());
         double yd = Math.abs(p1.getY()-p2.getY());
-        return (xd+yd > space);
+        return xd + yd > space;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -866 +866 @@
             return;
         g.setColor(highlightColorTransparent);
-        float w = (line.getLineWidth() + highlightLineWidth);
+        float w = line.getLineWidth() + highlightLineWidth;
         if (useWiderHighlight) w+=widerHighlight;
         while(w >= line.getLineWidth()) {
@@ -995 +995 @@
          */
         double distanceFromVia=14;
-        double dx = (pFrom.x >= pVia.x) ? (pFrom.x - pVia.x) : (pVia.x - pFrom.x);
-        double dy = (pFrom.y >= pVia.y) ? (pFrom.y - pVia.y) : (pVia.y - pFrom.y);
+        double dx = pFrom.x >= pVia.x ? pFrom.x - pVia.x : pVia.x - pFrom.x;
+        double dy = pFrom.y >= pVia.y ? pFrom.y - pVia.y : pVia.y - pFrom.y;
 
         double fromAngle;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -264 +264 @@
             }
 
-            final int size = max((ds.isSelected(n) ? selectedNodeSize : 0),
-                    (isNodeTagged(n) ? taggedNodeSize : 0),
-                    (n.isConnectionNode() ? connectionNodeSize : 0),
+            final int size = max(ds.isSelected(n) ? selectedNodeSize : 0,
+                    isNodeTagged(n) ? taggedNodeSize : 0,
+                    n.isConnectionNode() ? connectionNodeSize : 0,
                     unselectedNodeSize);
 

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -276 +276 @@
 
     public boolean isLoaded() {
-        return (topLevelSubGrid != null);
+        return topLevelSubGrid != null;
     }
 

trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java

@@ -129 +129 @@
     protected double t(double lat_rad) {
         return tan(PI/4 - lat_rad / 2.0)
-            / pow(( (1.0 - e * sin(lat_rad)) / (1.0 + e * sin(lat_rad))) , e/2);
+            / pow((1.0 - e * sin(lat_rad)) / (1.0 + e * sin(lat_rad)), e/2);
     }
 

trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java

@@ -229 +229 @@
 
         /* Precalculate epsilon */
-        double epsilon = (315.0 * pow(n, 4.0) / 512.0);
+        double epsilon = 315.0 * pow(n, 4.0) / 512.0;
 
         /* Now calculate the sum of the series and return */
@@ -276 +276 @@
 
         /* Precalculate epsilon_ (Eq. 10.22) */
-        double epsilon_ = (1097.0 * pow(n, 4.0) / 512.0);
+        double epsilon_ = 1097.0 * pow(n, 4.0) / 512.0;
 
         /* Now calculate the sum of the series (Eq. 10.21) */
@@ -284 +284 @@
             + (epsilon_ * sin(8.0 * y_));
     }
-
 }

trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -170 +170 @@
      */
     public boolean isValidInfrastructureTld(String iTld) {
-        return Arrays.binarySearch(INFRASTRUCTURE_TLDS, (chompLeadingDot(iTld.toLowerCase()))) >= 0;
+        return Arrays.binarySearch(INFRASTRUCTURE_TLDS, chompLeadingDot(iTld.toLowerCase())) >= 0;
     }
 

trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java

@@ -107 +107 @@
         }
         patterns = new Pattern[regexs.length];
-        int flags =  (caseSensitive ? 0: Pattern.CASE_INSENSITIVE);
+        int flags = caseSensitive ? 0: Pattern.CASE_INSENSITIVE;
         for (int i = 0; i < regexs.length; i++) {
             if (regexs[i] == null || regexs[i].length() == 0) {

trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java

@@ -237 +237 @@
     public boolean isFixable(TestError testError) {
         if (testError.getTester() instanceof Coastlines)
-            return (testError.getCode() == REVERSED_COASTLINE);
+            return testError.getCode() == REVERSED_COASTLINE;
 
         return false;

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java

@@ -309 +309 @@
             }
         }
-        return (relationsWithRelations <= 1);
+        return relationsWithRelations <= 1;
     }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java

@@ -323 +323 @@
             }
         }
-        return (waysWithRelations <= 1);
+        return waysWithRelations <= 1;
     }
 }