Style fixes and more deprecation work

src/com/dmdirc/Main.java

@@ -208,7 +208,7 @@ public final class Main {
                     getUI().showFeedbackNag();
                 }
             }, FEEDBACK_DELAY);
-        } else if (IdentityManager.getGlobalConfig().hasOption("general", "addonrevision")) {
+        } else if (IdentityManager.getGlobalConfig().hasOptionInt("general", "addonrevision")) {
             // @Deprecated - can be removed after 0.6 is released
             IdentityManager.getConfigIdentity().unsetOption("general", "addonrevision");
             getUI().showMigrationWizard();

src/com/dmdirc/actions/CoreActionComparison.java

@@ -38,6 +38,7 @@ public enum CoreActionComparison implements ActionComparison {
     /** Compares a string to another using a regular expression. */
     STRING_REGEX {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             try {
                 return ((String) arg1).matches((String) arg2);
@@ -46,110 +47,137 @@ public enum CoreActionComparison implements ActionComparison {
             }
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return String.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "matches regex"; }
     },
     
     /** Compares if two strings content are the same, case insensitive. */
     STRING_EQUALS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             return ((String) arg1).equalsIgnoreCase((String) arg2);
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return String.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "equals"; }
     },
     
     /** Compares if two strings content aren't the same, case insensitive. */
     STRING_NEQUALS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             return !STRING_EQUALS.test(arg1, arg2);
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return String.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "does not equal"; }
     },
     
     /** Checks if the string starts with another strings. */
     STRING_STARTSWITH {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             return ((String) arg1).startsWith((String) arg2);
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return String.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "starts with"; }
     },
     
     /** Checks if the string containts another string. */
     STRING_CONTAINS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             return ((String) arg1).indexOf((String) arg2) != -1;
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return String.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "contains"; }
     },
 
     /** Checks if the string doesn't containt another string. */
     STRING_NCONTAINS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             return ((String) arg1).indexOf((String) arg2) == -1;
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return String.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "doesn't contain"; }
     },
     
     /** Checks if two boolean values are equal. */
     BOOL_IS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             return ((Boolean) arg1).equals(Boolean.valueOf((String) arg2));
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return Boolean.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "is"; }
     },
     
     /** Checks if the colour is the same as another colour. */
     COLOUR_EQUALS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             return ((Color) arg1).equals(ColourManager.parseColour((String) arg2));
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return Color.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "equals"; }
     },
     
     /** Checks if the colour is not the same as another colour. */
     COLOUR_NEQUALS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             return !COLOUR_EQUALS.test(arg1, arg2);
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return Color.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "does not equal"; }
     },
     
     /** Checks if the int is equals to another int. */
     INT_EQUALS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             try {
                 return 0 == ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
@@ -158,14 +186,17 @@ public enum CoreActionComparison implements ActionComparison {
             }
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return Integer.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "equals"; }
     },
     
     /** Checks if the int is larger than another int. */
     INT_GREATER {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             try {
                 return 0 < ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
@@ -174,14 +205,17 @@ public enum CoreActionComparison implements ActionComparison {
             }
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return Integer.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "is greater than"; }
     },
     
     /** Checks if the int is smaller than another int. */
     INT_LESS {
         /** {@inheritDoc} */
+        @Override
         public boolean test(final Object arg1, final Object arg2) {
             try {
                 return 0 > ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
@@ -190,18 +224,11 @@ public enum CoreActionComparison implements ActionComparison {
             }
         }
         /** {@inheritDoc} */
+        @Override
         public Class appliesTo() { return Integer.class; }
         /** {@inheritDoc} */
+        @Override
         public String getName() { return "is less than"; }
     };
     
-    /** {@inheritDoc} */
-    public abstract boolean test(final Object arg1, final Object arg2);
-    
-    /** {@inheritDoc} */
-    public abstract Class appliesTo();
-    
-    /** {@inheritDoc} */
-    public abstract String getName();
-    
 }

src/com/dmdirc/actions/metatypes/ChannelEvents.java

@@ -66,21 +66,25 @@ public enum ChannelEvents implements ActionMetaType {
     }
 
     /** {@inheritDoc} */
+    @Override
     public int getArity() {
         return argNames.length;
     }
 
     /** {@inheritDoc} */
+    @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
 
     /** {@inheritDoc} */
+    @Override
     public String[] getArgNames() {
         return argNames;
     }
 
     /** {@inheritDoc} */
+    @Override
     public String getGroup() {
         return "Channel Events";
     }

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -75,21 +75,25 @@ public enum ClientEvents implements ActionMetaType {
     }
     
     /** {@inheritDoc} */
+    @Override
     public int getArity() {
         return argNames.length;
     }
     
     /** {@inheritDoc} */
+    @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
     
     /** {@inheritDoc} */
+    @Override
     public String[] getArgNames() {
         return argNames;
     }
     
     /** {@inheritDoc} */
+    @Override
     public String getGroup() {
         return "General Events";
     }    

src/com/dmdirc/actions/metatypes/PluginEvents.java

@@ -52,21 +52,25 @@ public enum PluginEvents implements ActionMetaType {
     }
     
     /** {@inheritDoc} */
+    @Override
     public int getArity() {
         return argNames.length;
     }
     
     /** {@inheritDoc} */
+    @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
     
     /** {@inheritDoc} */
+    @Override
     public String[] getArgNames() {
         return argNames;
     }
     
     /** {@inheritDoc} */
+    @Override
     public String getGroup() {
         return "Plugin Events";
     }    

src/com/dmdirc/actions/metatypes/QueryEvents.java

@@ -54,21 +54,25 @@ public enum QueryEvents implements ActionMetaType {
     }
     
     /** {@inheritDoc} */
+    @Override
     public int getArity() {
         return argNames.length;
     }
     
     /** {@inheritDoc} */
+    @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
     
     /** {@inheritDoc} */
+    @Override
     public String[] getArgNames() {
         return argNames;
     }
     
     /** {@inheritDoc} */
+    @Override
     public String getGroup() {
         return "Query Events";
     }    

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -69,21 +69,25 @@ public enum ServerEvents implements ActionMetaType {
     }
     
     /** {@inheritDoc} */
+    @Override
     public int getArity() {
         return argNames.length;
     }
     
     /** {@inheritDoc} */
+    @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
     
     /** {@inheritDoc} */
+    @Override
     public String[] getArgNames() {
         return argNames;
     }
     
     /** {@inheritDoc} */
+    @Override
     public String getGroup() {
         return "Server/Private Events";
     }    

src/com/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -46,30 +46,27 @@ public final class ChannelSettings extends ChannelCommand implements Intelligent
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param channel The channel object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         Main.getUI().showChannelSettingsDialog(channel);
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "channelsettings";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "channelsettings - opens the channel settings window";
     }

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -30,6 +30,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.
+ *
  * @author chris
  */
 public final class Cycle extends ChannelCommand {
@@ -41,14 +42,8 @@ public final class Cycle extends ChannelCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param channel The channel object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         channel.part(args.length > 0 ? implodeArgs(args)
@@ -56,17 +51,20 @@ public final class Cycle extends ChannelCommand {
         channel.join();
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "cycle";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "cycle [message] - parts and rejoins the channel";
     }

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -51,15 +51,8 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param channel The channel object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
-    @SuppressWarnings("unchecked")
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked") @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         
@@ -114,17 +107,20 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
         }
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "setnickcolour";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "setnickcolour [--nicklist|--text] <nick> [colour] - "
                 + "set the specified person's display colour";

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

@@ -48,6 +48,7 @@ public final class Active extends GlobalCommand implements IntelligentCommand {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         final String command = implodeArgs(args);
@@ -60,17 +61,20 @@ public final class Active extends GlobalCommand implements IntelligentCommand {
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "active";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "active <command> - executes the command as though it had been" +
                 " typed in the active window";