X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=643c8354eb8017fcdcbb2b8aeab2183f875950ab;hb=421ef2ecdffc1d688cecb4221b2fe080ef14b596;hp=500995d1b709e4d668fba47725ef5fd17f36e67c;hpb=45a204f29290fafd305288ed0bccaeec5c0fe9c6;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 500995d..643c835 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -19,6 +19,8 @@ package net.pterodactylus.sone.core;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Predicates.not;
+import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
 
 import java.net.MalformedURLException;
 import java.util.ArrayList;
@@ -91,7 +93,6 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
@@ -127,7 +128,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	private final EventBus eventBus;
 
 	/** The configuration. */
-	private Configuration configuration;
+	private final Configuration configuration;
 
 	/** Whether we’re currently saving the configuration. */
 	private boolean storingConfiguration = false;
@@ -241,18 +242,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * Sets the configuration to use. This will automatically save the current
-	 * configuration to the given configuration.
-	 *
-	 * @param configuration
-	 *            The new configuration to use
-	 */
-	public void setConfiguration(Configuration configuration) {
-		this.configuration = configuration;
-		touchConfiguration();
-	}
-
-	/**
 	 * Returns the options used by the core.
 	 *
 	 * @return The options of the core
@@ -355,13 +344,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	@Override
 	public Collection<Sone> getLocalSones() {
 		synchronized (sones) {
-			return FluentIterable.from(sones.values()).filter(new Predicate<Sone>() {
-
-				@Override
-				public boolean apply(Sone sone) {
-					return sone.isLocal();
-				}
-			}).toSet();
+			return FluentIterable.from(sones.values()).filter(LOCAL_SONE_FILTER).toSet();
 		}
 	}
 
@@ -396,13 +379,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	@Override
 	public Collection<Sone> getRemoteSones() {
 		synchronized (sones) {
-			return FluentIterable.from(sones.values()).filter(new Predicate<Sone>() {
-
-				@Override
-				public boolean apply(Sone sone) {
-					return !sone.isLocal();
-				}
-			}).toSet();
+			return FluentIterable.from(sones.values()).filter(not(LOCAL_SONE_FILTER)).toSet();
 		}
 	}
 
@@ -436,7 +413,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *         {@code false} otherwise
 	 */
 	public boolean isModifiedSone(Sone sone) {
-		return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false;
+		return soneInserters.containsKey(sone) && soneInserters.get(sone).isModified();
 	}
 
 	/**