Use event bus to change FCP interface configuration.

[Sone.git] / src / main / java / net / pterodactylus / sone / fcp / FcpInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 1ddf0a9..c2a7cfa 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -30,6 +30,9 @@ 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.fcp.event.FcpInterfaceActivatedEvent;
+import net.pterodactylus.sone.fcp.event.FcpInterfaceDeactivatedEvent;
+import net.pterodactylus.sone.fcp.event.FullAccessRequiredChanged;
 import net.pterodactylus.sone.freenet.fcp.Command.AccessType;
 import net.pterodactylus.sone.freenet.fcp.Command.ErrorResponse;
 import net.pterodactylus.sone.freenet.fcp.Command.Response;
@@ -42,6 +45,7 @@ import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -118,15 +122,7 @@ public class FcpInterface {
                return active.get();
        }
 
-       /**
-        * Sets whether the FCP interface should handle requests. If {@code active}
-        * is {@code false}, all requests are answered with an error.
-        *
-        * @param active
-        *            {@code true} to activate the FCP interface, {@code false} to
-        *            deactivate the FCP interface
-        */
-       public void setActive(boolean active) {
+       private void setActive(boolean active) {
                this.active.set(active);
        }
 
@@ -135,13 +131,7 @@ public class FcpInterface {
                return fullAccessRequired.get();
        }
 
-       /**
-        * Sets the action level for which full FCP access is required.
-        *
-        * @param fullAccessRequired
-        *            The action level for which full FCP access is required
-        */
-       public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
+       private void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
                this.fullAccessRequired.set(checkNotNull(fullAccessRequired, "fullAccessRequired must not be null"));
        }
 
@@ -233,22 +223,19 @@ public class FcpInterface {
                }
        }
 
-       public class SetActive implements OptionWatcher<Boolean> {
-
-               @Override
-               public void optionChanged(Option<Boolean> option, Boolean oldValue, Boolean newValue) {
-                       setActive(newValue);
-               }
-
+       @Subscribe
+       public void fcpInterfaceActivated(FcpInterfaceActivatedEvent fcpInterfaceActivatedEvent) {
+               setActive(true);
        }
 
-       public class SetFullAccessRequired implements OptionWatcher<Integer> {
-
-               @Override
-               public void optionChanged(Option<Integer> option, Integer oldValue, Integer newValue) {
-                       setFullAccessRequired(FullAccessRequired.values()[newValue]);
-               }
+       @Subscribe
+       public void fcpInterfaceDeactivated(FcpInterfaceDeactivatedEvent fcpInterfaceDeactivatedEvent) {
+               setActive(false);
+       }
 
+       @Subscribe
+       public void fullAccessRequiredChanged(FullAccessRequiredChanged fullAccessRequiredChanged) {
+               setFullAccessRequired(fullAccessRequiredChanged.getFullAccessRequired());
        }
 
 }