Propagate annotations around a bit.

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

src/com/dmdirc/commandparser/aliases/AliasCommandHandler.java

@@ -28,6 +28,8 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
+
 /**
  * {@link Command} implementation that handles an alias.
  */
@@ -41,7 +43,7 @@ public class AliasCommandHandler extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin, final CommandArguments args,
+    public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
             final CommandContext context) {
         if (args.getArguments().length >= alias.getMinArguments()) {
             for (String line : alias.getSubstitution().split("\n")) {

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -37,6 +37,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -60,7 +61,7 @@ public class Ban extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
 

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -34,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -58,7 +59,7 @@ public class Cycle extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()

src/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -37,6 +37,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -63,7 +64,7 @@ public class Invite extends Command implements ExternalCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length < 1) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -38,6 +38,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -63,7 +64,7 @@ public class KickReason extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         if (args.getArguments().length == 0) {

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -40,6 +40,7 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -65,7 +66,7 @@ public class Mode extends Command implements IntelligentCommand,
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         final ChannelInfo cChannel = channel.getChannelInfo();

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -38,6 +38,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -63,7 +64,7 @@ public class Names extends Command implements IntelligentCommand,
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         channel.getConnection().getParser().sendRawMessage("NAMES "

src/com/dmdirc/commandparser/commands/channel/Part.java

@@ -34,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -58,7 +59,7 @@ public class Part extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -40,6 +40,7 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManager;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -68,7 +69,7 @@ public class SetNickColour extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
 

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -37,6 +37,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -61,7 +62,7 @@ public class ShowTopic extends Command implements ExternalCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         if (args.getArguments().length == 0) {

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -35,6 +35,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.util.validators.ValidationResponse;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -59,7 +60,7 @@ public class Me extends Command implements ValidatingCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final MessageTarget target = ((ChatCommandContext) context).getChat();
         if (args.getArguments().length == 0) {

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

@@ -39,6 +39,7 @@ import com.dmdirc.ui.input.TabCompleter;
 
 import com.google.common.base.Optional;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -73,7 +74,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length < 2) {
             showUsage(origin, args.isSilent(), "alias", "[--remove] <name> [command]");

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

@@ -36,6 +36,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -63,7 +64,7 @@ public class AllServers extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final String command = args.getArgumentsAsString();
 

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

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -56,7 +57,7 @@ public class Clear extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         origin.getDocument().clear();
     }

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

@@ -45,6 +45,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -81,7 +82,7 @@ public class Echo extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final CommandFlagResult results = handler.process(origin, args);
 

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

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.LifecycleController;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -60,7 +61,7 @@ public class Exit extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         controller.quit(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "closemessage"));

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

@@ -40,6 +40,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -65,7 +66,7 @@ public class Help extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showAllCommands(origin, args.isSilent());

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

@@ -38,6 +38,7 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -80,7 +81,7 @@ public class Ifplugin extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length <= 1) {
             showUsage(origin, args.isSilent(), "ifplugin", "<[!]plugin> <command>");

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

@@ -36,6 +36,7 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -63,7 +64,7 @@ public class LoadPlugin extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "loadplugin", "<plugin>");

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

@@ -44,6 +44,7 @@ import com.dmdirc.util.URIParser;
 
 import java.net.URI;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -88,7 +89,7 @@ public class NewServer extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "newserver", "<host[:[+]port]> [password]");

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

@@ -35,6 +35,7 @@ import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.ColourManager;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -62,7 +63,7 @@ public class Notify extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "notify", "<colour>");

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

@@ -40,6 +40,7 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.util.URLBuilder;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -86,7 +87,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         int start = 0;
         FrameContainer parent = null;

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

@@ -34,6 +34,7 @@ import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -63,7 +64,7 @@ public final class ReloadActions extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         actionController.loadUserActions();
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actions reloaded.");

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

@@ -34,6 +34,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -62,7 +63,7 @@ public class ReloadIdentities extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         identityController.loadUserIdentities();
 

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

@@ -35,6 +35,7 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -62,7 +63,7 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "reloadplugin", "<plugin>");

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

@@ -34,6 +34,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -62,7 +63,7 @@ public final class SaveConfig extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         identityController.saveAll();
 

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

@@ -45,6 +45,7 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -100,7 +101,7 @@ public class SetCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final CommandFlagResult res = handler.process(origin, args);
 

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

@@ -35,6 +35,7 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -62,7 +63,7 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "unloadplugin", "<plugin>");

src/com/dmdirc/commandparser/commands/server/AllChannels.java

@@ -36,6 +36,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -59,7 +60,7 @@ public class AllChannels extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String command = args.getArgumentsAsString();

src/com/dmdirc/commandparser/commands/server/Away.java

@@ -34,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -57,7 +58,7 @@ public class Away extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line = args.getArgumentsAsString();

src/com/dmdirc/commandparser/commands/server/Back.java

@@ -36,6 +36,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -59,7 +60,7 @@ public class Back extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         server.getParser().getLocalClient().setBack();

src/com/dmdirc/commandparser/commands/server/ChangeServer.java

@@ -37,6 +37,7 @@ import com.dmdirc.util.URIParser;
 
 import java.net.URI;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -65,7 +66,7 @@ public class ChangeServer extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "server", "<host[:[+]port]> [password]");

src/com/dmdirc/commandparser/commands/server/Ctcp.java

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -61,7 +62,7 @@ public class Ctcp extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length < 2) {

src/com/dmdirc/commandparser/commands/server/Disconnect.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -56,7 +57,7 @@ public class Disconnect extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line;

src/com/dmdirc/commandparser/commands/server/Ignore.java

@@ -41,6 +41,7 @@ import java.util.List;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -64,7 +65,7 @@ public class Ignore extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
 

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -46,6 +46,7 @@ import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 import net.engio.mbassy.listener.Handler;
@@ -79,7 +80,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length == 0) {

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -39,6 +39,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -64,7 +65,7 @@ public class Message extends Command implements IntelligentCommand,
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length < 2) {

src/com/dmdirc/commandparser/commands/server/Nick.java

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -61,7 +62,7 @@ public class Nick extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length == 0) {

src/com/dmdirc/commandparser/commands/server/Notice.java

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -61,7 +62,7 @@ public class Notice extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length < 2) {

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -39,6 +39,7 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Styliser;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -63,7 +64,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "query", "<target> <message>");

src/com/dmdirc/commandparser/commands/server/Raw.java

@@ -34,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -58,7 +59,7 @@ public class Raw extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line = args.getArgumentsAsString();

src/com/dmdirc/commandparser/commands/server/RawServerCommand.java

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
+
 /**
  * Implements a raw server command (i.e., a command that is sent to the server as-is.
  */
@@ -54,7 +56,7 @@ public class RawServerCommand extends Command implements CommandInfo {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         server.getParser().sendRawMessage(myName.toUpperCase() + " " + args.getArgumentsAsString());

src/com/dmdirc/commandparser/commands/server/Reconnect.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -56,7 +57,7 @@ public class Reconnect extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line;

src/com/dmdirc/commandparser/commands/server/Umode.java

@@ -35,6 +35,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 /**
@@ -59,7 +60,7 @@ public class Umode extends Command {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (server.getState() != ServerState.CONNECTED) {

src/com/dmdirc/config/ConfigFileBackedConfigProvider.java

@@ -81,7 +81,7 @@ public class ConfigFileBackedConfigProvider extends BaseConfigProvider implement
      * @throws InvalidIdentityFileException Missing required properties
      * @throws IOException                  Input/output exception
      */
-    public ConfigFileBackedConfigProvider(final IdentityManager identityManager, final File file,
+    public ConfigFileBackedConfigProvider(@Nullable final IdentityManager identityManager, final File file,
             final boolean forceDefault) throws IOException, InvalidIdentityFileException {
         this.identityManager = identityManager;
         this.file = new ConfigFile(file);
@@ -123,7 +123,7 @@ public class ConfigFileBackedConfigProvider extends BaseConfigProvider implement
      * @param configFile      The config file to use
      * @param target          The target of this identity
      */
-    public ConfigFileBackedConfigProvider(final IdentityManager identityManager,
+    public ConfigFileBackedConfigProvider(@Nullable final IdentityManager identityManager,
             final ConfigFile configFile, final ConfigTarget target) {
         this.identityManager = identityManager;
         this.file = configFile;

src/com/dmdirc/config/ConfigTarget.java

@@ -24,6 +24,8 @@ package com.dmdirc.config;
 
 import java.io.Serializable;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents the target of a particular config source.
  * <p>
@@ -224,7 +226,7 @@ public class ConfigTarget implements Comparable<ConfigTarget>, Serializable {
      *         integer if this is more specific
      */
     @Override
-    public int compareTo(final ConfigTarget target) {
+    public int compareTo(@Nonnull final ConfigTarget target) {
         if (type.equals(target.getType())) {
             return target.getOrder() - order;
         } else {

src/com/dmdirc/events/ChannelTopicChangeEvent.java

@@ -53,6 +53,7 @@ public class ChannelTopicChangeEvent extends ChannelDisplayableEvent {
         return client;
     }
 
+    @Nullable
     public String getTopic() {
         return topic;
     }

src/com/dmdirc/events/UnknownCommandEvent.java

@@ -54,6 +54,7 @@ public class UnknownCommandEvent extends DMDircEvent implements DisplayableEvent
         this.arguments = arguments;
     }
 
+    @Nullable
     public FrameContainer getSource() {
         return source;
     }

src/com/dmdirc/plugins/PluginInfo.java

@@ -49,6 +49,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.TreeMap;
 
+import javax.annotation.Nonnull;
 import javax.inject.Provider;
 
 import org.slf4j.LoggerFactory;
@@ -933,7 +934,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
 
     /** {@inheritDoc} */
     @Override
-    public int compareTo(final PluginInfo o) {
+    public int compareTo(@Nonnull final PluginInfo o) {
         return toString().compareTo(o.toString());
     }
 

src/com/dmdirc/ui/input/TabCompleter.java

@@ -81,7 +81,7 @@ public class TabCompleter {
     public TabCompleter(
             final CommandController commandController,
             final AggregateConfigProvider configManager,
-            final TabCompleter parent) {
+            @Nullable final TabCompleter parent) {
         this.parent = parent;
         this.commandController = commandController;
         this.configManager = configManager;

src/com/dmdirc/ui/themes/Theme.java

@@ -35,6 +35,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents one theme file.
  */
@@ -201,7 +203,7 @@ public class Theme implements Comparable<Theme> {
     }
 
     @Override
-    public int compareTo(final Theme o) {
+    public int compareTo(@Nonnull final Theme o) {
         return getName().compareTo(o.getName());
     }
 

src/com/dmdirc/updater/Version.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.updater;
 
+import javax.annotation.Nonnull;
+
 /**
  * Describes a version of a component, either as an integer or as a String which corresponds to the
  * output of `git-describe --tags`.
@@ -72,7 +74,7 @@ public class Version implements Comparable<Version> {
 
     /** {@inheritDoc} */
     @Override
-    public int compareTo(final Version o) {
+    public int compareTo(@Nonnull final Version o) {
         if (o.intVersion > Integer.MIN_VALUE && this.intVersion > Integer.MIN_VALUE) {
             return this.intVersion - o.intVersion;
         } else if (o.strVersion == null && this.strVersion == null) {

src/com/dmdirc/updater/manager/DMDircUpdateManager.java

@@ -34,6 +34,7 @@ import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -93,7 +94,7 @@ public class DMDircUpdateManager extends CachingUpdateManagerImpl {
 
         /** {@inheritDoc} */
         @Override
-        public Thread newThread(final Runnable r) {
+        public Thread newThread(@Nonnull final Runnable r) {
             return new Thread(r, "Updater thread");
         }
 

test/com/dmdirc/harness/TestCommandParser.java

@@ -32,6 +32,8 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
+import javax.annotation.Nonnull;
+
 public class TestCommandParser extends CommandParser {
 
     private static final long serialVersionUID = 7073002401375438532L;
@@ -57,7 +59,7 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void executeCommand(FrameContainer origin, CommandInfo commandInfo, Command command,
+    protected void executeCommand(@Nonnull FrameContainer origin, CommandInfo commandInfo, Command command,
             CommandArguments args, CommandContext context) {
         executedCommand = command;
         wasSilent = args.isSilent();