Merge branch 'fcp-interface' into next

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

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index b183121..ed5aca8 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@ -44,6 +44,9 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
        /** The Sone core. */
        private final Core core;
 
+       /** Whether this command needs write access. */
+       private final boolean writeAccess;
+
        /**
         * Creates a new abstract Sone FCP command.
         *
@@ -51,7 +54,21 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *            The Sone core
         */
        protected AbstractSoneCommand(Core core) {
+               this(core, false);
+       }
+
+       /**
+        * Creates a new abstract Sone FCP command.
+        *
+        * @param core
+        *            The Sone core
+        * @param writeAccess
+        *            {@code true} if this command requires write access,
+        *            {@code false} otherwise
+        */
+       protected AbstractSoneCommand(Core core, boolean writeAccess) {
                this.core = core;
+               this.writeAccess = writeAccess;
        }
 
        //
@@ -67,6 +84,16 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
                return core;
        }
 
+       /**
+        * Returns whether this command requires write access.
+        *
+        * @return {@code true} if this command require write access, {@code false}
+        *         otherwise
+        */
+       public boolean requiresWriteAccess() {
+               return writeAccess;
+       }
+
        //
        // PROTECTED METHODS
        //
@@ -79,15 +106,18 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         * @param parameterName
         *            The name under which the Sone ID is stored in the simple field
         *            set
+        * @param localOnly
+        *            {@code true} to only return local Sones, {@code false} to
+        *            return any Sones
         * @return The Sone
         * @throws FcpException
         *             if there is no Sone ID stored under the given parameter name,
         *             or if the Sone ID is invalid
         */
-       protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
+       protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly) throws FcpException {
                try {
                        String soneId = simpleFieldSet.getString(parameterName);
-                       Sone sone = core.getSone(soneId, false);
+                       Sone sone = localOnly ? core.getLocalSone(soneId, false) : core.getSone(soneId, false);
                        if (sone == null) {
                                throw new FcpException("Could not load Sone from “" + soneId + "”.");
                        }