Changeset 12490 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2017-07-22T16:23:11+02:00 (7 years ago)

Author:

Don-vip

Message:

simplify equals

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement

Files:

• CompletelyInsideAreaStrategy.java (modified) (1 diff)
• OnLineStrategy.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java

@@ -137 +137 @@
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java

@@ -363 +363 @@
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }