BETA: Standartizing a bit handlers method names

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ActionHandler.java

@@ -22,8 +22,7 @@ import com.l2jserver.gameserver.model.L2Object.InstanceType;
 
 public class ActionHandler
 {
-	private Map<InstanceType, IActionHandler> _actions;
-	private Map<InstanceType, IActionHandler> _actionsShift;
+	private final Map<InstanceType, IActionHandler> _actions;
 	
 	public static ActionHandler getInstance()
 	{
@@ -33,20 +32,14 @@ public class ActionHandler
 	private ActionHandler()
 	{
 		_actions = new FastMap<InstanceType, IActionHandler>();
-		_actionsShift = new FastMap<InstanceType, IActionHandler>();
 	}
 	
-	public void registerActionHandler(IActionHandler handler)
+	public void registerHandler(IActionHandler handler)
 	{
 		_actions.put(handler.getInstanceType(), handler);
 	}
 	
-	public void registerActionShiftHandler(IActionHandler handler)
-	{
-		_actionsShift.put(handler.getInstanceType(), handler);
-	}
-	
-	public IActionHandler getActionHandler(InstanceType iType)
+	public IActionHandler getHandler(InstanceType iType)
 	{
 		IActionHandler result = null;
 		for (InstanceType t = iType; t != null; t = t.getParent())
@@ -58,28 +51,11 @@ public class ActionHandler
 		return result;
 	}
 	
-	public IActionHandler getActionShiftHandler(InstanceType iType)
-	{
-		IActionHandler result = null;
-		for (InstanceType t = iType; t != null; t = t.getParent())
-		{
-			result = _actionsShift.get(t);
-			if (result != null)
-				break;
-		}
-		return result;
-	}
-	
 	public int size()
 	{
 		return _actions.size();
 	}
 	
-	public int sizeShift()
-	{
-		return _actionsShift.size();
-	}
-	
 	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ActionShiftHandler.java

@@ -0,0 +1,67 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * 
+ * 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 com.l2jserver.gameserver.handler;
+
+import java.util.Map;
+
+import javolution.util.FastMap;
+
+import com.l2jserver.gameserver.model.L2Object.InstanceType;
+/**
+ * @author UnAfraid
+ * 
+ */
+public class ActionShiftHandler
+{
+	private final Map<InstanceType, IActionHandler> _actionsShift;
+	
+	public static ActionShiftHandler getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
+	private ActionShiftHandler()
+	{
+		_actionsShift = new FastMap<InstanceType, IActionHandler>();
+	}
+	
+	public void registerHandler(IActionHandler handler)
+	{
+		_actionsShift.put(handler.getInstanceType(), handler);
+	}
+	
+	public IActionHandler getHandler(InstanceType iType)
+	{
+		IActionHandler result = null;
+		for (InstanceType t = iType; t != null; t = t.getParent())
+		{
+			result = _actionsShift.get(t);
+			if (result != null)
+				break;
+		}
+		return result;
+	}
+	
+	public int size()
+	{
+		return _actionsShift.size();
+	}
+	
+	@SuppressWarnings("synthetic-access")
+	private static class SingletonHolder
+	{
+		protected static final ActionShiftHandler _instance = new ActionShiftHandler();
+	}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java

@@ -29,7 +29,7 @@ public class AdminCommandHandler
 {
 	private static Logger _log = Logger.getLogger(AdminCommandHandler.class.getName());
 	
-	private TIntObjectHashMap<IAdminCommandHandler> _datatable;
+	private final TIntObjectHashMap<IAdminCommandHandler> _datatable;
 	
 	public static AdminCommandHandler getInstance()
 	{
@@ -41,7 +41,7 @@ public class AdminCommandHandler
 		_datatable = new TIntObjectHashMap<IAdminCommandHandler>();
 	}
 	
-	public void registerAdminCommandHandler(IAdminCommandHandler handler)
+	public void registerHandler(IAdminCommandHandler handler)
 	{
 		String[] ids = handler.getAdminCommandList();
 		for (int i = 0; i < ids.length; i++)
@@ -52,7 +52,7 @@ public class AdminCommandHandler
 		}
 	}
 	
-	public IAdminCommandHandler getAdminCommandHandler(String adminCommand)
+	public IAdminCommandHandler getHandler(String adminCommand)
 	{
 		String command = adminCommand;
 		if (adminCommand.indexOf(" ") != -1)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/BypassHandler.java

@@ -30,7 +30,7 @@ public class BypassHandler
 {
 	private static Logger _log = Logger.getLogger(BypassHandler.class.getName());
 	
-	private TIntObjectHashMap<IBypassHandler> _datatable;
+	private final TIntObjectHashMap<IBypassHandler> _datatable;
 	
 	public static BypassHandler getInstance()
 	{
@@ -42,7 +42,7 @@ public class BypassHandler
 		_datatable = new TIntObjectHashMap<IBypassHandler>();
 	}
 	
-	public void registerBypassHandler(IBypassHandler handler)
+	public void registerHandler(IBypassHandler handler)
 	{
 		for (String element : handler.getBypassList())
 		{
@@ -53,7 +53,7 @@ public class BypassHandler
 		}
 	}
 	
-	public IBypassHandler getBypassHandler(String BypassCommand)
+	public IBypassHandler getHandler(String BypassCommand)
 	{
 		String command = BypassCommand;
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ChatHandler.java

@@ -29,7 +29,7 @@ public class ChatHandler
 {
 	private static Logger _log = Logger.getLogger(ChatHandler.class.getName());
 	
-	private TIntObjectHashMap<IChatHandler> _datatable;
+	private final TIntObjectHashMap<IChatHandler> _datatable;
 	
 	public static ChatHandler getInstance()
 	{
@@ -48,7 +48,7 @@ public class ChatHandler
 	 * Register a new chat handler
 	 * @param handler
 	 */
-	public void registerChatHandler(IChatHandler handler)
+	public void registerHandler(IChatHandler handler)
 	{
 		int[] ids = handler.getChatTypeList();
 		for (int i = 0; i < ids.length; i++)
@@ -64,7 +64,7 @@ public class ChatHandler
 	 * @param chatType
 	 * @return
 	 */
-	public IChatHandler getChatHandler(int chatType)
+	public IChatHandler getHandler(int chatType)
 	{
 		return _datatable.get(chatType);
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/EffectHandler.java

@@ -15,6 +15,7 @@
 package com.l2jserver.gameserver.handler;
 
 import java.io.File;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javolution.util.FastMap;
@@ -24,31 +25,30 @@ import com.l2jserver.gameserver.scripting.L2ScriptEngineManager;
 
 /**
  * @author BiggBoss
- *
  */
 public final class EffectHandler
-{	
+{
 	private static final class SingletonHolder
 	{
 		private static final EffectHandler _instance = new EffectHandler();
 	}
-
+	
 	private static final Logger _log = Logger.getLogger(EffectHandler.class.getName());
-	private FastMap<String, Class<? extends L2Effect>> _handlers;
+	private final FastMap<Integer, Class<? extends L2Effect>> _handlers;
 	
 	private EffectHandler()
 	{
-		_handlers = new FastMap<String, Class<? extends L2Effect>>();
+		_handlers = new FastMap<Integer, Class<? extends L2Effect>>();
 	}
 	
-	public void registerHandler(String effect, Class<? extends L2Effect> func)
+	public void registerHandler(String name, Class<? extends L2Effect> func)
 	{
-		_handlers.put(effect, func);
+		_handlers.put(name.hashCode(), func);
 	}
 	
 	public final Class<? extends L2Effect> getHandler(String name)
 	{
-		return _handlers.get(name);
+		return _handlers.get(name.hashCode());
 	}
 	
 	public int size()
@@ -63,16 +63,15 @@ public final class EffectHandler
 			File file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, "handlers/EffectMasterHandler.java");
 			L2ScriptEngineManager.getInstance().executeScript(file);
 		}
-		catch(Exception e)
+		catch (Exception e)
 		{
-			_log.warning("Problems while running EffectMansterHandler");
-			e.printStackTrace();
+			_log.log(Level.WARNING, "Problems while running EffectMansterHandler", e);
 		}
-		_log.config("Loaded "+size()+" Effect handlers");
+		_log.config("Loaded " + size() + " Effect handlers");
 	}
 	
 	public static EffectHandler getInstance()
 	{
 		return SingletonHolder._instance;
 	}
-}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ItemHandler.java

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.templates.item.L2EtcItem;
  */
 public class ItemHandler
 {
-	private TIntObjectHashMap<IItemHandler> _datatable;
+	private final TIntObjectHashMap<IItemHandler> _datatable;
 	
 	/**
 	 * Create ItemHandler if doesn't exist and returns ItemHandler
@@ -60,7 +60,7 @@ public class ItemHandler
 	 * (existing in classes of package itemhandlers) sets as key of the Map.
 	 * @param handler (IItemHandler)
 	 */
-	public void registerItemHandler(IItemHandler handler)
+	public void registerHandler(IItemHandler handler)
 	{
 		_datatable.put(handler.getClass().getSimpleName().intern().hashCode(), handler);
 	}
@@ -70,7 +70,7 @@ public class ItemHandler
 	 * @param item
 	 * @return IItemHandler
 	 */
-	public IItemHandler getItemHandler(L2EtcItem item)
+	public IItemHandler getHandler(L2EtcItem item)
 	{
 		if (item == null || item.getHandlerName() == null)
 			return null;

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/SkillHandler.java

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
  */
 public class SkillHandler
 {
-	private TIntObjectHashMap<ISkillHandler> _datatable;
+	private final TIntObjectHashMap<ISkillHandler> _datatable;
 	
 	public static SkillHandler getInstance()
 	{
@@ -38,7 +38,7 @@ public class SkillHandler
 		_datatable = new TIntObjectHashMap<ISkillHandler>();
 	}
 	
-	public void registerSkillHandler(ISkillHandler handler)
+	public void registerHandler(ISkillHandler handler)
 	{
 		L2SkillType[] types = handler.getSkillIds();
 		for (L2SkillType t : types)
@@ -47,7 +47,7 @@ public class SkillHandler
 		}
 	}
 	
-	public ISkillHandler getSkillHandler(L2SkillType skillType)
+	public ISkillHandler getHandler(L2SkillType skillType)
 	{
 		return _datatable.get(skillType.ordinal());
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TargetHandler.java

@@ -37,12 +37,12 @@ public class TargetHandler
 		_datatable = new FastMap<Enum<L2TargetType>, ITargetTypeHandler>();
 	}
 	
-	public void registerTargetType(ITargetTypeHandler handler)
+	public void registerHandler(ITargetTypeHandler handler)
 	{
 		_datatable.put(handler.getTargetType(), handler);
 	}
 	
-	public ITargetTypeHandler getTargetTypeHandler(Enum<L2TargetType> targetType)
+	public ITargetTypeHandler getHandler(Enum<L2TargetType> targetType)
 	{
 		return _datatable.get(targetType);
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TelnetHandler.java

@@ -33,7 +33,7 @@ public class TelnetHandler
 		_telnetHandlers = new TIntObjectHashMap<ITelnetHandler>();
 	}
 	
-	public void registerCommandHandler(ITelnetHandler handler)
+	public void registerHandler(ITelnetHandler handler)
 	{
 		for (String element : handler.getCommandList())
 		{
@@ -41,7 +41,7 @@ public class TelnetHandler
 		}
 	}
 	
-	public ITelnetHandler getCommandHandler(String BypassCommand)
+	public ITelnetHandler getHandler(String BypassCommand)
 	{
 		String command = BypassCommand;
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/UserCommandHandler.java

@@ -29,7 +29,7 @@ public class UserCommandHandler
 {
 	private static Logger _log = Logger.getLogger(UserCommandHandler.class.getName());
 	
-	private TIntObjectHashMap<IUserCommandHandler> _datatable;
+	private final TIntObjectHashMap<IUserCommandHandler> _datatable;
 	
 	public static UserCommandHandler getInstance()
 	{
@@ -41,7 +41,7 @@ public class UserCommandHandler
 		_datatable = new TIntObjectHashMap<IUserCommandHandler>();
 	}
 	
-	public void registerUserCommandHandler(IUserCommandHandler handler)
+	public void registerHandler(IUserCommandHandler handler)
 	{
 		int[] ids = handler.getUserCommandList();
 		for (int i = 0; i < ids.length; i++)
@@ -52,7 +52,7 @@ public class UserCommandHandler
 		}
 	}
 	
-	public IUserCommandHandler getUserCommandHandler(int userCommand)
+	public IUserCommandHandler getHandler(int userCommand)
 	{
 		if (Config.DEBUG)
 			_log.fine("getting handler for user command: " + userCommand);

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/VoicedCommandHandler.java

@@ -29,7 +29,7 @@ public class VoicedCommandHandler
 {
 	private static Logger _log = Logger.getLogger(ItemHandler.class.getName());
 	
-	private TIntObjectHashMap<IVoicedCommandHandler> _datatable;
+	private final TIntObjectHashMap<IVoicedCommandHandler> _datatable;
 	
 	public static VoicedCommandHandler getInstance()
 	{
@@ -41,7 +41,7 @@ public class VoicedCommandHandler
 		_datatable = new TIntObjectHashMap<IVoicedCommandHandler>();
 	}
 	
-	public void registerVoicedCommandHandler(IVoicedCommandHandler handler)
+	public void registerHandler(IVoicedCommandHandler handler)
 	{
 		String[] ids = handler.getVoicedCommandList();
 		for (int i = 0; i < ids.length; i++)
@@ -52,7 +52,7 @@ public class VoicedCommandHandler
 		}
 	}
 	
-	public IVoicedCommandHandler getVoicedCommandHandler(String voicedCommand)
+	public IVoicedCommandHandler getHandler(String voicedCommand)
 	{
 		String command = voicedCommand;
 		if (voicedCommand.indexOf(" ") != -1)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceSkillList.java

@@ -162,7 +162,7 @@ public class ChanceSkillList extends FastMap<IChanceSkillTrigger, ChanceConditio
 				
 				L2Character firstTarget = (L2Character)targets[0];
 				
-				ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(skill.getSkillType());
+				ISkillHandler handler = SkillHandler.getInstance().getHandler(skill.getSkillType());
 				
 				_owner.broadcastPacket(new MagicSkillLaunched(_owner, skill.getDisplayId(), skill.getLevel(), targets));
 				_owner.broadcastPacket(new MagicSkillUse(_owner, firstTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
@@ -208,7 +208,7 @@ public class ChanceSkillList extends FastMap<IChanceSkillTrigger, ChanceConditio
 			
 			L2Character firstTarget = (L2Character)targets[0];
 			
-			ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(triggered.getSkillType());
+			ISkillHandler handler = SkillHandler.getInstance().getHandler(triggered.getSkillType());
 			
 			_owner.broadcastPacket(new MagicSkillLaunched(_owner, triggered.getDisplayId(), triggered.getLevel(), targets));
 			_owner.broadcastPacket(new MagicSkillUse(_owner, firstTarget, triggered.getDisplayId(), triggered.getLevel(), 0, 0));

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java

@@ -15,6 +15,7 @@
 package com.l2jserver.gameserver.model;
 
 import com.l2jserver.gameserver.handler.ActionHandler;
+import com.l2jserver.gameserver.handler.ActionShiftHandler;
 import com.l2jserver.gameserver.handler.IActionHandler;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
@@ -270,7 +271,7 @@ public abstract class L2Object
 	
 	public void onAction(L2PcInstance player, boolean interact)
 	{
-		IActionHandler handler = ActionHandler.getInstance().getActionHandler(getInstanceType());
+		IActionHandler handler = ActionHandler.getInstance().getHandler(getInstanceType());
 		if (handler != null)
 			handler.action(player, this, interact);
 		
@@ -279,7 +280,7 @@ public abstract class L2Object
 	
 	public void onActionShift(L2PcInstance player)
 	{
-		IActionHandler handler = ActionHandler.getInstance().getActionShiftHandler(getInstanceType());
+		IActionHandler handler = ActionShiftHandler.getInstance().getHandler(getInstanceType());
 		if (handler != null)
 			handler.action(player, this, true);
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Skill.java

@@ -1414,7 +1414,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	 */
 	public final L2Object[] getTargetList(L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		final ITargetTypeHandler handler = TargetHandler.getInstance().getTargetTypeHandler(getTargetType()); 
+		final ITargetTypeHandler handler = TargetHandler.getInstance().getHandler(getTargetType()); 
 		if (handler != null) 
 		{ 
 			try 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -6699,7 +6699,7 @@ public abstract class L2Character extends L2Object
 		try
 		{
 			// Get the skill handler corresponding to the skill type (PDAM, MDAM, SWEEP...) started in gameserver
-			ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(skill.getSkillType());
+			ISkillHandler handler = SkillHandler.getInstance().getHandler(skill.getSkillType());
 			L2Weapon activeWeapon = getActiveWeaponItem();
 			
 			// Check if the toggle skill effects are already in progress on the L2Character

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -942,7 +942,7 @@ public class L2Npc extends L2Character
 			}
 			else
 			{
-				IBypassHandler handler = BypassHandler.getInstance().getBypassHandler(command);
+				IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
 				if (handler != null)
 					handler.useBypass(command, player, this);
 				else

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java

@@ -82,7 +82,7 @@ public class L2CubicInstance
 	protected int _maxcount;
 	protected int _currentcount;
 	protected boolean _active;
-	private boolean _givenByOther;
+	private final boolean _givenByOther;
 	
 	protected List<L2Skill> _skills = new FastList<L2Skill>();
 	
@@ -466,7 +466,7 @@ public class L2CubicInstance
 	
 	private class Action implements Runnable
 	{
-		private int _chance;
+		private final int _chance;
 		
 		Action(int chance)
 		{
@@ -571,7 +571,7 @@ public class L2CubicInstance
 							_owner.broadcastPacket(new MagicSkillUse(_owner, target, skill.getId(), skill.getLevel(), 0, 0));
 							
 							L2SkillType type = skill.getSkillType();
-							ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(skill.getSkillType());
+							ISkillHandler handler = SkillHandler.getInstance().getHandler(skill.getSkillType());
 							L2Character[] targets = { target };
 							
 							if ((type == L2SkillType.PARALYZE) || (type == L2SkillType.STUN)
@@ -1006,7 +1006,7 @@ public class L2CubicInstance
 						if (target.getMaxHp() - target.getCurrentHp() > skill.getPower())
 						{
 							L2Character[] targets = { target };
-							ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(skill.getSkillType());
+							ISkillHandler handler = SkillHandler.getInstance().getHandler(skill.getSkillType());
 							if (handler != null)
 							{
 								handler.useSkill(_owner, skill, targets);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -3663,7 +3663,7 @@ public final class L2PcInstance extends L2Playable
 				if(!isCastingNow())
 				{
 					L2ItemInstance herb = new L2ItemInstance(_charId, itemId);
-					IItemHandler handler = ItemHandler.getInstance().getItemHandler(herb.getEtcItem());
+					IItemHandler handler = ItemHandler.getInstance().getHandler(herb.getEtcItem());
 					if (handler == null)
 						_log.warning("No item handler registered for Herb - item ID " + herb.getItemId() + ".");
 					else
@@ -4862,7 +4862,7 @@ public final class L2PcInstance extends L2Playable
 		//Auto use herbs - pick up
 		if (target.getItemType() == L2EtcItemType.HERB)
 		{
-			IItemHandler handler = ItemHandler.getInstance().getItemHandler(target.getEtcItem());
+			IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
 			if (handler == null)
 				_log.fine("No item handler registered for item ID " + target.getItemId() + ".");
 			else
@@ -9849,7 +9849,7 @@ public final class L2PcInstance extends L2Playable
 								case 22075: case 22076: case 22077:
 								case 22078: case 22079: case 22080:
 								case 22081:
-									handler = ItemHandler.getInstance().getItemHandler(item.getEtcItem());
+									handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 									
 									if (handler != null)
 										handler.useItem(this, item, false);
@@ -9863,7 +9863,7 @@ public final class L2PcInstance extends L2Playable
 							{
 								case 6646: case 6647:
 								case 20333: case 20334:
-									handler = ItemHandler.getInstance().getItemHandler(item.getEtcItem());
+									handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 									
 									if (handler != null)
 										handler.useItem(this, item, false);
@@ -9883,7 +9883,7 @@ public final class L2PcInstance extends L2Playable
 								case 5789: case 22082: case 22083:
 								case 22084: case 22085: case 22086:
 									
-									handler = ItemHandler.getInstance().getItemHandler(item.getEtcItem());
+									handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 									
 									if (handler != null)
 										handler.useItem(this, item, false);
@@ -9895,7 +9895,7 @@ public final class L2PcInstance extends L2Playable
 						{
 							if (itemId == 6645 || itemId == 20332)
 							{
-								handler = ItemHandler.getInstance().getItemHandler(item.getEtcItem());
+								handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 								
 								if (handler != null)
 									handler.useItem(this, item, false);
@@ -13736,7 +13736,7 @@ public final class L2PcInstance extends L2Playable
 				
 				if (food != null && isHungry())
 				{
-					IItemHandler handler = ItemHandler.getInstance().getItemHandler(food.getEtcItem());
+					IItemHandler handler = ItemHandler.getInstance().getHandler(food.getEtcItem());
 					if (handler != null)
 					{
 						handler.useItem(L2PcInstance.this, food, false);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -86,10 +86,10 @@ public class L2PetInstance extends L2Summon
 	private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?";
 
 	private int _curFed;
-	private PetInventory _inventory;
+	private final PetInventory _inventory;
 	private final int _controlObjectId;
 	private boolean _respawned;
-	private boolean _mountable;
+	private final boolean _mountable;
 	private Future<?> _feedTask;
 	private L2PetData _data;
 	private L2PetLevelData _leveldata;
@@ -186,7 +186,7 @@ public class L2PetInstance extends L2Summon
 				}
 				if (food != null && isHungry())
 				{
-					IItemHandler handler = ItemHandler.getInstance().getItemHandler(food.getEtcItem());
+					IItemHandler handler = ItemHandler.getInstance().getHandler(food.getEtcItem());
 					if (handler != null)
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_TOOK_S1_BECAUSE_HE_WAS_HUNGRY);
@@ -565,7 +565,7 @@ public class L2PetInstance extends L2Summon
 		// Herbs
 		if (target.getItemType() == L2EtcItemType.HERB)
 		{
-			IItemHandler handler = ItemHandler.getInstance().getItemHandler(target.getEtcItem());
+			IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
 			if (handler == null)
 				_log.fine("No item handler registered for item ID " + target.getItemId() + ".");
 			else

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

@@ -46,7 +46,7 @@ public class BypassUserCmd extends L2GameClientPacket
 		if (player == null)
 			return;
 		
-		IUserCommandHandler handler = UserCommandHandler.getInstance().getUserCommandHandler(_command);
+		IUserCommandHandler handler = UserCommandHandler.getInstance().getHandler(_command);
 		
 		if (handler == null)
 		{

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

@@ -73,7 +73,7 @@ public final class DlgAnswer extends L2GameClientPacket
 				if (_answer == 0)
 					return;
 				String command = _command.split(" ")[0];
-				IAdminCommandHandler ach = AdminCommandHandler.getInstance().getAdminCommandHandler(command);
+				IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
 				if (AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
 				{
 					if (Config.GMAUDIT)

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

@@ -84,7 +84,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
 			{
 				String command = _command.split(" ")[0];
 				
-				IAdminCommandHandler ach = AdminCommandHandler.getInstance().getAdminCommandHandler(command);
+				IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
 				
 				if (ach == null)
 				{
@@ -168,7 +168,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
 			// Navigate through Manor windows
 			else if (_command.startsWith("manor_menu_select"))
 			{
-				final IBypassHandler manor = BypassHandler.getInstance().getBypassHandler("manor_menu_select");
+				final IBypassHandler manor = BypassHandler.getInstance().getHandler("manor_menu_select");
 				if (manor != null)
 					manor.useBypass(_command, activeChar, null);
 			}
@@ -249,7 +249,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
 			}
 			else
 			{
-				final IBypassHandler handler = BypassHandler.getInstance().getBypassHandler(_command);
+				final IBypassHandler handler = BypassHandler.getInstance().getHandler(_command);
 				if (handler != null)
 					handler.useBypass(_command, activeChar, null);
 				else

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

@@ -42,7 +42,7 @@ public final class RequestOlympiadMatchList extends L2GameClientPacket
 		if (activeChar == null || !activeChar.inObserverMode())
 			return;
 
-		IBypassHandler handler = BypassHandler.getInstance().getBypassHandler(COMMAND);
+		IBypassHandler handler = BypassHandler.getInstance().getHandler(COMMAND);
 		if (handler != null)
 			handler.useBypass(COMMAND, activeChar, null);
 	}

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

@@ -117,7 +117,7 @@ public final class RequestPetUseItem extends L2GameClientPacket
 			}
 		}
 		
-		final IItemHandler handler = ItemHandler.getInstance().getItemHandler(item.getEtcItem());
+		final IItemHandler handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 		if (handler != null)
 		{
 			useItem(pet, item, activeChar);
@@ -147,7 +147,7 @@ public final class RequestPetUseItem extends L2GameClientPacket
 		}
 		else
 		{
-			final IItemHandler handler = ItemHandler.getInstance().getItemHandler(item.getEtcItem());
+			final IItemHandler handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 			if (handler != null)
 			{
 				handler.useItem(pet, item, false);

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

@@ -200,7 +200,7 @@ public final class Say2 extends L2GameClientPacket
 		if (Config.USE_SAY_FILTER)
 			checkText();
 		
-		IChatHandler handler = ChatHandler.getInstance().getChatHandler(_type);
+		IChatHandler handler = ChatHandler.getInstance().getHandler(_type);
 		if (handler != null)
 			handler.handleChat(_type, activeChar, _target, _text);
 		else

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

@@ -55,7 +55,7 @@ public final class SendBypassBuildCmd extends L2GameClientPacket
 		
 		String command = "admin_" + _command.split(" ")[0];
 		
-		IAdminCommandHandler ach = AdminCommandHandler.getInstance().getAdminCommandHandler(command);
+		IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
 		
 		if (ach == null)
 		{

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

@@ -327,7 +327,7 @@ public final class UseItem extends L2GameClientPacket
 			}
 			else
 			{
-				IItemHandler handler = ItemHandler.getInstance().getItemHandler(item.getEtcItem());
+				IItemHandler handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 				if (handler != null)
 					handler.useItem(activeChar, item, _ctrlPressed);
 				else if (Config.DEBUG)

L2J_Server_BETA/java/com/l2jserver/gameserver/templates/item/L2Weapon.java

@@ -398,7 +398,7 @@ public final class L2Weapon extends L2Item
 			return _emptyEffectSet;
 		
 		// Get the skill handler corresponding to the skill type
-		ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(_skillsOnCast.getSkill().getSkillType());
+		ISkillHandler handler = SkillHandler.getInstance().getHandler(_skillsOnCast.getSkill().getSkillType());
 		
 		L2Character[] targets = new L2Character[1];
 		targets[0] = target;

L2J_Server_BETA/java/com/l2jserver/status/GameStatusThread.java

@@ -188,7 +188,7 @@ public class GameStatusThread extends Thread
 					break;
 				}
 				
-				final ITelnetHandler handler = TelnetHandler.getInstance().getCommandHandler(_usrCommand);
+				final ITelnetHandler handler = TelnetHandler.getInstance().getHandler(_usrCommand);
 				if (handler != null)
 					handler.useCommand(_usrCommand, _print, _cSocket, _uptime);