Import order fixes

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

src/com/dmdirc/addons/dcc/ChatContainer.java

 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.interfaces.InputWindow;
+
 import java.util.Arrays;
 
 /**

src/com/dmdirc/addons/debug/commands/Identities.java

 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
+
 import java.util.List;
 
 /**

src/com/dmdirc/addons/debug/commands/Threads.java

 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.messages.Styliser;
+
 import java.util.Map.Entry;
 
 /**

src/com/dmdirc/addons/exec/ExecCommand.java

 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.util.StreamReader;
 import com.dmdirc.util.CommandUtils;
+import com.dmdirc.util.StreamReader;
 
 import java.io.File;
 import java.io.IOException;

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.util.StreamReader;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.StreamReader;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.IOException;

src/com/dmdirc/addons/identd/IdentdPlugin.java

 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.util.validators.PortValidator;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.util.validators.PortValidator;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java

 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.swing.JPanel;
 
 /**
  * Shows a ping history graph for the current server.
- *
- * @author chris
  */
 public class PingHistoryPanel extends JPanel {
 

src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
-import com.dmdirc.plugins.NoSuchProviderException;
 import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.NoSuchProviderException;
 import com.dmdirc.plugins.PluginManager;
 
 import java.util.ArrayList;

src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java

 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
-import com.dmdirc.util.StreamReader;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.util.StreamReader;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.IOException;

src/com/dmdirc/addons/nickcolours/ColourRenderer.java

 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
-
 import java.awt.Component;
+
 import javax.swing.JTable;
 import javax.swing.border.LineBorder;
 import javax.swing.table.DefaultTableCellRenderer;
 
 /**
  * Provides a colour renderer for JTables.
- *
- * @author Chris
  */
 public class ColourRenderer extends DefaultTableCellRenderer {
 

src/com/dmdirc/addons/osd/OsdManager.java

 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.util.ReturnableThread;
+
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 /**
  * Class to manage OSD Windows.
  *
- * @author Simon
  * @since 0.6.3
  */
 public class OsdManager {

src/com/dmdirc/addons/osd/OsdPlugin.java

 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.SettingChangeListener;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
-import com.dmdirc.plugins.BasePlugin;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/dmdirc/addons/parser_twitter/TwitterChannelInfo.java

 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 
 /**
  * ChannelInfo class for the Twitter plugin.
- *
- * @author shane
  */
 public class TwitterChannelInfo implements ChannelInfo {
 

src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
-import java.util.Collections;
 
+import java.util.Collections;
 import java.util.Date;
 
 /**

src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java

 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
-import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.util.StreamUtil;
+import com.dmdirc.util.validators.ValidationResponse;
 
 import java.io.File;
 import java.io.FileInputStream;

src/com/dmdirc/addons/serverlists/ServerList.java

 package com.dmdirc.addons.serverlists;
 
 import com.dmdirc.Precondition;
-import com.dmdirc.config.Identity;
-import com.dmdirc.config.IdentityListener;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.serverlists.io.ServerGroupReader;
 import com.dmdirc.addons.serverlists.io.ServerGroupWriter;
 import com.dmdirc.addons.serverlists.service.ServerListServiceProvider;
+import com.dmdirc.config.Identity;
+import com.dmdirc.config.IdentityListener;
+import com.dmdirc.config.IdentityManager;
 
 import java.io.IOException;
 import java.util.Collection;
  * writing of the lists to disk.
  *
  * @since 0.6.4
- * @author chris
  */
 public class ServerList implements IdentityListener {
 

src/com/dmdirc/addons/serverlists/io/ServerEntryReader.java

 
 package com.dmdirc.addons.serverlists.io;
 
-import com.dmdirc.config.Identity;
 import com.dmdirc.addons.serverlists.ServerEntry;
 import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.config.Identity;
 
 import java.net.URI;
 import java.net.URISyntaxException;
  * Facilitates loading of a {@link ServerEntry} from a DMDirc {@link Identity}.
  *
  * @since 0.6.4
- * @author chris
  */
 public class ServerEntryReader {
 

src/com/dmdirc/addons/serverlists/io/ServerGroupReader.java

 
 package com.dmdirc.addons.serverlists.io;
 
-import com.dmdirc.config.Identity;
 import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.config.Identity;
 
 import java.net.URI;
 import java.net.URISyntaxException;
  * Facilitates loading of a {@link ServerGroup} from a DMDirc {@link Identity}.
  *
  * @since 0.6.4
- * @author chris
  */
 public class ServerGroupReader {
 

src/com/dmdirc/addons/serverlists/io/ServerGroupWriter.java

 
 package com.dmdirc.addons.serverlists.io;
 
-import com.dmdirc.config.Identity;
 import com.dmdirc.addons.serverlists.ServerEntry;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.config.Identity;
 
 import java.net.URI;
 import java.util.ArrayList;
  * Provides methods to instantiate a writer for a server group or entry.
  *
  * @since 0.6.4
- * @author chris
  */
 public class ServerGroupWriter {
 

src/com/dmdirc/addons/serverlists/service/ServerListServiceProvider.java

 package com.dmdirc.addons.serverlists.service;
 
 import com.dmdirc.ParserFactory;
+import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerList;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.ExportedService;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.serverlists.ServerList;
 
 import java.net.URI;
 import java.util.Arrays;
  * Provides a fake parser service which handles <code>serverlist://</code> URIs,
  * and returns a suitable parser for the corresponding server list.
  *
- * @author chris
  * @since 0.6.4
  */
 public class ServerListServiceProvider implements ServiceProvider {

src/com/dmdirc/addons/systray/SystrayPlugin.java

 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.validators.ValidationResponse;
 
 import java.awt.AWTException;
 import java.awt.Frame;

src/com/dmdirc/addons/ui_swing/Apple.java

 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import java.awt.Toolkit;
 
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;

src/com/dmdirc/addons/ui_swing/SwingController.java

 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.util.ReturnableThread;
+import com.dmdirc.util.validators.NumericalValidator;
 
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;

src/com/dmdirc/addons/ui_swing/UIUtilities.java

 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.text.JTextComponent;
 import javax.swing.undo.UndoManager;
 

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.addons.ui_swing.components.inputfields.TextPaneInputField;
-import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.ReplacePasteAction;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
+import com.dmdirc.addons.ui_swing.components.inputfields.TextPaneInputField;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.text.WrapEditorKit;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;

src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.NickList;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
-import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.TopicBar;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.config.Identity;

src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java

 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;
-import java.awt.KeyboardFocusManager;
 
+import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;

src/com/dmdirc/addons/ui_swing/components/inputfields/TextFieldInputField.java

 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;
-import java.awt.KeyboardFocusManager;
 
+import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;

src/com/dmdirc/addons/ui_swing/components/renderers/ActionGroupListCellRenderer.java

 package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.actions.ActionGroup;
+
 import java.awt.Component;
+
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JList;
 

src/com/dmdirc/addons/ui_swing/components/renderers/MapEntryRenderer.java

 
 import java.awt.Component;
 import java.util.Map.Entry;
+
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JList;
 

src/com/dmdirc/addons/ui_swing/components/statusbar/InvitePopup.java

 import com.dmdirc.Invite;
 import com.dmdirc.Server;
 import com.dmdirc.util.DateUtils;
+
 import java.awt.Window;
+
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 

src/com/dmdirc/addons/ui_swing/components/statusbar/MessagePopup.java

 
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.StatusMessage;
-import java.awt.Color;
 
+import java.awt.Color;
 import java.awt.Point;
 import java.awt.Window;
 import java.awt.event.MouseEvent;

src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPanel.java

 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.interfaces.StatusBarComponent;
-import java.awt.Color;
 
+import java.awt.Color;
 import java.awt.event.MouseListener;
 
 import javax.swing.JComponent;

src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPopupWindow.java

 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+
 import java.awt.Component;
 import java.awt.Graphics;
-
 import java.awt.Point;
 import java.awt.Window;
 

src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterLabel.java

 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.updater.UpdateChecker;
-import com.dmdirc.updater.UpdateCheckerListener;
 import com.dmdirc.updater.UpdateChecker.STATE;
+import com.dmdirc.updater.UpdateCheckerListener;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.event.MouseEvent;

src/com/dmdirc/addons/ui_swing/components/substitutions/SubstitutionsPanel.java

 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
-
 import javax.swing.UIManager;
+
 import net.miginfocom.swing.MigLayout;
 
 /**

src/com/dmdirc/addons/ui_swing/components/text/DMDircHTMLFactory.java

 
 import javax.swing.text.Element;
 import javax.swing.text.View;
-import javax.swing.text.html.ImageView;
 import javax.swing.text.html.HTMLEditorKit.HTMLFactory;
+import javax.swing.text.html.ImageView;
 
 /**
  * DMDircHTML factory extends HTMLFactory to use DMDircImageView.

src/com/dmdirc/addons/ui_swing/components/validating/ValidatingJTextField.java

 package com.dmdirc.addons.ui_swing.components.validating;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.Color;
 import java.awt.Font;

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.util.validators.PortValidator;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.util.validators.PortValidator;
 import com.dmdirc.util.validators.ServerNameValidator;
 
 import java.awt.Insets;

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutPanel.java

 
 import javax.swing.JPanel;
 import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
 import javax.swing.event.HyperlinkEvent.EventType;
+import javax.swing.event.HyperlinkListener;
 
 import net.miginfocom.swing.MigLayout;