Fixed imports and autoformatted trunk/*.java and trunk/commandparser/*.java

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

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

@@ -54,7 +54,6 @@ import uk.org.ownage.dmdirc.ui.ChannelFrame;
 import uk.org.ownage.dmdirc.ui.MainFrame;
 import uk.org.ownage.dmdirc.ui.input.TabCompleter;
 import uk.org.ownage.dmdirc.ui.messages.ColourManager;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
 import uk.org.ownage.dmdirc.ui.messages.Styliser;
 
 /**
@@ -347,7 +346,7 @@ public class Channel implements IChannelMessage, IChannelGotNames, IChannelTopic
     public void onChannelTopic(final IRCParser tParser, final ChannelInfo cChannel,
             final boolean bIsJoinTopic) {
         if (bIsJoinTopic) {
-            frame.addLine("channelJoinTopic", cChannel.getTopic(), 
+            frame.addLine("channelJoinTopic", cChannel.getTopic(),
                     cChannel.getTopicUser(), 1000*cChannel.getTopicTime(), cChannel);
         } else {
             ChannelClientInfo user = cChannel.getUser(cChannel.getTopicUser());
@@ -389,7 +388,7 @@ public class Channel implements IChannelMessage, IChannelGotNames, IChannelTopic
      */
     public void onChannelPart(final IRCParser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sReason) {
-        ClientInfo client = cChannelClient.getClient(); 
+        ClientInfo client = cChannelClient.getClient();
         String nick = cChannelClient.getNickname();
         String ident = client.getIdent();
         String host = client.getHost();
@@ -436,7 +435,7 @@ public class Channel implements IChannelMessage, IChannelGotNames, IChannelTopic
         String victimhost = cKickedClient.getClient().getHost();
         
         if (sReason.equals("")) {
-            frame.addLine("channelKick", kickermodes, kicker[0], kicker[1], kicker[2], victimmodes, 
+            frame.addLine("channelKick", kickermodes, kicker[0], kicker[1], kicker[2], victimmodes,
                     victim, victimident, victimhost, cChannel.getName());
         } else {
             frame.addLine("channelKickReason", kickermodes, kicker[0], kicker[1], kicker[2], victimmodes,

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

@@ -31,7 +31,6 @@ import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.QueryCommandParser;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
 import uk.org.ownage.dmdirc.parser.ClientInfo;
 import uk.org.ownage.dmdirc.parser.IRCParser;
 import uk.org.ownage.dmdirc.ui.MainFrame;
@@ -42,7 +41,6 @@ import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INickChanged;
 import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateAction;
 import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
 import uk.org.ownage.dmdirc.ui.QueryFrame;
-import uk.org.ownage.dmdirc.ui.ServerFrame;
 import uk.org.ownage.dmdirc.ui.input.TabCompleter;
 import uk.org.ownage.dmdirc.ui.messages.ColourManager;
 
@@ -87,7 +85,7 @@ public class Query implements IPrivateAction, IPrivateMessage, INickChanged,
         ClassLoader cldr = this.getClass().getClassLoader();
         URL imageURL = cldr.getResource("uk/org/ownage/dmdirc/res/query.png");
         imageIcon = new ImageIcon(imageURL);
-               
+        
         frame = new QueryFrame(new QueryCommandParser(this.server, this));
         MainFrame.getMainFrame().addChild(frame);
         frame.addInternalFrameListener(this);
@@ -95,7 +93,7 @@ public class Query implements IPrivateAction, IPrivateMessage, INickChanged,
         frame.open();
         
         TabCompleter tabCompleter = new TabCompleter(server.getTabCompleter());
-        tabCompleter.addEntries(CommandManager.getQueryCommandNames());        
+        tabCompleter.addEntries(CommandManager.getQueryCommandNames());
         frame.setTabCompleter(tabCompleter);
         
         try {
@@ -317,7 +315,7 @@ public class Query implements IPrivateAction, IPrivateMessage, INickChanged,
      */
     public void addLine(final String messageType, final Object... args) {
         frame.addLine(messageType, args);
-    }        
+    }
     
     /**
      * Retrieves the icon used by the query frame

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

@@ -64,7 +64,7 @@ public class ChannelCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param command The command to be executed
      * @param args The arguments to the command
-     */    
+     */
     protected void executeCommand(CommandWindow origin, Command command, String... args) {
         if (command instanceof ChannelCommand) {
             ((ChannelCommand) command).execute(origin, server, channel, args);
@@ -80,7 +80,7 @@ public class ChannelCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param command The command the user tried to execute
      * @param args The arguments passed to the command
-     */    
+     */
     protected void handleInvalidCommand(CommandWindow origin, String command, String... args) {
         origin.addLine("Unknown command: "+command+"/"+args.length);
     }
@@ -90,7 +90,7 @@ public class ChannelCommandParser extends CommandParser {
      * means it is sent to the server/channel/user as-is, with no further processing.
      * @param origin The window in which the command was typed
      * @param line The line input by the user
-     */    
+     */
     protected void handleNonCommand(CommandWindow origin, String line) {
         channel.sendLine(line);
     }

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

@@ -22,8 +22,6 @@
 
 package uk.org.ownage.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Server;
-
 /**
  * Represents a generic command
  * @author chris

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

@@ -104,7 +104,7 @@ abstract public class CommandParser {
      * @param line The line to be parsed
      * @param usedCtrl Whether the user used the control key or not
      */
-    public void parseCommand(CommandWindow origin, String line, boolean usedCtrl) {    
+    public void parseCommand(CommandWindow origin, String line, boolean usedCtrl) {
         if (usedCtrl) {
             handleNonCommand(origin, line);
         } else {
@@ -129,7 +129,7 @@ abstract public class CommandParser {
      * @param args The arguments passed to the command
      */
     abstract protected void handleInvalidCommand(CommandWindow origin, String command, String... args);
-
+    
     /**
      * Called when the input was a line of text that was not a command. This normally
      * means it is sent to the server/channel/user as-is, with no further processing.

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

@@ -42,6 +42,6 @@ public interface CommandWindow {
      * @param messageType The type of this message
      * @param args The arguments for the message
      */
-    public void addLine(String messageType, Object... args);    
+    public void addLine(String messageType, Object... args);
     
 }

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

@@ -64,7 +64,7 @@ public class QueryCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param command The command to be executed
      * @param args The arguments to the command
-     */    
+     */
     protected void executeCommand(CommandWindow origin, Command command, String... args) {
         if (command instanceof QueryCommand) {
             ((QueryCommand) command).execute(origin, server, query, args);
@@ -80,7 +80,7 @@ public class QueryCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param command The command the user tried to execute
      * @param args The arguments passed to the command
-     */    
+     */
     protected void handleInvalidCommand(CommandWindow origin, String command, String... args) {
         origin.addLine("Unknown command: "+command+"/"+args.length);
     }
@@ -90,7 +90,7 @@ public class QueryCommandParser extends CommandParser {
      * means it is sent to the server/channel/user as-is, with no further processing.
      * @param origin The window in which the command was typed
      * @param line The line input by the user
-     */    
+     */
     protected void handleNonCommand(CommandWindow origin, String line) {
         query.sendLine(line);
     }

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

@@ -22,16 +22,15 @@
 
 package uk.org.ownage.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 
 /**
- * Represents a generic server command. Server commands are associated with 
+ * Represents a generic server command. Server commands are associated with
  * a server instance.
  * @author chris
  */
 public abstract class ServerCommand extends Command {
-       
+    
     /** Creates a new instance of ChannelCommand */
     public ServerCommand() {
         super();
@@ -42,6 +41,6 @@ public abstract class ServerCommand extends Command {
      * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param args Arguments passed to this command
-     */    
+     */
     public abstract void execute(CommandWindow origin, Server server, String... args);
 }