Update years in copyright line

[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 e49537b..25cf4ae 100644 (file)
--- 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–2013 David Roden
+ * Sone - FcpInterface.java - Copyright © 2011–2015 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
@@ -18,21 +18,23 @@
 package net.pterodactylus.sone.fcp;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.logging.Logger.getLogger;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 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.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;
-import net.pterodactylus.util.logging.Logging;
 
 import freenet.pluginmanager.FredPluginFCP;
 import freenet.pluginmanager.PluginNotFoundException;
@@ -41,6 +43,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;
 
@@ -72,13 +75,13 @@ public class FcpInterface {
        }
 
        /** The logger. */
-       private static final Logger logger = Logging.getLogger(FcpInterface.class);
+       private static final Logger logger = getLogger(FcpInterface.class.getName());
 
        /** Whether the FCP interface is currently active. */
        private final AtomicBoolean active = new AtomicBoolean();
 
        /** What function full access is required for. */
-       private volatile FullAccessRequired fullAccessRequired = FullAccessRequired.ALWAYS;
+       private final AtomicReference<FullAccessRequired> fullAccessRequired = new AtomicReference<FullAccessRequired>(FullAccessRequired.ALWAYS);
 
        /** All available FCP commands. */
        private final Map<String, AbstractSoneCommand> commands = Collections.synchronizedMap(new HashMap<String, AbstractSoneCommand>());
@@ -117,31 +120,17 @@ 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);
        }
 
        @VisibleForTesting
        FullAccessRequired getFullAccessRequired() {
-               return fullAccessRequired;
+               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) {
-               this.fullAccessRequired = checkNotNull(fullAccessRequired, "fullAccessRequired must not be null");
+       private void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
+               this.fullAccessRequired.set(checkNotNull(fullAccessRequired, "fullAccessRequired must not be null"));
        }
 
        //
@@ -172,7 +161,7 @@ public class FcpInterface {
                        return;
                }
                AbstractSoneCommand command = commands.get(parameters.get("Message"));
-               if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired == FullAccessRequired.ALWAYS))) {
+               if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired.get() == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired.get() == FullAccessRequired.ALWAYS))) {
                        try {
                                sendReply(pluginReplySender, null, new ErrorResponse(401, "Not authorized"));
                        } catch (PluginNotFoundException pnfe1) {
@@ -232,22 +221,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());
        }
 
 }