Changeset 14098 in josm for trunk/src/org

Timestamp:

2018-08-05T23:04:41+02:00 (6 years ago)

Author:

Don-vip

Message:

fix PMD warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/search/SearchCompiler.java (modified) (4 diffs)
• tools/template_engine/CompoundTemplateEntry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -1220 +1220 @@
                 return false;
             ExactType other = (ExactType) obj;
-            if (type != other.type)
-                return false;
-            return true;
+            return type == other.type;
         }
     }
@@ -1392 +1390 @@
                 return false;
             Nth other = (Nth) obj;
-            if (modulo != other.modulo)
-                return false;
-            if (nth != other.nth)
-                return false;
-            return true;
+            return modulo == other.modulo
+                   && nth == other.nth;
         }
     }
@@ -1451 +1446 @@
                 return false;
             RangeMatch other = (RangeMatch) obj;
-            if (max != other.max)
-                return false;
-            if (min != other.min)
-                return false;
-            return true;
+            return max == other.max
+                && min == other.min;
         }
     }
@@ -1859 +1851 @@
                 return false;
             InArea other = (InArea) obj;
-            if (all != other.all)
-                return false;
-            return true;
+            return all == other.all;
         }
     }

trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java

@@ -69 +69 @@
             return false;
         CompoundTemplateEntry other = (CompoundTemplateEntry) obj;
-        if (!Arrays.equals(entries, other.entries))
-            return false;
-        return true;
+        return Arrays.equals(entries, other.entries);
     }
 }