Changeset 9976 in josm

Timestamp:

2016-03-13T00:38:12+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - code simplification

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/BBox.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/preferences/imagery/CacheContentsPanel.java (modified) (2 diffs)

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

@@ -153 +153 @@
      */
     public boolean bounds(BBox b) {
-        if (!(xmin <= b.xmin) ||
-                !(xmax >= b.xmax) ||
-                !(ymin <= b.ymin) ||
-                !(ymax >= b.ymax))
-            return false;
-        return true;
+        return xmin <= b.xmin && xmax >= b.xmax
+            && ymin <= b.ymin && ymax >= b.ymax;
     }
 
@@ -167 +163 @@
      */
     public boolean bounds(LatLon c) {
-        if ((xmin <= c.lon()) &&
-                (xmax >= c.lon()) &&
-                (ymin <= c.lat()) &&
-                (ymax >= c.lat()))
-            return true;
-        return false;
+        return xmin <= c.lon() && xmax >= c.lon()
+            && ymin <= c.lat() && ymax >= c.lat();
     }
 

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -1323 +1323 @@
      * @param osm node to check
      * @param p point clicked
-     * @param use_selected whether to prefer selected nodes
+     * @param useSelected whether to prefer selected nodes
      * @return true, if the node fulfills the properties of the function body
      */
-    private boolean isPrecedenceNode(Node osm, Point p, boolean use_selected) {
+    private boolean isPrecedenceNode(Node osm, Point p, boolean useSelected) {
         if (osm != null) {
-            if (!(p.distanceSq(getPoint2D(osm)) > (4)*(4))) return true;
+            if (p.distanceSq(getPoint2D(osm)) <= (4*4)) return true;
             if (osm.isTagged()) return true;
-            if (use_selected && osm.isSelected()) return true;
+            if (useSelected && osm.isSelected()) return true;
         }
         return false;

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java

@@ -243 +243 @@
 
     private static DefaultTableModel getTableModel(final CacheAccess<String, BufferedImageCacheEntry> cache) {
-        final DefaultTableModel tableModel = new DefaultTableModel(
+        return new DefaultTableModel(
                 getCacheStats(cache),
                 new String[]{tr("Cache name"), tr("Object Count"), tr("Clear")}) {
@@ -251 +251 @@
             }
         };
-        return tableModel;
     }
 }