Browse Source

Merge pull request #218 from csmith/master

Fix some nullable annotations in debug plugin.
pull/219/head
Greg Holmes 9 years ago
parent
commit
781ff6c366

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/Benchmark.java View File

28
 import com.dmdirc.commandparser.CommandArguments;
28
 import com.dmdirc.commandparser.CommandArguments;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
30
 
30
 
31
+import javax.annotation.Nonnull;
31
 import javax.inject.Inject;
32
 import javax.inject.Inject;
32
 import javax.inject.Provider;
33
 import javax.inject.Provider;
33
 
34
 
58
     }
59
     }
59
 
60
 
60
     @Override
61
     @Override
61
-    public void execute(final FrameContainer origin,
62
+    public void execute(@Nonnull final FrameContainer origin,
62
             final CommandArguments args, final CommandContext context) {
63
             final CommandArguments args, final CommandContext context) {
63
         final long[] results = new long[10];
64
         final long[] results = new long[10];
64
 
65
 

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/ColourSpam.java View File

28
 import com.dmdirc.commandparser.CommandArguments;
28
 import com.dmdirc.commandparser.CommandArguments;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
30
 
30
 
31
+import javax.annotation.Nonnull;
31
 import javax.inject.Inject;
32
 import javax.inject.Inject;
32
 import javax.inject.Provider;
33
 import javax.inject.Provider;
33
 
34
 
57
     }
58
     }
58
 
59
 
59
     @Override
60
     @Override
60
-    public void execute(final FrameContainer origin,
61
+    public void execute(@Nonnull final FrameContainer origin,
61
             final CommandArguments args, final CommandContext context) {
62
             final CommandArguments args, final CommandContext context) {
62
         for (int i = 0; i < 100; i++) {
63
         for (int i = 0; i < 100; i++) {
63
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
64
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/ConfigInfo.java View File

29
 import com.dmdirc.commandparser.commands.context.CommandContext;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
30
 import com.dmdirc.interfaces.config.ConfigProvider;
30
 import com.dmdirc.interfaces.config.ConfigProvider;
31
 
31
 
32
+import javax.annotation.Nonnull;
32
 import javax.inject.Inject;
33
 import javax.inject.Inject;
33
 import javax.inject.Provider;
34
 import javax.inject.Provider;
34
 
35
 
58
     }
59
     }
59
 
60
 
60
     @Override
61
     @Override
61
-    public void execute(final FrameContainer origin,
62
+    public void execute(@Nonnull final FrameContainer origin,
62
             final CommandArguments args, final CommandContext context) {
63
             final CommandArguments args, final CommandContext context) {
63
         for (ConfigProvider source : origin.getConfigManager().getSources()) {
64
         for (ConfigProvider source : origin.getConfigManager().getSources()) {
64
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()
65
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/EventBusViewer.java View File

41
 
41
 
42
 import java.lang.reflect.Method;
42
 import java.lang.reflect.Method;
43
 
43
 
44
+import javax.annotation.Nonnull;
44
 import javax.inject.Inject;
45
 import javax.inject.Inject;
45
 import javax.inject.Provider;
46
 import javax.inject.Provider;
46
 
47
 
89
     }
90
     }
90
 
91
 
91
     @Override
92
     @Override
92
-    public void execute(final FrameContainer origin,
93
+    public void execute(@Nonnull final FrameContainer origin,
93
             final CommandArguments args, final CommandContext context) {
94
             final CommandArguments args, final CommandContext context) {
94
         final boolean isGlobal = args.getArguments().length > 0
95
         final boolean isGlobal = args.getArguments().length > 0
95
                 && "--global".equals(args.getArguments()[0]);
96
                 && "--global".equals(args.getArguments()[0]);

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/FakeError.java View File

34
 import com.dmdirc.logger.ErrorLevel;
34
 import com.dmdirc.logger.ErrorLevel;
35
 import com.dmdirc.ui.input.AdditionalTabTargets;
35
 import com.dmdirc.ui.input.AdditionalTabTargets;
36
 
36
 
37
+import javax.annotation.Nonnull;
37
 import javax.inject.Inject;
38
 import javax.inject.Inject;
38
 import javax.inject.Provider;
39
 import javax.inject.Provider;
39
 
40
 
69
     }
70
     }
70
 
71
 
71
     @Override
72
     @Override
72
-    public void execute(final FrameContainer origin,
73
+    public void execute(@Nonnull final FrameContainer origin,
73
             final CommandArguments args, final CommandContext context) {
74
             final CommandArguments args, final CommandContext context) {
74
         if ((args.getArguments().length == 1
75
         if ((args.getArguments().length == 1
75
                 || args.getArguments().length == 2)
76
                 || args.getArguments().length == 2)

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/FirstRun.java View File

30
 import com.dmdirc.commandparser.commands.context.CommandContext;
30
 import com.dmdirc.commandparser.commands.context.CommandContext;
31
 import com.dmdirc.events.FirstRunEvent;
31
 import com.dmdirc.events.FirstRunEvent;
32
 
32
 
33
+import javax.annotation.Nonnull;
33
 import javax.inject.Inject;
34
 import javax.inject.Inject;
34
 import javax.inject.Provider;
35
 import javax.inject.Provider;
35
 
36
 
65
     }
66
     }
66
 
67
 
67
     @Override
68
     @Override
68
-    public void execute(final FrameContainer origin,
69
+    public void execute(@Nonnull final FrameContainer origin,
69
             final CommandArguments args, final CommandContext context) {
70
             final CommandArguments args, final CommandContext context) {
70
         eventBus.publish(new FirstRunEvent());
71
         eventBus.publish(new FirstRunEvent());
71
     }
72
     }

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/ForceUpdate.java View File

35
 import com.dmdirc.updater.UpdateChecker;
35
 import com.dmdirc.updater.UpdateChecker;
36
 import com.dmdirc.updater.manager.CachingUpdateManager;
36
 import com.dmdirc.updater.manager.CachingUpdateManager;
37
 
37
 
38
+import javax.annotation.Nonnull;
38
 import javax.inject.Inject;
39
 import javax.inject.Inject;
39
 import javax.inject.Provider;
40
 import javax.inject.Provider;
40
 
41
 
87
     }
88
     }
88
 
89
 
89
     @Override
90
     @Override
90
-    public void execute(final FrameContainer origin,
91
+    public void execute(@Nonnull final FrameContainer origin,
91
             final CommandArguments args, final CommandContext context) {
92
             final CommandArguments args, final CommandContext context) {
92
         if (globalConfig.getOptionBool("updater", "enable")) {
93
         if (globalConfig.getOptionBool("updater", "enable")) {
93
             UpdateChecker.checkNow(updateManager, identityController, eventBus,
94
             UpdateChecker.checkNow(updateManager, identityController, eventBus,

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/GlobalConfigInfo.java View File

31
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
31
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
32
 import com.dmdirc.interfaces.config.ConfigProvider;
32
 import com.dmdirc.interfaces.config.ConfigProvider;
33
 
33
 
34
+import javax.annotation.Nonnull;
34
 import javax.inject.Inject;
35
 import javax.inject.Inject;
35
 import javax.inject.Provider;
36
 import javax.inject.Provider;
36
 
37
 
68
     }
69
     }
69
 
70
 
70
     @Override
71
     @Override
71
-    public void execute(final FrameContainer origin,
72
+    public void execute(@Nonnull final FrameContainer origin,
72
             final CommandArguments args, final CommandContext context) {
73
             final CommandArguments args, final CommandContext context) {
73
         for (ConfigProvider source : globalConfig.getSources()) {
74
         for (ConfigProvider source : globalConfig.getSources()) {
74
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()
75
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/Identities.java View File

32
 
32
 
33
 import java.util.List;
33
 import java.util.List;
34
 
34
 
35
+import javax.annotation.Nonnull;
35
 import javax.inject.Inject;
36
 import javax.inject.Inject;
36
 import javax.inject.Provider;
37
 import javax.inject.Provider;
37
 
38
 
67
     }
68
     }
68
 
69
 
69
     @Override
70
     @Override
70
-    public void execute(final FrameContainer origin,
71
+    public void execute(@Nonnull final FrameContainer origin,
71
             final CommandArguments args, final CommandContext context) {
72
             final CommandArguments args, final CommandContext context) {
72
         final String type;
73
         final String type;
73
 
74
 

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/MemInfo.java View File

28
 import com.dmdirc.commandparser.CommandArguments;
28
 import com.dmdirc.commandparser.CommandArguments;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
30
 
30
 
31
+import javax.annotation.Nonnull;
31
 import javax.inject.Inject;
32
 import javax.inject.Inject;
32
 import javax.inject.Provider;
33
 import javax.inject.Provider;
33
 
34
 
57
     }
58
     }
58
 
59
 
59
     @Override
60
     @Override
60
-    public void execute(final FrameContainer origin,
61
+    public void execute(@Nonnull final FrameContainer origin,
61
             final CommandArguments args, final CommandContext context) {
62
             final CommandArguments args, final CommandContext context) {
62
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Total Memory: "
63
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Total Memory: "
63
                 + Runtime.getRuntime().totalMemory());
64
                 + Runtime.getRuntime().totalMemory());

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/Notify.java View File

31
 
31
 
32
 import java.util.Optional;
32
 import java.util.Optional;
33
 
33
 
34
+import javax.annotation.Nonnull;
34
 import javax.inject.Inject;
35
 import javax.inject.Inject;
35
 import javax.inject.Provider;
36
 import javax.inject.Provider;
36
 
37
 
60
     }
61
     }
61
 
62
 
62
     @Override
63
     @Override
63
-    public void execute(final FrameContainer origin,
64
+    public void execute(@Nonnull final FrameContainer origin,
64
             final CommandArguments args, final CommandContext context) {
65
             final CommandArguments args, final CommandContext context) {
65
         final Optional<Colour> colour = origin.getNotification();
66
         final Optional<Colour> colour = origin.getNotification();
66
         if (colour.isPresent()) {
67
         if (colour.isPresent()) {

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/RunGC.java View File

28
 import com.dmdirc.commandparser.CommandArguments;
28
 import com.dmdirc.commandparser.CommandArguments;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
30
 
30
 
31
+import javax.annotation.Nonnull;
31
 import javax.inject.Inject;
32
 import javax.inject.Inject;
32
 import javax.inject.Provider;
33
 import javax.inject.Provider;
33
 
34
 
57
     }
58
     }
58
 
59
 
59
     @Override
60
     @Override
60
-    public void execute(final FrameContainer origin,
61
+    public void execute(@Nonnull final FrameContainer origin,
61
             final CommandArguments args, final CommandContext context) {
62
             final CommandArguments args, final CommandContext context) {
62
         System.gc();
63
         System.gc();
63
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
64
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/ServerInfo.java View File

31
 
31
 
32
 import java.util.Optional;
32
 import java.util.Optional;
33
 
33
 
34
+import javax.annotation.Nonnull;
34
 import javax.inject.Inject;
35
 import javax.inject.Inject;
35
 import javax.inject.Provider;
36
 import javax.inject.Provider;
36
 
37
 
60
     }
61
     }
61
 
62
 
62
     @Override
63
     @Override
63
-    public void execute(final FrameContainer origin,
64
+    public void execute(@Nonnull final FrameContainer origin,
64
             final CommandArguments args, final CommandContext context) {
65
             final CommandArguments args, final CommandContext context) {
65
         final Optional<Connection> optionalConnection = origin.getConnection();
66
         final Optional<Connection> optionalConnection = origin.getConnection();
66
         if (optionalConnection.isPresent()) {
67
         if (optionalConnection.isPresent()) {

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/ServerState.java View File

31
 
31
 
32
 import java.util.Optional;
32
 import java.util.Optional;
33
 
33
 
34
+import javax.annotation.Nonnull;
34
 import javax.inject.Inject;
35
 import javax.inject.Inject;
35
 import javax.inject.Provider;
36
 import javax.inject.Provider;
36
 
37
 
60
     }
61
     }
61
 
62
 
62
     @Override
63
     @Override
63
-    public void execute(final FrameContainer origin,
64
+    public void execute(@Nonnull final FrameContainer origin,
64
             final CommandArguments args, final CommandContext context) {
65
             final CommandArguments args, final CommandContext context) {
65
         final Optional<Connection> optionalConnection = origin.getConnection();
66
         final Optional<Connection> optionalConnection = origin.getConnection();
66
         if (optionalConnection.isPresent()) {
67
         if (optionalConnection.isPresent()) {

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/Services.java View File

33
 import com.dmdirc.plugins.ServiceProvider;
33
 import com.dmdirc.plugins.ServiceProvider;
34
 import com.dmdirc.ui.input.AdditionalTabTargets;
34
 import com.dmdirc.ui.input.AdditionalTabTargets;
35
 
35
 
36
+import javax.annotation.Nonnull;
36
 import javax.inject.Inject;
37
 import javax.inject.Inject;
37
 import javax.inject.Provider;
38
 import javax.inject.Provider;
38
 
39
 
69
     }
70
     }
70
 
71
 
71
     @Override
72
     @Override
72
-    public void execute(final FrameContainer origin,
73
+    public void execute(@Nonnull final FrameContainer origin,
73
             final CommandArguments args, final CommandContext context) {
74
             final CommandArguments args, final CommandContext context) {
74
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Available Services:");
75
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Available Services:");
75
         for (Service service : serviceManager.getAllServices()) {
76
         for (Service service : serviceManager.getAllServices()) {

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/StatusbarMessage.java View File

33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
34
 import com.dmdirc.ui.StatusMessage;
34
 import com.dmdirc.ui.StatusMessage;
35
 
35
 
36
+import javax.annotation.Nonnull;
36
 import javax.inject.Inject;
37
 import javax.inject.Inject;
37
 import javax.inject.Provider;
38
 import javax.inject.Provider;
38
 
39
 
75
     }
76
     }
76
 
77
 
77
     @Override
78
     @Override
78
-    public void execute(final FrameContainer origin,
79
+    public void execute(@Nonnull final FrameContainer origin,
79
             final CommandArguments args, final CommandContext context) {
80
             final CommandArguments args, final CommandContext context) {
80
         eventBus.publishAsync(new StatusBarMessageEvent(new StatusMessage(null,
81
         eventBus.publishAsync(new StatusBarMessageEvent(new StatusMessage(null,
81
                 "Test: " + args.getArgumentsAsString(), null, 5, globalConfig)));
82
                 "Test: " + args.getArgumentsAsString(), null, 5, globalConfig)));

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/Threads.java View File

31
 
31
 
32
 import java.util.Map.Entry;
32
 import java.util.Map.Entry;
33
 
33
 
34
+import javax.annotation.Nonnull;
34
 import javax.inject.Inject;
35
 import javax.inject.Inject;
35
 import javax.inject.Provider;
36
 import javax.inject.Provider;
36
 
37
 
60
     }
61
     }
61
 
62
 
62
     @Override
63
     @Override
63
-    public void execute(final FrameContainer origin,
64
+    public void execute(@Nonnull final FrameContainer origin,
64
             final CommandArguments args, final CommandContext context) {
65
             final CommandArguments args, final CommandContext context) {
65
         for (Entry<Thread, StackTraceElement[]> thread
66
         for (Entry<Thread, StackTraceElement[]> thread
66
                 : Thread.getAllStackTraces().entrySet()) {
67
                 : Thread.getAllStackTraces().entrySet()) {

+ 2
- 1
debug/src/com/dmdirc/addons/debug/commands/Time.java View File

31
 import com.dmdirc.ui.input.AdditionalTabTargets;
31
 import com.dmdirc.ui.input.AdditionalTabTargets;
32
 import com.dmdirc.ui.input.TabCompletionType;
32
 import com.dmdirc.ui.input.TabCompletionType;
33
 
33
 
34
+import javax.annotation.Nonnull;
34
 import javax.inject.Inject;
35
 import javax.inject.Inject;
35
 import javax.inject.Provider;
36
 import javax.inject.Provider;
36
 
37
 
60
     }
61
     }
61
 
62
 
62
     @Override
63
     @Override
63
-    public void execute(final FrameContainer origin,
64
+    public void execute(@Nonnull final FrameContainer origin,
64
             final CommandArguments args, final CommandContext context) {
65
             final CommandArguments args, final CommandContext context) {
65
         doTime(origin, args);
66
         doTime(origin, args);
66
     }
67
     }

Loading…
Cancel
Save