Merge branch 'release-0.9.7'

[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / wot / IdentityChangeDetector.java

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityChangeDetector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityChangeDetector.java
index a8cb62b..f014de5 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityChangeDetector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityChangeDetector.java
@@ -1,5 +1,5 @@
 /*
- * Sone - IdentityChangeDetector.java - Copyright © 2013 David Roden
+ * Sone - IdentityChangeDetector.java - Copyright © 2013–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -105,7 +105,7 @@ public class IdentityChangeDetector {
                return new Predicate<Identity>() {
                        @Override
                        public boolean apply(Identity identity) {
-                               return (identity == null) ? false : identityHasChanged(oldIdentities.get(identity.getId()), identity);
+                               return (identity != null) && identityHasChanged(oldIdentities.get(identity.getId()), identity);
                        }
                };
        }
@@ -142,7 +142,7 @@ public class IdentityChangeDetector {
                return new Predicate<Identity>() {
                        @Override
                        public boolean apply(Identity identity) {
-                               return identities.containsKey(identity.getId());
+                               return (identity != null) && identities.containsKey(identity.getId());
                        }
                };
        }
@@ -151,7 +151,7 @@ public class IdentityChangeDetector {
                return new Predicate<String>() {
                        @Override
                        public boolean apply(String context) {
-                               return (identity == null) ? false : !identity.getContexts().contains(context);
+                               return (identity != null) && !identity.getContexts().contains(context);
                        }
                };
        }
@@ -160,7 +160,7 @@ public class IdentityChangeDetector {
                return new Predicate<Identity>() {
                        @Override
                        public boolean apply(Identity identity) {
-                               return (identity == null) ? false : !newIdentities.contains(identity);
+                               return (identity != null) && !newIdentities.contains(identity);
                        }
                };
        }
@@ -169,7 +169,7 @@ public class IdentityChangeDetector {
                return new Predicate<Entry<String, String>>() {
                        @Override
                        public boolean apply(Entry<String, String> property) {
-                               return (property == null) ? false : !identity.getProperties().containsKey(property.getKey());
+                               return (property != null) && !identity.getProperties().containsKey(property.getKey());
                        }
                };
        }
@@ -178,7 +178,7 @@ public class IdentityChangeDetector {
                return new Predicate<Entry<String, String>>() {
                        @Override
                        public boolean apply(Entry<String, String> property) {
-                               return (property == null) ? false : !newIdentity.getProperty(property.getKey()).equals(property.getValue());
+                               return (property != null) && !newIdentity.getProperty(property.getKey()).equals(property.getValue());
                        }
                };
        }