Commands must have non-null origins too.

Change-Id: Iea8cc21d45ec063a2d184902a838224727fdcb49
Reviewed-on: http://gerrit.dmdirc.com/3453
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/commandparser/commands/Command.java

@@ -28,6 +28,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.messages.Styliser;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents a generic command.
  */
@@ -141,7 +143,7 @@ public abstract class Command {
      *
      * @since 0.6.4
      */
-    public abstract void execute(FrameContainer origin,
-            CommandArguments args, CommandContext context);
+    public abstract void execute(@Nonnull FrameContainer origin, CommandArguments args,
+            CommandContext context);
 
 }

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -100,7 +100,7 @@ public class Ifplugin extends Command implements IntelligentCommand {
         }
 
         if (result != negative) {
-            if (origin == null || !origin.isWritable()) {
+            if (!origin.isWritable()) {
                 globalCommandParserProvider.get()
                         .parseCommand(globalWindowProvider.get(), args.getArgumentsAsString(1));
             } else {

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
+
 /**
  * A command parser that is tailored for use in a channel environment.
  */
@@ -81,7 +83,7 @@ public class ChannelCommandParser extends ChatCommandParser {
 
     @Override
     protected void executeCommand(
-            final FrameContainer origin,
+            @Nonnull final FrameContainer origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,

src/com/dmdirc/commandparser/parsers/ChatCommandParser.java

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
+
 /**
  * A command parser which implements common functionality for chat windows (queries and channels).
  *
@@ -74,7 +76,7 @@ public class ChatCommandParser extends ServerCommandParser {
 
     @Override
     protected void executeCommand(
-            final FrameContainer origin,
+            @Nonnull final FrameContainer origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -309,7 +309,8 @@ public abstract class CommandParser implements Serializable {
      * @param args        The arguments to the command
      * @param context     The context to use when executing the command
      */
-    protected abstract void executeCommand(final FrameContainer origin,
+    protected abstract void executeCommand(
+            @Nonnull final FrameContainer origin,
             final CommandInfo commandInfo, final Command command,
             final CommandArguments args, final CommandContext context);
 

src/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -34,6 +34,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -81,7 +82,7 @@ public class GlobalCommandParser extends CommandParser {
 
     @Override
     protected void executeCommand(
-            final FrameContainer origin,
+            @Nonnull final FrameContainer origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,

src/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.QueryCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
+
 /**
  * A command parser that is tailored for use in a query environment. Handles both query and server
  * commands.
@@ -83,7 +85,7 @@ public class QueryCommandParser extends ChatCommandParser {
 
     @Override
     protected void executeCommand(
-            final FrameContainer origin,
+            @Nonnull final FrameContainer origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -34,6 +34,8 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
+import javax.annotation.Nonnull;
+
 /**
  * A command parser used in the context of a server.
  */
@@ -84,7 +86,7 @@ public class ServerCommandParser extends GlobalCommandParser {
 
     @Override
     protected void executeCommand(
-            final FrameContainer origin,
+            @Nonnull final FrameContainer origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,