ZOMG style fixes

git-svn-id: http://svn.dmdirc.com/trunk@1704 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Channel.java

@@ -48,9 +48,9 @@ import com.dmdirc.parser.callbacks.interfaces.IChannelQuit;
 import com.dmdirc.parser.callbacks.interfaces.IChannelTopic;
 import com.dmdirc.parser.callbacks.interfaces.IChannelUserModeChanged;
 import com.dmdirc.ui.ChannelFrame;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.Styliser;

src/com/dmdirc/CipherUtils.java

@@ -34,8 +34,8 @@ import java.security.NoSuchAlgorithmException;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
-import javax.crypto.BadPaddingException;
 
+import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;

src/com/dmdirc/IconManager.java

@@ -27,6 +27,7 @@ import java.awt.Toolkit;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 
@@ -123,4 +124,4 @@ public final class IconManager {
         return imageURL;
     }
     
-}
+}

src/com/dmdirc/Query.java

@@ -34,10 +34,10 @@ import com.dmdirc.parser.callbacks.CallbackNotFound;
 import com.dmdirc.parser.callbacks.interfaces.INickChanged;
 import com.dmdirc.parser.callbacks.interfaces.IPrivateAction;
 import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.QueryFrame;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.io.Serializable;
 

src/com/dmdirc/Raw.java

@@ -29,8 +29,8 @@ import com.dmdirc.parser.callbacks.CallbackNotFound;
 import com.dmdirc.parser.callbacks.interfaces.IDataIn;
 import com.dmdirc.parser.callbacks.interfaces.IDataOut;
 import com.dmdirc.ui.CustomInputFrame;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.io.Serializable;
 

src/com/dmdirc/Server.java

@@ -58,10 +58,10 @@ import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
 import com.dmdirc.parser.callbacks.interfaces.IPrivateNotice;
 import com.dmdirc.parser.callbacks.interfaces.ISocketClosed;
 import com.dmdirc.parser.callbacks.interfaces.IUserModeChanged;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.ServerFrame;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Formatter;

src/com/dmdirc/actions/Action.java

@@ -28,8 +28,8 @@ import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.GlobalCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 
 import java.io.File;

src/com/dmdirc/actions/CoreActionComponent.java

@@ -30,6 +30,7 @@ import com.dmdirc.parser.ChannelClientInfo;
 import java.awt.Color;
 import java.awt.event.KeyEvent;
 import java.util.GregorianCalendar;
+
 import javax.swing.KeyStroke;
 
 /**

src/com/dmdirc/actions/wrappers/ActionWrapper.java

@@ -53,4 +53,4 @@ public interface ActionWrapper {
      */
     String getGroupName();
     
-}
+}

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -30,7 +30,7 @@ import com.dmdirc.actions.ActionManager;
  * 
  * @author chris
  */
-public class AliasWrapper implements ActionWrapper {
+public final class AliasWrapper implements ActionWrapper {
     
     /** Singleton instance of the alias wrapper. */
     private static AliasWrapper me;
@@ -57,12 +57,12 @@ public class AliasWrapper implements ActionWrapper {
     }
     
     /** {@inheritDoc} */
-    public void registerAction(Action action) {
+    public void registerAction(final Action action) {
         System.out.println("Registered action: " + action.getName());
     }
     
     /** {@inheritDoc} */
-    public void unregisterAction(Action action) {
+    public void unregisterAction(final Action action) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
     
@@ -71,4 +71,4 @@ public class AliasWrapper implements ActionWrapper {
         return "aliases";
     }
     
-}
+}

src/com/dmdirc/actions/wrappers/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Action wrappers.
+ */
+package com.dmdirc.actions.wrappers;

src/com/dmdirc/commandparser/IntelligentCommand.java

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser;
 
 import com.dmdirc.ui.input.AdditionalTabTargets;
+
 import java.util.List;
 
 /**

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

@@ -26,8 +26,8 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Opens the channel settings window for the channel.

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

@@ -82,7 +82,7 @@ public final class SetNickColour extends ChannelCommand {
         offset++;
         
         if (target == null) {
-            sendLine(origin, isSilent, "commandError", "No such nickname ("+args[offset-1]+")!");
+            sendLine(origin, isSilent, "commandError", "No such nickname (" + args[offset - 1] + ")!");
         } else if (args.length <= offset) {
             // We're removing the colour
             if (nicklist) {

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

@@ -24,11 +24,11 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
- * The Active command issues a command to the active window
+ * The Active command issues a command to the active window.
  * @author chris
  */
 public final class Active extends GlobalCommand {

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

@@ -37,7 +37,7 @@ import java.util.List;
 
 /**
  * The if plugin command allows the user to execute commands based on whether
- * or not a plugin is loaded
+ * or not a plugin is loaded.
  *
  * @author chris
  */
@@ -108,7 +108,7 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
     }
 
     /** {@inheritDoc} */
-    public AdditionalTabTargets getSuggestions(int arg, List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

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

@@ -85,7 +85,7 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
     }
 
     /** {@inheritDoc} */
-    public AdditionalTabTargets getSuggestions(int arg, List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

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

@@ -23,8 +23,8 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Config;
-import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 

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

@@ -172,7 +172,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
     }
     
     /** {@inheritDoc} */
-    public AdditionalTabTargets getSuggestions(int arg, List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/server/Ctcp.java

@@ -93,7 +93,7 @@ public final class Ctcp extends ServerCommand implements IntelligentCommand {
     }
     
     /** {@inheritDoc} */
-    public AdditionalTabTargets getSuggestions(int arg, List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 1) {

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

@@ -25,8 +25,8 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 
 /**

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

@@ -27,8 +27,8 @@ import com.dmdirc.commandparser.Command;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.ui.ChannelFrame;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.QueryFrame;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Collections;
 import java.util.List;

src/com/dmdirc/config/ConfigManager.java

@@ -193,7 +193,7 @@ public final class ConfigManager implements Serializable, ConfigChangeListener {
     }
     
     /**
-     * Returns the name of all known options
+     * Returns the name of all known options.
      *
      * @return A list of options
      */

src/com/dmdirc/config/ConfigTarget.java

@@ -32,13 +32,6 @@ import java.io.Serializable;
  */
 public final class ConfigTarget implements Comparable, Serializable {
     
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    
     /** Indicates that the target is the global default config. */
     public static final int TYPE_GLOBALDEFAULT = 0;
     /** Indicates that the target is a global config source. */
@@ -52,6 +45,13 @@ public final class ConfigTarget implements Comparable, Serializable {
     /** Indicates that the target targets a channel. */
     public static final int TYPE_CHANNEL = 5;
     
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    
     /** The type of this target. */
     private int type = 1;
     /** The data of this target. */

src/com/dmdirc/config/IdentityManager.java

@@ -74,7 +74,7 @@ public final class IdentityManager {
         final String base = "com/dmdirc/config/defaults/";
         
         final String[] urls = {"asuka", "snircd", "bahamut", "hyperion",
-        "generic", "defaults"};
+        "generic", "defaults", };
         
         for (String url : urls) {
             try {

src/com/dmdirc/logger/ErrorLevel.java

@@ -38,6 +38,11 @@ public enum ErrorLevel {
     /** toString value of the item. */
     private String value;
     
+    /** 
+     * Instantiates the enum. 
+     *
+     * @param value toString value
+     */
     ErrorLevel(final String value) {
         this.value = value;
     }

src/com/dmdirc/logger/ErrorManager.java

@@ -37,6 +37,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+
 import javax.swing.event.EventListenerList;
 
 /**
@@ -100,7 +101,7 @@ public final class ErrorManager implements Serializable {
     }
     
     /**
-     * Returns a list of errors
+     * Returns a list of errors.
      *
      * @return Error list
      */
@@ -156,7 +157,7 @@ public final class ErrorManager implements Serializable {
     /**
      * Sends an error to the developers.
      *
-     * @param ProgramError error to be sent
+     * @param error ProgramError to be sent
      */
     @SuppressWarnings("PMD.SystemPrintln")
     private static void sendErrorInternal(final ProgramError error) {
@@ -258,7 +259,7 @@ public final class ErrorManager implements Serializable {
     }
     
     /**
-     * Fired when an error is deleted
+     * Fired when an error is deleted.
      *
      * @param error Error that has been deleted
      */

src/com/dmdirc/logger/ErrorStatus.java

@@ -38,6 +38,11 @@ public enum ErrorStatus {
     /** toString value of the item. */
     private String value;
     
+    /** 
+     * Instantiates the enum. 
+     *
+     * @param value toString value
+     */
     ErrorStatus(final String value) {
         this.value = value;
     }

src/com/dmdirc/logger/Logger.java

@@ -24,6 +24,7 @@ package com.dmdirc.logger;
 
 import com.dmdirc.Config;
 import com.dmdirc.ui.dialogs.error.FatalErrorDialog;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -74,7 +75,7 @@ public final class Logger {
      *
      * @param level Severity of the error
      * @param message Brief error description
-     * @param error Cause of error
+     * @param exception Cause of error
      * @param sendable Whether the error is sendable
      */
     private static void error(final ErrorLevel level,