Tidying.

Remove pointless super() calls.
Remove redundant interface decs.
Remove unnecessary enum annotations.
Change .length == 0 to .isEmpty.

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

src/com/dmdirc/actions/Action.java

@@ -221,7 +221,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         }
 
         if (config.isFlatDomain(DOMAIN_CONDITIONTREE)
-                && config.getFlatDomain(DOMAIN_CONDITIONTREE).size() > 0) {
+                && !config.getFlatDomain(DOMAIN_CONDITIONTREE).isEmpty()) {
             conditionTree = ConditionTree.parseString(
                     config.getFlatDomain(DOMAIN_CONDITIONTREE).get(0));
 

src/com/dmdirc/actions/ActionCondition.java

@@ -52,7 +52,6 @@ public class ActionCondition {
      */
     public ActionCondition(final int arg, final ActionComponent component,
             final ActionComparison comparison, final String target) {
-        super();
 
         this.arg = arg;
         this.component = component;
@@ -69,7 +68,6 @@ public class ActionCondition {
      */
     public ActionCondition(final String starget, final ActionComparison comparison,
             final String target) {
-        super();
 
         this.arg = -1;
         this.starget = starget;

src/com/dmdirc/actions/ActionGroup.java

@@ -63,7 +63,6 @@ public class ActionGroup implements Iterable<Action> {
      * @param name The name of this action group
      */
     public ActionGroup(final String name) {
-        super();
 
         this.name = name;
     }

src/com/dmdirc/actions/ConditionTree.java

@@ -31,7 +31,7 @@ import java.util.Deque;
 public final class ConditionTree {
 
     /** The possible operations on a condition tree. */
-    public static enum OPERATION {
+    public enum OPERATION {
 
         /** Only passes if both subtrees are true. */
         AND,

src/com/dmdirc/actions/ConditionTreeFactory.java

@@ -48,7 +48,7 @@ public abstract class ConditionTreeFactory {
     /**
      * The possible types of ConditionTreeFactories.
      */
-    public static enum ConditionTreeFactoryType {
+    public enum ConditionTreeFactoryType {
 
         /** Factories that produce disjunction (OR) trees. */
         DISJUNCTION,

src/com/dmdirc/commandparser/PopupManager.java

@@ -82,7 +82,7 @@ public class PopupManager {
         final PopupMenu res = new PopupMenu();
 
         for (String item : configManager.getOptionList("popups", menuName)) {
-            if (item.length() > 0 && item.charAt(0) == '<') {
+            if (!item.isEmpty() && item.charAt(0) == '<') {
                 res.addAll(getMenu(item.substring(1), type, configManager).getItems());
             } else {
                 res.add(getItem(item, type, configManager));
@@ -118,7 +118,7 @@ public class PopupManager {
             final String name = item.substring(0, colon);
             final String command = item.substring(colon + 1);
 
-            if (command.length() > 0 && command.charAt(0) == '<') {
+            if (!command.isEmpty() && command.charAt(0) == '<') {
                 res = new PopupMenuItem(commandController,
                         name, getMenu(command.substring(1),
                                 type, configManager));

src/com/dmdirc/commandparser/PopupType.java

@@ -107,7 +107,7 @@ public enum PopupType {
      *
      * @param arity The arity of the type
      */
-    private PopupType(final int arity) {
+    PopupType(final int arity) {
         this.arity = arity;
     }
 

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

@@ -122,7 +122,7 @@ public class Help extends Command implements IntelligentCommand {
             final String name) {
         final Map.Entry<CommandInfo, Command> command;
 
-        if (name.length() > 0 && name.charAt(0) == getController().getCommandChar()) {
+        if (!name.isEmpty() && name.charAt(0) == getController().getCommandChar()) {
             command = getController().getCommand(name.substring(1));
         } else {
             command = getController().getCommand(name);

src/com/dmdirc/config/ConfigTarget.java

@@ -34,7 +34,7 @@ import javax.annotation.Nonnull;
 public class ConfigTarget implements Comparable<ConfigTarget>, Serializable {
 
     /** The possible target types. */
-    public static enum TYPE {
+    public enum TYPE {
 
         /** Client-wide default settings. */
         GLOBALDEFAULT,

src/com/dmdirc/config/InvalidIdentityFileException.java

@@ -32,7 +32,6 @@ public class InvalidIdentityFileException extends Exception {
 
     /** Creates a new instance of InvalidIdentityFileException. */
     public InvalidIdentityFileException() {
-        super();
     }
 
     /**

src/com/dmdirc/interfaces/ActionController.java

@@ -44,7 +44,7 @@ public interface ActionController {
      *
      * @param action The action to be registered
      */
-    @Precondition(value = "The specified action is not null")
+    @Precondition("The specified action is not null")
     void addAction(final Action action);
 
     /**
@@ -60,13 +60,9 @@ public interface ActionController {
      * @param oldName The old name of the group
      * @param newName The new name of the group
      */
-    @Precondition(value = {
-        "The old name is non-null and not empty",
-        "The old name is an existing group",
-        "The new name is non-null and not empty",
-        "The new name is not an existing group",
-        "The old name does not equal the new name"
-    })
+    @Precondition({"The old name is non-null and not empty", "The old name is an existing group",
+            "The new name is non-null and not empty", "The new name is not an existing group",
+            "The old name does not equal the new name"})
     void changeGroupName(final String oldName, final String newName);
 
     /**
@@ -76,10 +72,8 @@ public interface ActionController {
      *
      * @return The newly created group
      */
-    @Precondition(value = {
-        "The specified group is non-null and not empty",
-        "The specified group is not an existing group"
-    })
+    @Precondition({"The specified group is non-null and not empty",
+            "The specified group is not an existing group"})
     ActionGroup createGroup(final String group);
 
     /**
@@ -87,10 +81,8 @@ public interface ActionController {
      *
      * @param group The group to be removed
      */
-    @Precondition(value = {
-        "The specified group is non-null and not empty",
-        "The specified group is an existing group"
-    })
+    @Precondition({"The specified group is non-null and not empty",
+            "The specified group is an existing group"})
     void deleteGroup(final String group);
 
     /**
@@ -100,7 +92,7 @@ public interface ActionController {
      *
      * @return A list of compatible action comparisons
      */
-    @Precondition(value = "The specified target is not null")
+    @Precondition("The specified target is not null")
     List<ActionComparison> findCompatibleComparisons(final Class<?> target);
 
     /**
@@ -110,7 +102,7 @@ public interface ActionController {
      *
      * @return A list of compatible action components
      */
-    @Precondition(value = "The specified target is not null")
+    @Precondition("The specified target is not null")
     List<ActionComponent> findCompatibleComponents(final Class<?> target);
 
     /**
@@ -120,7 +112,7 @@ public interface ActionController {
      *
      * @return A list of compatible action types
      */
-    @Precondition(value = "The specified type is not null")
+    @Precondition("The specified type is not null")
     List<ActionType> findCompatibleTypes(final ActionType type);
 
     /**
@@ -131,7 +123,7 @@ public interface ActionController {
      *
      * @return The actiontype with the specified name, or null on failure
      */
-    @Precondition(value = "The specified type is non-null and not empty")
+    @Precondition("The specified type is non-null and not empty")
     ActionComparison getComparison(final String type);
 
     /**
@@ -142,7 +134,7 @@ public interface ActionController {
      *
      * @return The actioncomponent with the specified name, or null on failure
      */
-    @Precondition(value = "The specified type is non-null and not empty")
+    @Precondition("The specified type is non-null and not empty")
     ActionComponent getComponent(final String type);
 
     /**
@@ -189,7 +181,7 @@ public interface ActionController {
      *
      * @param comps An array of ActionComparisons to be registered
      */
-    @Precondition(value = "None of the specified ActionComparisons are null")
+    @Precondition("None of the specified ActionComparisons are null")
     void registerComparisons(final ActionComparison[] comps);
 
     /**
@@ -197,7 +189,7 @@ public interface ActionController {
      *
      * @param comps An array of ActionComponents to be registered
      */
-    @Precondition(value = "None of the specified ActionComponents are null")
+    @Precondition("None of the specified ActionComponents are null")
     void registerComponents(final ActionComponent[] comps);
 
     /**
@@ -221,7 +213,7 @@ public interface ActionController {
      *
      * @param newTypes An array of ActionTypes to be registered
      */
-    @Precondition(value = "None of the specified ActionTypes are null")
+    @Precondition("None of the specified ActionTypes are null")
     void registerTypes(final ActionType[] newTypes);
 
     /**
@@ -229,7 +221,7 @@ public interface ActionController {
      *
      * @param action The action to be unregistered
      */
-    @Precondition(value = "The specified action is not null")
+    @Precondition("The specified action is not null")
     void removeAction(final Action action);
 
     /**
@@ -255,11 +247,10 @@ public interface ActionController {
      * @return True if the event should be processed, or false if an action listener has requested
      *         the event be skipped.
      */
-    @Precondition(value = {
-        "The specified ActionType is not null",
-        "The specified ActionType has a valid ActionMetaType",
-        "The length of the arguments array equals the arity of the ActionType's ActionMetaType"
-    })
+    @Precondition({"The specified ActionType is not null",
+            "The specified ActionType has a valid ActionMetaType",
+            "The length of the arguments array equals the arity of the ActionType's " +
+                    "ActionMetaType"})
     boolean triggerEvent(final ActionType type, final StringBuffer format, final Object... arguments);
 
     /**

src/com/dmdirc/interfaces/config/IdentityFactory.java

@@ -40,8 +40,8 @@ public interface IdentityFactory {
      *
      * @return A config provider for the channel
      */
-    @Precondition(value = {"The specified network is non-null and not empty",
-        "The specified channel is non-null and not empty"})
+    @Precondition({"The specified network is non-null and not empty",
+            "The specified channel is non-null and not empty"})
     ConfigProvider createChannelConfig(String network, String channel);
 
     /**
@@ -51,7 +51,7 @@ public interface IdentityFactory {
      *
      * @return A config provider for the network
      */
-    @Precondition(value = "The specified network is non-null and not empty")
+    @Precondition("The specified network is non-null and not empty")
     ConfigProvider createNetworkConfig(String network);
 
     /**
@@ -61,7 +61,7 @@ public interface IdentityFactory {
      *
      * @return A config provider for the server
      */
-    @Precondition(value = "The specified server is non-null and not empty")
+    @Precondition("The specified server is non-null and not empty")
     ConfigProvider createServerConfig(String server);
 
     /**

src/com/dmdirc/plugins/GlobalClassLoader.java

@@ -45,7 +45,6 @@ public final class GlobalClassLoader extends ClassLoader {
      * @param manager Plugin Manager that this GCL is used by.
      */
     public GlobalClassLoader(final PluginManager manager) {
-        super();
         this.manager = manager;
     }
 

src/com/dmdirc/plugins/implementations/PluginFilesHelper.java

@@ -46,7 +46,6 @@ public class PluginFilesHelper {
      * @param pluginInfo This plugin's information object
      */
     public PluginFilesHelper(final PluginInfo pluginInfo) {
-        super();
         this.pluginInfo = pluginInfo;
         this.metaData = pluginInfo.getMetaData();
         filesDir = initFilesDir();

src/com/dmdirc/tls/TrustResult.java

@@ -44,7 +44,7 @@ public enum TrustResult {
      *
      * @param trusted Whether or not this result means the cert chain is trusted.
      */
-    private TrustResult(final boolean trusted) {
+    TrustResult(final boolean trusted) {
         this.trusted = trusted;
     }
 

src/com/dmdirc/ui/Colour.java

@@ -28,13 +28,13 @@ package com.dmdirc.ui;
 public class Colour {
 
     /** The colour white. */
-    public final static Colour WHITE = new Colour(255, 255, 255);
+    public static final Colour WHITE = new Colour(255, 255, 255);
     /** The colour light gray. */
-    public final static Colour LIGHT_GRAY = new Colour(192, 192, 192);
+    public static final Colour LIGHT_GRAY = new Colour(192, 192, 192);
     /** The colour gray. */
-    public final static Colour GRAY = new Colour(128, 128, 128);
+    public static final Colour GRAY = new Colour(128, 128, 128);
     /** The colour dark gray. */
-    public final static Colour DARK_GRAY = new Colour(64, 64, 64);
+    public static final Colour DARK_GRAY = new Colour(64, 64, 64);
     /** The colour black. */
     public static final Colour BLACK = new Colour(0, 0, 0);
     /** The colour red. */

src/com/dmdirc/ui/core/components/WindowComponent.java

@@ -47,7 +47,7 @@ public enum WindowComponent {
      *
      * @param identifier The identifier for this window component
      */
-    private WindowComponent(final String identifier) {
+    WindowComponent(final String identifier) {
         this.identifier = identifier;
     }
 

src/com/dmdirc/ui/core/dialogs/sslcertificate/CertificateChainEntry.java

@@ -45,7 +45,6 @@ public class CertificateChainEntry {
      */
     public CertificateChainEntry(final String name, final boolean trusted,
             final boolean invalid) {
-        super();
         this.name = name;
         this.trusted = trusted;
         this.invalid = invalid;

src/com/dmdirc/ui/core/dialogs/sslcertificate/CertificateInformationEntry.java

@@ -48,7 +48,6 @@ public class CertificateInformationEntry {
      */
     public CertificateInformationEntry(final String title, final String value,
             final boolean invalid, final boolean missing) {
-        super();
         this.title = title;
         this.value = value;
         this.invalid = invalid;

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

@@ -51,7 +51,7 @@ public enum UpdateStatus {
     /** Textual description of the status. */
     private final String description;
 
-    private UpdateStatus(final String description) {
+    UpdateStatus(final String description) {
         this.description = description;
     }
 

src/com/dmdirc/util/URIParser.java

@@ -149,7 +149,7 @@ public class URIParser {
 
             host = portParts[0];
 
-            if (portParts[1].length() > 0 && portParts[1].charAt(0) == '+') {
+            if (!portParts[1].isEmpty() && portParts[1].charAt(0) == '+') {
                 ssl = true;
                 portParts[1] = portParts[1].substring(1);
             }

src/com/dmdirc/util/resourcemanager/FileResourceManager.java

@@ -49,7 +49,6 @@ public final class FileResourceManager extends ResourceManager {
      * @param basePath Base path for the resource manager
      */
     protected FileResourceManager(final String basePath) {
-        super();
 
         this.basePath = basePath;
     }

src/com/dmdirc/util/resourcemanager/ZipResourceManager.java

@@ -74,7 +74,6 @@ public final class ZipResourceManager extends ResourceManager {
      * @param file ZipFile to load
      */
     protected ZipResourceManager(final ZipFile file) {
-        super();
         zipFile = file;
         entries = new ArrayList<>();
         final Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();