BETA: Generic item holder.

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

@@ -15,25 +15,31 @@
 package com.l2jserver.gameserver.model;
 
 /**
+ * Holder for item id-count.
  * @author UnAfraid
- *
  */
 public final class ItemHolder
 {
-	private final int _objectId;
+	private final int _id;
 	private final long _count;
 	
-	public ItemHolder(int objectId, long count)
+	public ItemHolder(int id, long count)
 	{
-		_objectId = objectId;
+		_id = id;
 		_count = count;
 	}
 	
-	public int getObjectId()
+	/**
+	 * @return the item/object identifier.
+	 */
+	public int getId()
 	{
-		return _objectId;
+		return _id;
 	}
 	
+	/**
+	 * @return the item count.
+	 */
 	public long getCount()
 	{
 		return _count;
@@ -42,6 +48,6 @@ public final class ItemHolder
 	@Override
 	public String toString()
 	{
-		return "[" + getClass().getSimpleName() + "]: objectId: " + _objectId + " count: " + _count;
+		return getClass().getSimpleName() + ": Id: " + _id + " Count: " + _count;
 	}
 }

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

@@ -107,7 +107,7 @@ public class RequestPackageSend extends L2GameClientPacket
 		for (ItemHolder i : _items)
 		{
 			// Check validity of requested item
-			L2ItemInstance item = player.checkItemManipulation(i.getObjectId(), i.getCount(), "deposit");
+			L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
 			if (item == null)
 			{
 				_log.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -149,14 +149,14 @@ public class RequestPackageSend extends L2GameClientPacket
 		for (ItemHolder i : _items)
 		{
 			// Check validity of requested item
-			L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "deposit");
+			L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				_log.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
 				return;
 			}
 			
-			L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getObjectId(), i.getCount(), warehouse, player, null);
+			L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null);
 			if (newItem == null)
 			{
 				_log.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

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

@@ -126,7 +126,7 @@ public final class SendWareHouseWithDrawList extends L2GameClientPacket
 		for (ItemHolder i : _items)
 		{
 			// Calculate needed slots
-			L2ItemInstance item = warehouse.getItemByObjectId(i.getObjectId());
+			L2ItemInstance item = warehouse.getItemByObjectId(i.getId());
 			if (item == null || item.getCount() < i.getCount())
 			{
 				Util.handleIllegalPlayerAction(player, "Warning!! Character "
@@ -161,13 +161,13 @@ public final class SendWareHouseWithDrawList extends L2GameClientPacket
 		InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
 		for (ItemHolder i : _items)
 		{
-			L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getObjectId());
+			L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
 			if (oldItem == null || oldItem.getCount() < i.getCount())
 			{
 				_log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)");
 				return;
 			}
-			final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getObjectId(), i.getCount(), player.getInventory(), player, manager);
+			final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager);
 			if (newItem == null)
 			{
 				_log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");