Changeset 31850 in osm for applications/editors/josm/plugins/wikipedia/src/org

Timestamp:

2015-12-22T19:02:20+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: use Objects.equals

File:

• applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (modified) (2 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -17 +17 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Scanner;
 import java.util.regex.Matcher;
@@ -247 +248 @@
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
-
-            WikipediaLangArticle that = (WikipediaLangArticle) o;
-
-            if (article != null ? !article.equals(that.article) : that.article != null) return false;
-            if (lang != null ? !lang.equals(that.lang) : that.lang != null) return false;
-
-            return true;
+            final WikipediaLangArticle that = (WikipediaLangArticle) o;
+            return Objects.equals(lang, that.lang) &&
+                    Objects.equals(article, that.article);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(lang, article);
         }
     }