X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=551dc4f67747522c77ae6bf527cb2057d5fc2c68;hb=5bcdc1b924c598b1e59551d44e2302ef29258dad;hp=dad5ca35af95578723cf201324914523220f8338;hpb=f65328fb92d16e568b869bf5f2771dd4114d8abc;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index dad5ca3..551dc4f 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FcpInterface.java - Copyright © 2011–2012 David Roden
+ * Sone - FcpInterface.java - Copyright © 2011–2013 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
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.fcp;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,23 +26,30 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.core.Options.Option;
+import net.pterodactylus.sone.core.Options.OptionWatcher;
 import net.pterodactylus.sone.freenet.fcp.Command.AccessType;
 import net.pterodactylus.sone.freenet.fcp.Command.ErrorResponse;
 import net.pterodactylus.sone.freenet.fcp.Command.Response;
 import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.validation.Validation;
+
 import freenet.pluginmanager.FredPluginFCP;
 import freenet.pluginmanager.PluginNotFoundException;
 import freenet.pluginmanager.PluginReplySender;
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
 /**
  * Implementation of an FCP interface for other clients or plugins to
  * communicate with Sone.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class FcpInterface {
 
 	/**
@@ -79,6 +88,7 @@ public class FcpInterface {
 	 * @param core
 	 *            The core
 	 */
+	@Inject
 	public FcpInterface(Core core) {
 		commands.put("Version", new VersionCommand(core));
 		commands.put("GetLocalSones", new GetLocalSonesCommand(core));
@@ -101,6 +111,11 @@ public class FcpInterface {
 	// ACCESSORS
 	//
 
+	@VisibleForTesting
+	boolean isActive() {
+		return active;
+	}
+
 	/**
 	 * Sets whether the FCP interface should handle requests. If {@code active}
 	 * is {@code false}, all requests are answered with an error.
@@ -113,6 +128,11 @@ public class FcpInterface {
 		this.active = active;
 	}
 
+	@VisibleForTesting
+	FullAccessRequired getFullAccessRequired() {
+		return fullAccessRequired;
+	}
+
 	/**
 	 * Sets the action level for which full FCP access is required.
 	 *
@@ -120,8 +140,7 @@ public class FcpInterface {
 	 *            The action level for which full FCP access is required
 	 */
 	public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
-		Validation.begin().isNotNull("FullAccessRequired", fullAccessRequired).check();
-		this.fullAccessRequired = fullAccessRequired;
+		this.fullAccessRequired = checkNotNull(fullAccessRequired, "fullAccessRequired must not be null");
 	}
 
 	//
@@ -212,4 +231,22 @@ public class FcpInterface {
 		}
 	}
 
+	public class SetActive implements OptionWatcher<Boolean> {
+
+		@Override
+		public void optionChanged(Option<Boolean> option, Boolean oldValue, Boolean newValue) {
+			setActive(newValue);
+		}
+
+	}
+
+	public class SetFullAccessRequired implements OptionWatcher<Integer> {
+
+		@Override
+		public void optionChanged(Option<Integer> option, Integer oldValue, Integer newValue) {
+			setFullAccessRequired(FullAccessRequired.values()[newValue]);
+		}
+
+	}
+
 }