small reorganization fix .. wrong files was moved.

L2_GameServer/java/net/sf/l2j/gameserver/GameServer.java

@@ -47,6 +47,7 @@ import net.sf.l2j.gameserver.datatables.HennaTable;
 import net.sf.l2j.gameserver.datatables.HennaTreeTable;
 import net.sf.l2j.gameserver.datatables.HeroSkillTable;
 import net.sf.l2j.gameserver.datatables.ItemTable;
+import net.sf.l2j.gameserver.datatables.AdminCommandAccessRights;
 import net.sf.l2j.gameserver.datatables.LevelUpData;
 import net.sf.l2j.gameserver.datatables.MapRegionTable;
 import net.sf.l2j.gameserver.datatables.MerchantPriceConfigTable;
@@ -93,7 +94,6 @@ import net.sf.l2j.gameserver.instancemanager.TransformationManager;
 import net.sf.l2j.gameserver.instancemanager.ZoneManager;
 import net.sf.l2j.gameserver.model.AutoChatHandler;
 import net.sf.l2j.gameserver.model.AutoSpawnHandler;
-import net.sf.l2j.gameserver.model.L2AdminCommandAccessRights;
 import net.sf.l2j.gameserver.model.L2Manor;
 import net.sf.l2j.gameserver.model.L2PetDataTable;
 import net.sf.l2j.gameserver.model.L2World;
@@ -384,7 +384,7 @@ public class GameServer
 		VoicedCommandHandler.getInstance();
 
 		AccessLevels.getInstance();
-		L2AdminCommandAccessRights.getInstance();
+		AdminCommandAccessRights.getInstance();
 		
 		if(Config.L2JMOD_ALLOW_WEDDING)
 			CoupleManager.getInstance();

L2_GameServer/java/net/sf/l2j/gameserver/model/L2AdminCommandAccessRights.java → L2_GameServer/java/net/sf/l2j/gameserver/datatables/AdminCommandAccessRights.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.l2j.gameserver.model;
+package net.sf.l2j.gameserver.datatables;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -22,26 +22,26 @@ import java.util.logging.Logger;
 
 import javolution.util.FastMap;
 import net.sf.l2j.L2DatabaseFactory;
-import net.sf.l2j.gameserver.datatables.AccessLevels;
-import net.sf.l2j.gameserver.datatables.AdminCommandAccessRight;
+import net.sf.l2j.gameserver.model.L2AdminCommandAccessRight;
+import net.sf.l2j.gameserver.model.L2AccessLevel;
 
 /**
  * @author FBIagent<br>
  */
-public class L2AdminCommandAccessRights
+public class AdminCommandAccessRights
 {
 	/** The logger<br> */
-	private static Logger _log = Logger.getLogger(L2AdminCommandAccessRights.class.getName());
+	private static Logger _log = Logger.getLogger(AdminCommandAccessRights.class.getName());
 	/** The one and only instance of this class, retriveable by getInstance()<br> */
-	private static L2AdminCommandAccessRights _instance = null;
+	private static AdminCommandAccessRights _instance = null;
 
 	/** The access rights<br> */
-	private Map< String, AdminCommandAccessRight > _adminCommandAccessRights = new FastMap< String, AdminCommandAccessRight >();
+	private Map< String, L2AdminCommandAccessRight > _adminCommandAccessRights = new FastMap< String, L2AdminCommandAccessRight >();
 
 	/**
 	 * Loads admin command access rights from database<br>
 	 */
-	private L2AdminCommandAccessRights()
+	private AdminCommandAccessRights()
 	{
 		java.sql.Connection con = null;
 		
@@ -58,7 +58,7 @@ public class L2AdminCommandAccessRights
 			{
 				adminCommand = rset.getString("adminCommand");
 				accessLevels = rset.getString("accessLevels");
-				_adminCommandAccessRights.put(adminCommand, new AdminCommandAccessRight(adminCommand, accessLevels));
+				_adminCommandAccessRights.put(adminCommand, new L2AdminCommandAccessRight(adminCommand, accessLevels));
 			}
 			rset.close();
 			stmt.close();
@@ -86,9 +86,9 @@ public class L2AdminCommandAccessRights
 	 * 
 	 * @return AdminCommandAccessRights: the one and only instance of this class<br>
 	 */
-	public static L2AdminCommandAccessRights getInstance()
+	public static AdminCommandAccessRights getInstance()
 	{
-		return _instance == null ? (_instance = new L2AdminCommandAccessRights()) : _instance;
+		return _instance == null ? (_instance = new AdminCommandAccessRights()) : _instance;
 	}
 
 	public boolean hasAccess(String adminCommand, L2AccessLevel accessLevel)
@@ -99,7 +99,7 @@ public class L2AdminCommandAccessRights
 		if (accessLevel.getLevel() == AccessLevels._masterAccessLevelNum)
 			return true;
 		
-		AdminCommandAccessRight acar = _adminCommandAccessRights.get(adminCommand);
+		L2AdminCommandAccessRight acar = _adminCommandAccessRights.get(adminCommand);
 		
 		if (acar == null)
 		{

L2_GameServer/java/net/sf/l2j/gameserver/datatables/AdminCommandAccessRight.java → L2_GameServer/java/net/sf/l2j/gameserver/model/L2AdminCommandAccessRight.java

@@ -12,14 +12,14 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.l2j.gameserver.datatables;
+package net.sf.l2j.gameserver.model;
 
-import net.sf.l2j.gameserver.model.L2AccessLevel;
+import net.sf.l2j.gameserver.datatables.AccessLevels;
 
 /**
  * @author FBIagent<br>
  */
-public class AdminCommandAccessRight
+public class L2AdminCommandAccessRight
 {
 	/** The admin command<br> */
 	private String _adminCommand = null;
@@ -32,7 +32,7 @@ public class AdminCommandAccessRight
 	 * @param adminCommand as String
 	 * @param accessLevels as String
 	 */
-	public AdminCommandAccessRight(String adminCommand, String accessLevels)
+	public L2AdminCommandAccessRight(String adminCommand, String accessLevels)
 	{
 		_adminCommand = adminCommand;
 		

L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/EnterWorld.java

@@ -29,6 +29,7 @@ import net.sf.l2j.gameserver.SevenSigns;
 import net.sf.l2j.gameserver.TaskPriority;
 import net.sf.l2j.gameserver.cache.HtmCache;
 import net.sf.l2j.gameserver.communitybbs.Manager.RegionBBSManager;
+import net.sf.l2j.gameserver.datatables.AdminCommandAccessRights;
 import net.sf.l2j.gameserver.datatables.MapRegionTable;
 import net.sf.l2j.gameserver.instancemanager.ClanHallManager;
 import net.sf.l2j.gameserver.instancemanager.CoupleManager;
@@ -38,7 +39,6 @@ import net.sf.l2j.gameserver.instancemanager.PetitionManager;
 import net.sf.l2j.gameserver.instancemanager.RaidBossPointsManager;
 import net.sf.l2j.gameserver.instancemanager.SiegeManager;
 import net.sf.l2j.gameserver.instancemanager.TransformationManager;
-import net.sf.l2j.gameserver.model.L2AdminCommandAccessRights;
 import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.model.L2Clan;
 import net.sf.l2j.gameserver.model.L2Effect;
@@ -118,22 +118,22 @@ public class EnterWorld extends L2GameClientPacket
         
         if (activeChar.isGM())
         {
-            if (Config.GM_STARTUP_INVULNERABLE && L2AdminCommandAccessRights.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+            if (Config.GM_STARTUP_INVULNERABLE && AdminCommandAccessRights.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
                  activeChar.setIsInvul(true);
 
-            if (Config.GM_STARTUP_INVISIBLE && L2AdminCommandAccessRights.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+            if (Config.GM_STARTUP_INVISIBLE && AdminCommandAccessRights.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
                  activeChar.getAppearance().setInvisible();
  
-            if (Config.GM_STARTUP_SILENCE && L2AdminCommandAccessRights.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+            if (Config.GM_STARTUP_SILENCE && AdminCommandAccessRights.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
                  activeChar.setMessageRefusal(true);            
             
-            if (Config.GM_STARTUP_DIET_MODE && L2AdminCommandAccessRights.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
+            if (Config.GM_STARTUP_DIET_MODE && AdminCommandAccessRights.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
             {
             	activeChar.setDietMode(true);
             	activeChar.refreshOverloaded();
             }
  
-            if (Config.GM_STARTUP_AUTO_LIST && L2AdminCommandAccessRights.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+            if (Config.GM_STARTUP_AUTO_LIST && AdminCommandAccessRights.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
                  GmListTable.getInstance().addGm(activeChar, false);
              else
                  GmListTable.getInstance().addGm(activeChar, true);

L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestBypassToServer.java

@@ -21,10 +21,10 @@ import java.util.logging.Logger;
 import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.ai.CtrlIntention;
 import net.sf.l2j.gameserver.communitybbs.CommunityBoard;
+import net.sf.l2j.gameserver.datatables.AdminCommandAccessRights;
 import net.sf.l2j.gameserver.handler.AdminCommandHandler;
 import net.sf.l2j.gameserver.handler.IAdminCommandHandler;
 import net.sf.l2j.gameserver.model.GMAudit;
-import net.sf.l2j.gameserver.model.L2AdminCommandAccessRights;
 import net.sf.l2j.gameserver.model.L2CharPosition;
 import net.sf.l2j.gameserver.model.L2Object;
 import net.sf.l2j.gameserver.model.L2World;
@@ -80,7 +80,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
 					return;
 				}
 
-				if (!L2AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
+				if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
 				{
 					activeChar.sendMessage("You don't have the access right to use this command!");
 					_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");

L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/SendBypassBuildCmd.java

@@ -16,9 +16,9 @@ package net.sf.l2j.gameserver.network.clientpackets;
 
 import java.util.logging.Logger;
 
+import net.sf.l2j.gameserver.datatables.AdminCommandAccessRights;
 import net.sf.l2j.gameserver.handler.AdminCommandHandler;
 import net.sf.l2j.gameserver.handler.IAdminCommandHandler;
-import net.sf.l2j.gameserver.model.L2AdminCommandAccessRights;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 
 /**
@@ -63,7 +63,7 @@ public final class SendBypassBuildCmd extends L2GameClientPacket
 			return;
 		}
 
-		if (!L2AdminCommandAccessRights.getInstance().hasAccess(command , activeChar.getAccessLevel()))
+		if (!AdminCommandAccessRights.getInstance().hasAccess(command , activeChar.getAccessLevel()))
 		{
 			activeChar.sendMessage("You don't have the access right to use this command!");
 			_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");