Merge pull request #218 from csmith/master

Fix some nullable annotations in debug plugin.

debug/src/com/dmdirc/addons/debug/commands/Benchmark.java

@@ -28,6 +28,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -58,7 +59,7 @@ public class Benchmark extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final long[] results = new long[10];
 

debug/src/com/dmdirc/addons/debug/commands/ColourSpam.java

@@ -28,6 +28,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -57,7 +58,7 @@ public class ColourSpam extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         for (int i = 0; i < 100; i++) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

debug/src/com/dmdirc/addons/debug/commands/ConfigInfo.java

@@ -29,6 +29,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -58,7 +59,7 @@ public class ConfigInfo extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         for (ConfigProvider source : origin.getConfigManager().getSources()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()

debug/src/com/dmdirc/addons/debug/commands/EventBusViewer.java

@@ -41,6 +41,7 @@ import com.dmdirc.util.URLBuilder;
 
 import java.lang.reflect.Method;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -89,7 +90,7 @@ public class EventBusViewer extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final boolean isGlobal = args.getArguments().length > 0
                 && "--global".equals(args.getArguments()[0]);

debug/src/com/dmdirc/addons/debug/commands/FakeError.java

@@ -34,6 +34,7 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -69,7 +70,7 @@ public class FakeError extends DebugCommand 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
                 || args.getArguments().length == 2)

debug/src/com/dmdirc/addons/debug/commands/FirstRun.java

@@ -30,6 +30,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.FirstRunEvent;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -65,7 +66,7 @@ public class FirstRun extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         eventBus.publish(new FirstRunEvent());
     }

debug/src/com/dmdirc/addons/debug/commands/ForceUpdate.java

@@ -35,6 +35,7 @@ import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -87,7 +88,7 @@ public class ForceUpdate extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (globalConfig.getOptionBool("updater", "enable")) {
             UpdateChecker.checkNow(updateManager, identityController, eventBus,

debug/src/com/dmdirc/addons/debug/commands/GlobalConfigInfo.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -68,7 +69,7 @@ public class GlobalConfigInfo extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         for (ConfigProvider source : globalConfig.getSources()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()

debug/src/com/dmdirc/addons/debug/commands/Identities.java

@@ -32,6 +32,7 @@ import com.dmdirc.interfaces.config.IdentityController;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -67,7 +68,7 @@ public class Identities extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final String type;
 

debug/src/com/dmdirc/addons/debug/commands/MemInfo.java

@@ -28,6 +28,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -57,7 +58,7 @@ public class MemInfo extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Total Memory: "
                 + Runtime.getRuntime().totalMemory());

debug/src/com/dmdirc/addons/debug/commands/Notify.java

@@ -31,6 +31,7 @@ import com.dmdirc.util.colours.Colour;
 
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -60,7 +61,7 @@ public class Notify extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Optional<Colour> colour = origin.getNotification();
         if (colour.isPresent()) {

debug/src/com/dmdirc/addons/debug/commands/RunGC.java

@@ -28,6 +28,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -57,7 +58,7 @@ public class RunGC extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         System.gc();
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

debug/src/com/dmdirc/addons/debug/commands/ServerInfo.java

@@ -31,6 +31,7 @@ import com.dmdirc.interfaces.Connection;
 
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -60,7 +61,7 @@ public class ServerInfo extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Optional<Connection> optionalConnection = origin.getConnection();
         if (optionalConnection.isPresent()) {

debug/src/com/dmdirc/addons/debug/commands/ServerState.java

@@ -31,6 +31,7 @@ import com.dmdirc.interfaces.Connection;
 
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -60,7 +61,7 @@ public class ServerState extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Optional<Connection> optionalConnection = origin.getConnection();
         if (optionalConnection.isPresent()) {

debug/src/com/dmdirc/addons/debug/commands/Services.java

@@ -33,6 +33,7 @@ import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.plugins.ServiceProvider;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -69,7 +70,7 @@ public class Services extends DebugCommand implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Available Services:");
         for (Service service : serviceManager.getAllServices()) {

debug/src/com/dmdirc/addons/debug/commands/StatusbarMessage.java

@@ -33,6 +33,7 @@ import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.StatusMessage;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -75,7 +76,7 @@ public class StatusbarMessage extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         eventBus.publishAsync(new StatusBarMessageEvent(new StatusMessage(null,
                 "Test: " + args.getArgumentsAsString(), null, 5, globalConfig)));

debug/src/com/dmdirc/addons/debug/commands/Threads.java

@@ -31,6 +31,7 @@ import com.dmdirc.ui.messages.Styliser;
 
 import java.util.Map.Entry;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -60,7 +61,7 @@ public class Threads extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         for (Entry<Thread, StackTraceElement[]> thread
                 : Thread.getAllStackTraces().entrySet()) {

debug/src/com/dmdirc/addons/debug/commands/Time.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -60,7 +61,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         doTime(origin, args);
     }