BETA/STABLE: Organizing Imports.

L2J_Server_BETA/.classpath

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/.svn/*|.svn" kind="src" path="java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/c3p0-0.9.2-pre1.jar"/>
-	<classpathentry kind="lib" path="lib/javolution-5.5.1.jar"/>
-	<classpathentry kind="lib" path="lib/jna.jar"/>
-	<classpathentry kind="lib" path="lib/jython.jar"/>
-	<classpathentry kind="lib" path="lib/jython-engine-2.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/mail.jar"/>
-	<classpathentry kind="lib" path="lib/mailapi.jar"/>
-	<classpathentry kind="lib" path="lib/mchange-commons-0.2.jar"/>
-	<classpathentry kind="lib" path="lib/mmocore.jar"/>
-	<classpathentry kind="lib" path="lib/netcon.jar"/>
-	<classpathentry kind="lib" path="lib/smtp.jar"/>
-	<classpathentry kind="lib" path="lib/trove-3.0.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry excluding="**/.svn/*|.svn" kind="src" path="java" />
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4" />
+	<classpathentry kind="lib" path="lib/c3p0-0.9.2-pre1.jar" />
+	<classpathentry kind="lib" path="lib/javolution-5.5.1.jar" />
+	<classpathentry kind="lib" path="lib/jna.jar" />
+	<classpathentry kind="lib" path="lib/jython.jar" />
+	<classpathentry kind="lib" path="lib/jython-engine-2.2.1.jar" />
+	<classpathentry kind="lib" path="lib/mail.jar" />
+	<classpathentry kind="lib" path="lib/mailapi.jar" />
+	<classpathentry kind="lib" path="lib/mchange-commons-0.2.jar" />
+	<classpathentry kind="lib" path="lib/mmocore.jar" />
+	<classpathentry kind="lib" path="lib/netcon.jar" />
+	<classpathentry kind="lib" path="lib/smtp.jar" />
+	<classpathentry kind="lib" path="lib/trove-3.0.0.jar" />
+	<classpathentry kind="output" path="bin" />
 </classpath>

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java

@@ -20,6 +20,8 @@ import java.sql.ResultSet;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import javolution.util.FastMap;
+
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.L2Clan;
@@ -32,8 +34,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.StatsSet;
 
-import javolution.util.FastMap;
-
 /**
  * @author BiggBoss
  */

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java

@@ -20,10 +20,10 @@ import java.sql.ResultSet;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import com.l2jserver.L2DatabaseFactory;
-
 import javolution.util.FastMap;
 
+import com.l2jserver.L2DatabaseFactory;
+
 public class GlobalVariablesManager
 {
 	private static final Logger _log = Logger.getLogger(GlobalVariablesManager.class.getName());

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java

@@ -22,6 +22,8 @@ import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import javolution.util.FastMap;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -44,8 +46,6 @@ import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
 import com.l2jserver.gameserver.model.zone.type.L2RespawnZone;
 import com.l2jserver.gameserver.util.Util;
 
-import javolution.util.FastMap;
-
 /**
  * @author Nyaran
  */

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java

@@ -14,24 +14,15 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.Announcements;
-import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.model.L2CharPosition;
-import com.l2jserver.gameserver.model.L2NpcWalkerNode;
-import com.l2jserver.gameserver.model.L2WalkRoute;
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.network.NpcStringId;
-import com.l2jserver.util.Rnd;
-
 import java.io.File;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.List;
-import java.util.Map;
+
 import javax.xml.parsers.DocumentBuilderFactory;
+
 import javolution.util.FastList;
 import javolution.util.FastMap;
 
@@ -39,6 +30,17 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
+import com.l2jserver.Config;
+import com.l2jserver.gameserver.Announcements;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.model.L2CharPosition;
+import com.l2jserver.gameserver.model.L2NpcWalkerNode;
+import com.l2jserver.gameserver.model.L2WalkRoute;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.util.Rnd;
+
 /**
  * This class manages walking monsters.
  * @author GKR

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -35,9 +35,9 @@ import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
-import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java

@@ -22,8 +22,8 @@ import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2SummonAI;
 import com.l2jserver.gameserver.datatables.PetDataTable;
-import com.l2jserver.gameserver.datatables.SummonSkillsTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SummonSkillsTable;
 import com.l2jserver.gameserver.instancemanager.AirShipManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java

@@ -17,8 +17,8 @@ package com.l2jserver.gameserver.network.clientpackets;
 import java.util.logging.Level;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.ItemHolder;
+import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java

@@ -16,9 +16,9 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.ClanWarehouse;
+import com.l2jserver.gameserver.model.ItemHolder;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ItemInstance;
-import com.l2jserver.gameserver.model.ItemHolder;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java

@@ -14,10 +14,10 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList.SkillType;
-
 import javolution.util.FastList;
 
+import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList.SkillType;
+
 /**
  * Sample:
  * <code>

L2J_Server_BETA/java/com/l2jserver/loginserver/network/L2LoginClient.java

@@ -31,8 +31,8 @@ import com.l2jserver.loginserver.LoginController;
 import com.l2jserver.loginserver.SessionKey;
 import com.l2jserver.loginserver.network.serverpackets.L2LoginServerPacket;
 import com.l2jserver.loginserver.network.serverpackets.LoginFail;
-import com.l2jserver.loginserver.network.serverpackets.PlayFail;
 import com.l2jserver.loginserver.network.serverpackets.LoginFail.LoginFailReason;
+import com.l2jserver.loginserver.network.serverpackets.PlayFail;
 import com.l2jserver.loginserver.network.serverpackets.PlayFail.PlayFailReason;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.crypt.LoginCrypt;

L2J_Server_BETA/java/com/l2jserver/loginserver/network/clientpackets/RequestServerList.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.loginserver.network.clientpackets;
 
-import com.l2jserver.loginserver.network.serverpackets.ServerList;
 import com.l2jserver.loginserver.network.serverpackets.LoginFail.LoginFailReason;
+import com.l2jserver.loginserver.network.serverpackets.ServerList;
 
 /**
  * Format: ddc

L2J_Server_BETA/java/com/l2jserver/loginserver/network/clientpackets/RequestServerLogin.java

@@ -17,9 +17,9 @@ package com.l2jserver.loginserver.network.clientpackets;
 import com.l2jserver.Config;
 import com.l2jserver.loginserver.LoginController;
 import com.l2jserver.loginserver.SessionKey;
-import com.l2jserver.loginserver.network.serverpackets.PlayOk;
 import com.l2jserver.loginserver.network.serverpackets.LoginFail.LoginFailReason;
 import com.l2jserver.loginserver.network.serverpackets.PlayFail.PlayFailReason;
+import com.l2jserver.loginserver.network.serverpackets.PlayOk;
 
 /**
  * Fromat is ddc

L2J_Server_BETA/java/com/l2jserver/tools/dbinstaller/LauncherCS.java

@@ -15,6 +15,7 @@
 package com.l2jserver.tools.dbinstaller;
 
 import java.awt.HeadlessException;
+
 import javax.swing.UIManager;
 
 import com.l2jserver.tools.dbinstaller.console.DBInstallerConsole;

L2J_Server_BETA/java/com/l2jserver/tools/dbinstaller/LauncherGS.java

@@ -15,6 +15,7 @@
 package com.l2jserver.tools.dbinstaller;
 
 import java.awt.HeadlessException;
+
 import javax.swing.UIManager;
 
 import com.l2jserver.tools.dbinstaller.console.DBInstallerConsole;

L2J_Server_BETA/java/com/l2jserver/tools/dbinstaller/LauncherLS.java

@@ -15,6 +15,7 @@
 package com.l2jserver.tools.dbinstaller;
 
 import java.awt.HeadlessException;
+
 import javax.swing.UIManager;
 
 import com.l2jserver.tools.dbinstaller.console.DBInstallerConsole;

L2J_Server_BETA/java/com/l2jserver/tools/dbinstaller/util/swing/SpringUtilities.java

@@ -31,9 +31,11 @@
 
 package com.l2jserver.tools.dbinstaller.util.swing;
 
-import javax.swing.*;
+import java.awt.Component;
+import java.awt.Container;
+
+import javax.swing.Spring;
 import javax.swing.SpringLayout;
-import java.awt.*;
 
 /**
  * A 1.4 file that provides utility methods for creating form- or grid-style layouts with SpringLayout. These utilities are used by several programs, such as SpringBox and SpringCompactGrid.