Sprinkle some @Nullables around.

Other minor tidying.

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

src/com/dmdirc/commandparser/commands/flags/CommandFlagHandler.java

@@ -26,11 +26,14 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 /**
  * Utility class for commands which allow the user to specify shell-like flags (
  * <code>--foo</code>).
@@ -70,6 +73,7 @@ public class CommandFlagHandler {
      * @return A corresponding {@link CommandFlagResult} object, or null if some problem was
      *         encountered.
      */
+    @Nullable
     public CommandFlagResult process(final FrameContainer origin,
             final CommandArguments arguments) {
         final Map<CommandFlag, Integer> results = parse(origin, arguments);
@@ -87,6 +91,7 @@ public class CommandFlagHandler {
      * @return A map of discovered command flags to the offset of the flag's first argument within
      *         the <code>arguments</code> object. If an error occurs, null is returned.
      */
+    @Nullable
     protected Map<CommandFlag, Integer> parse(final FrameContainer origin,
             final CommandArguments arguments) {
         enabledFlags.clear();
@@ -98,7 +103,7 @@ public class CommandFlagHandler {
         }
 
         final Map<CommandFlag, Integer> results = new HashMap<>();
-        final List<CommandFlag> delayedFlags = new ArrayList<>(flags.size());
+        final Collection<CommandFlag> delayedFlags = new ArrayList<>(flags.size());
 
         int offset;
         for (offset = 0; offset < arguments.getArguments().length; offset++) {

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

@@ -46,6 +46,7 @@ import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 /**
@@ -84,7 +85,7 @@ public class Echo extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final CommandFlagResult results = handler.process(origin, args);
+        @Nullable final CommandFlagResult results = handler.process(origin, args);
 
         if (results == null) {
             return;

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

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

src/com/dmdirc/plugins/GlobalClassLoader.java

@@ -29,6 +29,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 /**
  * This classloader knows about plugins and is used to store persistent classes.
  */
@@ -108,7 +110,7 @@ public final class GlobalClassLoader extends ClassLoader {
      *
      * @return The resulting {@link Class} object
      */
-    public Class<?> defineClass(final String classname, final byte[] data) {
+    public Class<?> defineClass(final String classname, final byte... data) {
         return defineClass(classname, data, 0, data.length);
     }
 
@@ -117,6 +119,7 @@ public final class GlobalClassLoader extends ClassLoader {
      *
      * @param classname Class to look for.
      */
+    @Nullable
     private byte[] getClassData(final String classname) {
         try {
             final String jarname = resourcesList.get(classname);

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

@@ -540,8 +540,8 @@ public abstract class InputHandler implements ConfigChangeListener {
     private void doCommandTabCompletion(final String text, final int start,
             final int end, final boolean shiftPressed) {
         doNormalTabCompletion(text, start, end, shiftPressed,
-                TabCompleterUtils.getIntelligentResults(parentWindow, text.substring(0, start),
-                        text.substring(start, end)));
+                TabCompleterUtils.getIntelligentResults(parentWindow, commandController,
+                        text.substring(0, start), text.substring(start, end)));
     }
 
     /**

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

@@ -28,10 +28,13 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.interfaces.CommandController;
 
 import java.util.Arrays;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 /**
  * Utilities relating to {@link TabCompleter}s.
  */
@@ -49,6 +52,7 @@ public final class TabCompleterUtils {
      *
      * @return Additional tab targets for the text, or null if none are available
      */
+    @Nullable
     public static AdditionalTabTargets getIntelligentResults(final int arg,
             final IntelligentCommand.IntelligentCommandContext context, final int offset) {
         if (arg == offset) {
@@ -74,6 +78,7 @@ public final class TabCompleterUtils {
      *
      * @since 0.6.4
      */
+    @Nullable
     private static AdditionalTabTargets getIntelligentResults(
             final FrameContainer window,
             final CommandArguments args, final String partial) {
@@ -117,10 +122,11 @@ public final class TabCompleterUtils {
      *
      * @since 0.6.4
      */
+    @Nullable
     public static AdditionalTabTargets getIntelligentResults(
-            final FrameContainer window, final String text,
-            final String partial) {
+            final FrameContainer window, final CommandController commandController,
+            final String text, final String partial) {
         return getIntelligentResults(window,
-                new CommandArguments(window.getCommandParser().getCommandManager(), text), partial);
+                new CommandArguments(commandController, text), partial);
     }
 }