Use proper import ordering.

src/main/java/com/dmdirc/Query.java

@@ -45,12 +45,13 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import net.engio.mbassy.listener.Handler;
 
-import java.awt.*;
+import java.awt.Toolkit;
 import java.util.Arrays;
 import java.util.Optional;
 
+import net.engio.mbassy.listener.Handler;
+
 /**
  * The Query class represents the client's view of a query with another user. It handles callbacks
  * for query events from the parser, maintains the corresponding QueryWindow, and handles user input

src/main/java/com/dmdirc/ServerEventHandler.java

@@ -86,15 +86,18 @@ import com.dmdirc.parser.events.WallDesyncEvent;
 import com.dmdirc.parser.events.WallopEvent;
 import com.dmdirc.parser.events.WalluserEvent;
 import com.dmdirc.ui.StatusMessage;
-import net.engio.mbassy.listener.Handler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
 
+import javax.annotation.Nonnull;
+
+import net.engio.mbassy.listener.Handler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import static com.dmdirc.util.LogUtils.APP_ERROR;
 import static com.dmdirc.util.LogUtils.USER_ERROR;
 

src/main/java/com/dmdirc/interfaces/Connection.java

@@ -30,11 +30,12 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.interfaces.Parser;
 
-import javax.annotation.Nonnull;
 import java.net.URI;
 import java.util.Collection;
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents an abstract connection to a remote chat system.
  */