Various bits of tidying up.

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

.gitignore

@@ -43,3 +43,4 @@ __history
 /*.key
 /teamcity-info.xml
 /.idea/workspace.xml
+/.idea/uiDesigner.xml

src/com/dmdirc/actions/ActionManager.java

@@ -378,7 +378,7 @@ public class ActionManager implements ActionController {
         }
 
         if (!killSwitch) {
-            res |= triggerActions(type, format, arguments);
+            res = triggerActions(type, format, arguments);
         }
 
         return !res;

src/com/dmdirc/actions/ActionModel.java

@@ -252,7 +252,7 @@ public class ActionModel {
      * @return The triggers used by this action
      */
     public ActionType[] getTriggers() {
-        return triggers == null ? triggers : triggers.clone();
+        return triggers == null ? null : triggers.clone();
     }
 
     /**
@@ -290,7 +290,7 @@ public class ActionModel {
      * @return The commands that will be executed if this action is triggered
      */
     public String[] getResponse() {
-        return response == null ? response : response.clone();
+        return response == null ? null : response.clone();
     }
 
     /**

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

@@ -34,6 +34,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -71,9 +72,12 @@ public class ActionAliasMigrator implements Migrator {
 
     @Override
     public void migrate() {
-        for (File child : directory.listFiles()) {
-            if (migrate(child)) {
-                child.delete();
+        @Nullable final File[] files = directory.listFiles();
+        if (files != null) {
+            for (File child : files) {
+                if (migrate(child)) {
+                    child.delete();
+                }
             }
         }
         directory.delete();

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

@@ -69,8 +69,8 @@ public class CommandFlagResult {
      * @see #getArguments(com.dmdirc.commandparser.commands.flags.CommandFlag)
      */
     public String getArgumentsAsString(final CommandFlag flag) {
-        return flag == null ? (offsets.get(flag) > arguments.getArguments().length
-                ? "" : arguments.getArgumentsAsString(offsets.get(flag)))
+        return flag == null ? (offsets.get(null) > arguments.getArguments().length
+                ? "" : arguments.getArgumentsAsString(offsets.get(null)))
                 : arguments.getArgumentsAsString(offsets.get(flag),
                         offsets.get(flag) + flag.getDelayedArgs() + flag.getImmediateArgs() - 1);
     }

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -151,8 +151,7 @@ public class PluginClassLoader extends ClassLoader {
         }
 
         // We are meant to be loading this one!
-        byte[] data = null;
-
+        byte[] data;
         if (res.resourceExists(fileName)) {
             data = res.getResourceBytes(fileName);
         } else {

src/com/dmdirc/updater/components/PluginComponent.java

@@ -29,7 +29,6 @@ import com.dmdirc.updater.Version;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
 /**
@@ -140,22 +139,10 @@ public class PluginComponent implements UpdateComponent {
      * @return true if the file is valid
      */
     private boolean isValid(final File file) {
-        ZipFile zipfile = null;
-        try {
-            zipfile = new ZipFile(file);
+        try (ZipFile ignored = new ZipFile(file)) {
             return true;
-        } catch (ZipException e) {
-            return false;
         } catch (IOException e) {
             return false;
-        } finally {
-            try {
-                if (zipfile != null) {
-                    zipfile.close();
-                    zipfile = null;
-                }
-            } catch (IOException e) {
-            }
         }
     }