Style fixes

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

src/uk/org/ownage/dmdirc/Raw.java

@@ -36,7 +36,6 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommandParser;
 import uk.org.ownage.dmdirc.logger.ErrorLevel;
 import uk.org.ownage.dmdirc.logger.Logger;
 import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackNotFound;
 import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDataIn;
 import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDataOut;
 import uk.org.ownage.dmdirc.ui.MainFrame;

src/uk/org/ownage/dmdirc/commandparser/QueryCommandParser.java

@@ -30,7 +30,7 @@ import uk.org.ownage.dmdirc.Server;
  * both query and server commands.
  * @author chris
  */
-public class QueryCommandParser extends CommandParser {
+public final class QueryCommandParser extends CommandParser {
     
     /**
      * The server instance that this parser is attached to.

src/uk/org/ownage/dmdirc/commandparser/ServerCommandParser.java

@@ -28,7 +28,7 @@ import uk.org.ownage.dmdirc.Server;
  * A command parser used in the context of a server.
  * @author chris
  */
-public class ServerCommandParser extends CommandParser {
+public final class ServerCommandParser extends CommandParser {
     
     /**
      * The server instance that this parser is attached to.

src/uk/org/ownage/dmdirc/commandparser/commands/Test.java

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
  * the IRC parser.
  * @author chris
  */
-public class Test extends ServerCommand {
+public final class Test extends ServerCommand {
     
     /** Creates a new instance of Test. */
     public Test() {

src/uk/org/ownage/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -32,7 +32,7 @@ import uk.org.ownage.dmdirc.ui.ChannelSettingsDialog;
  * Opens the channel settings window for the channel.
  * @author chris
  */
-public class ChannelSettings extends ChannelCommand {
+public final class ChannelSettings extends ChannelCommand {
     
     /** Creates a new instance of ChannelSettings. */
     public ChannelSettings() {

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Cycle.java

@@ -32,7 +32,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  * The cycle command allows users to rapidly part and rejoin a channel.
  * @author chris
  */
-public class Cycle extends ChannelCommand {
+public final class Cycle extends ChannelCommand {
     
     /** Creates a new instance of Cycle. */
     public Cycle() {

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Me.java

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  * The me command sends a CTCP action to the current channel.
  * @author chris
  */
-public class Me extends ChannelCommand {
+public final class Me extends ChannelCommand {
     
     /** Creates a new instance of Me. */
     public Me() {

src/uk/org/ownage/dmdirc/commandparser/commands/channel/MeEmpty.java

@@ -33,7 +33,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  * they pass an action to perform.
  * @author chris
  */
-public class MeEmpty extends ChannelCommand {
+public final class MeEmpty extends ChannelCommand {
     
     /** Creates a new instance of MeEmpty. */
     public MeEmpty() {

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Part.java

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  * The part command parts the current channel with a specified part message.
  * @author chris
  */
-public class Part extends ChannelCommand {
+public final class Part extends ChannelCommand {
     
     /** Creates a new instance of Part. */
     public Part() {

src/uk/org/ownage/dmdirc/commandparser/commands/channel/PartDefault.java

@@ -35,7 +35,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  * and calls the main Part command.
  * @author chris
  */
-public class PartDefault extends ChannelCommand {
+public final class PartDefault extends ChannelCommand {
     
     /** Creates a new instance of PartDefault. */
     public PartDefault() {

src/uk/org/ownage/dmdirc/commandparser/commands/query/QueryMe.java

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.commandparser.QueryCommand;
  * Represents the /me command used in a query window.
  * @author chris
  */
-public class QueryMe extends QueryCommand {
+public final class QueryMe extends QueryCommand {
     
     /** Creates a new instance of QueryMe. */
     public QueryMe() {

src/uk/org/ownage/dmdirc/commandparser/commands/query/QueryMeEmpty.java

@@ -33,7 +33,7 @@ import uk.org.ownage.dmdirc.commandparser.QueryCommand;
  * Informs the user of the correct usage
  * @author chris
  */
-public class QueryMeEmpty extends QueryCommand {
+public final class QueryMeEmpty extends QueryCommand {
     
     /** Creates a new instance of QueryMeEmpty. */
     public QueryMeEmpty() {

src/uk/org/ownage/dmdirc/commandparser/commands/server/Help.java

@@ -36,7 +36,7 @@ import uk.org.ownage.dmdirc.ui.QueryFrame;
  * are only displayed when in a channel window, for example.
  * @author chris
  */
-public class Help extends ServerCommand {
+public final class Help extends ServerCommand {
     
     /**
      * Creates a new instance of Help.

src/uk/org/ownage/dmdirc/commandparser/commands/server/Join.java

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
  * of channels.
  * @author chris
  */
-public class Join extends ServerCommand {
+public final class Join extends ServerCommand {
     
     /**
      * Creates a new instance of Join.

src/uk/org/ownage/dmdirc/commandparser/commands/server/LoadFormatter.java

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.ui.messages.Formatter;
  * Allows the user to load a message formatter from a file.
  * @author chris
  */
-public class LoadFormatter extends ServerCommand {
+public final class LoadFormatter extends ServerCommand {
     
     /**
      * Creates a new instance of LoadFormatter.

src/uk/org/ownage/dmdirc/commandparser/commands/server/Nick.java

@@ -30,7 +30,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
  * Allows the user to change nickname.
  * @author chris
  */
-public class Nick extends ServerCommand {
+public final class Nick extends ServerCommand {
     
     /**
      * Creates a new instance of Join.

src/uk/org/ownage/dmdirc/commandparser/commands/server/Quit.java

@@ -34,7 +34,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
  * supplied) and saves the config file.
  * @author chris
  */
-public class Quit extends ServerCommand {
+public final class Quit extends ServerCommand {
     
     /**
      * Creates a new instance of Quit.

src/uk/org/ownage/dmdirc/commandparser/commands/server/QuitDefault.java

@@ -34,7 +34,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
  * with it as an argument.
  * @author chris
  */
-public class QuitDefault extends ServerCommand {
+public final class QuitDefault extends ServerCommand {
     
     /**
      * Creates a new instance of QuitDefault.

src/uk/org/ownage/dmdirc/commandparser/commands/server/Raw.java

@@ -32,7 +32,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
  * supplied) and saves the config file.
  * @author chris
  */
-public class Raw extends ServerCommand {
+public final class Raw extends ServerCommand {
     
     /**
      * Creates a new instance of Quit.

src/uk/org/ownage/dmdirc/commandparser/commands/server/ReloadFormatter.java

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.ui.messages.Formatter;
  * Allows the user to reload the message formatter.
  * @author chris
  */
-public class ReloadFormatter extends ServerCommand {
+public final class ReloadFormatter extends ServerCommand {
     
     /**
      * Creates a new instance of ReloadFormatter.

src/uk/org/ownage/dmdirc/commandparser/commands/server/SaveFormatter.java

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.ui.messages.Formatter;
  * Allows the user to save the message formatter to a file.
  * @author chris
  */
-public class SaveFormatter extends ServerCommand {
+public final class SaveFormatter extends ServerCommand {
     
     /**
      * Creates a new instance of SaveFormatter.

src/uk/org/ownage/dmdirc/ui/PreferencesDialog.java

@@ -26,7 +26,6 @@ import java.awt.Frame;
 
 /**
  * Allows the user to modify global client preferences.
- * @author chris
  */
 public class PreferencesDialog extends StandardDialog {
     

src/uk/org/ownage/dmdirc/ui/framemanager/tree/TreeViewModel.java

@@ -22,7 +22,6 @@
 
 package uk.org.ownage.dmdirc.ui.framemanager.tree;
 
-import java.util.Enumeration;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -71,7 +70,8 @@ public class TreeViewModel extends DefaultTreeModel {
      * @param newChild child to be added.
      * @param parent parent child is to be added too.
      */
-    public final void insertNodeInto(final DefaultMutableTreeNode newChild, final DefaultMutableTreeNode parent) {
+    public final void insertNodeInto(final DefaultMutableTreeNode newChild,
+            final DefaultMutableTreeNode parent) {
         int index = 0;
         index = getIndex(newChild, parent);
         super.insertNodeInto(newChild, parent, index);
@@ -85,18 +85,23 @@ public class TreeViewModel extends DefaultTreeModel {
      * @param parent node the new node will be inserted into.
      * @return index where new node is to be inserted.
      */
-    private int getIndex(final DefaultMutableTreeNode newChild, final DefaultMutableTreeNode parent) {      
+    private int getIndex(final DefaultMutableTreeNode newChild,
+            final DefaultMutableTreeNode parent) {
         
-        if (parent.equals(root) && !Boolean.parseBoolean(Config.getOption("ui", "sortservers"))) {
+        if (parent.equals(root) 
+        && !Boolean.parseBoolean(Config.getOption("ui", "sortservers"))) {
             return parent.getChildCount();
         }
-                
+        
         for (int i = 0; i < parent.getChildCount(); i++) {
-            DefaultMutableTreeNode child = (DefaultMutableTreeNode) parent.getChildAt(i);
+            final DefaultMutableTreeNode child = 
+                    (DefaultMutableTreeNode) parent.getChildAt(i);
             if (sortBefore(newChild, child)) {
                 return i;
-            } else if (!sortAfter(newChild, child) && Boolean.parseBoolean(Config.getOption("ui", "sortwindows"))) {
-                if (newChild.getUserObject().toString().compareToIgnoreCase(child.getUserObject().toString()) < 0) {
+            } else if (!sortAfter(newChild, child)
+            && Boolean.parseBoolean(Config.getOption("ui", "sortwindows"))) {
+                if (newChild.getUserObject().toString()
+                .compareToIgnoreCase(child.getUserObject().toString()) < 0) {
                     return i;
                 }
             }
@@ -115,7 +120,8 @@ public class TreeViewModel extends DefaultTreeModel {
     private boolean sortBefore(final DefaultMutableTreeNode newChild,
             final DefaultMutableTreeNode child) {
         
-        return getPosition(newChild.getUserObject()) < getPosition(child.getUserObject());
+        return getPosition(newChild.getUserObject()) 
+        < getPosition(child.getUserObject());
     }
     
     /**
@@ -128,8 +134,9 @@ public class TreeViewModel extends DefaultTreeModel {
     private boolean sortAfter(final DefaultMutableTreeNode newChild,
             final DefaultMutableTreeNode child) {
         
-        return getPosition(newChild.getUserObject()) > getPosition(child.getUserObject());
-    }    
+        return getPosition(newChild.getUserObject()) 
+        > getPosition(child.getUserObject());
+    }
     
     /**
      * Returns an integer corresponding to the expected order of an object.