[Arianne-commits] stendhal/src/games/stendhal/server/entity/mapstuff/chest StoredChest.java, 1.3, 1.4

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/mapstuff/chest
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26199/src/games/stendhal/server/entity/mapstuff/chest

Modified Files:
	StoredChest.java 
Log Message:
code format

Index: StoredChest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/mapstuff/chest/StoredChest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StoredChest.java	15 Aug 2009 22:48:43 -0000	1.3
--- StoredChest.java	16 Aug 2009 08:56:36 -0000	1.4
***************
*** 34,47 ****
  
  	/**
!          * Creates a StoredChest based on an existing RPObject.
! 		 *  This is just for loading 
!          * a chest from the database, use the other constructors.
!          * @param rpobject 
!          */
!         public StoredChest(final RPObject rpobject) {
!             super(rpobject);
! 			loadSlotContent();
! 				store();
!     }
  
  	private void loadSlotContent() {
--- 34,47 ----
  
  	/**
! 	 * Creates a StoredChest based on an existing RPObject. This is just for
! 	 * loading a chest from the database, use the other constructors.
! 	 * 
! 	 * @param rpobject
! 	 */
! 	public StoredChest(final RPObject rpobject) {
! 		super(rpobject);
! 		loadSlotContent();
! 		store();
! 	}
  
  	private void loadSlotContent() {
***************
*** 57,61 ****
  			final RPSlot newSlot = new ChestSlot(this);
  			addSlot(newSlot);
! 			// does this code look familiar to you? well it might, it's from PlayerRPClass. :*
  			for (final RPObject item : objects) {
  				try {
--- 57,62 ----
  			final RPSlot newSlot = new ChestSlot(this);
  			addSlot(newSlot);
! 			// does this code look familiar to you? well it might, it's from
! 			// PlayerRPClass. :*
  			for (final RPObject item : objects) {
  				try {
***************
*** 65,70 ****
  						// the update converter is in player :(
  						final String name = item.get("name");
! 						final Item entity = SingletonRepository.getEntityManager().getItem(name);
! 						
  						// log removed items
  						if (entity == null) {
--- 66,72 ----
  						// the update converter is in player :(
  						final String name = item.get("name");
! 						final Item entity = SingletonRepository
! 								.getEntityManager().getItem(name);
! 
  						// log removed items
  						if (entity == null) {
***************
*** 73,80 ****
  								quantity = item.getInt("quantity");
  							}
! 							logger.warn("Cannot restore " + quantity + " " + name
! 										+ " of stored chest "
! 										+ " because this item"
! 										+ " was removed from items.xml");
  							continue;
  						}
--- 75,82 ----
  								quantity = item.getInt("quantity");
  							}
! 							logger.warn("Cannot restore " + quantity + " "
! 									+ name + " of stored chest "
! 									+ " because this item"
! 									+ " was removed from items.xml");
  							continue;
  						}
***************
*** 83,87 ****
  
  						if (item.has("persistent")
! 							&& (item.getInt("persistent") == 1)) {
  							/*
  							 * Keep [new] rpclass
--- 85,89 ----
  
  						if (item.has("persistent")
! 								&& (item.getInt("persistent") == 1)) {
  							/*
  							 * Keep [new] rpclass
***************
*** 90,95 ****
  							entity.fill(item);
  							entity.setRPClass(rpclass);
! 						
! 							// If we've updated the item name we don't want persistent reverting it
  							entity.put("name", name);
  						}
--- 92,98 ----
  							entity.fill(item);
  							entity.setRPClass(rpclass);
! 
! 							// If we've updated the item name we don't want
! 							// persistent reverting it
  							entity.put("name", name);
  						}
***************
*** 100,123 ****
  								quantity = item.getInt("quantity");
  							} else {
! 								logger.warn("Adding quantity=1 to "
! 											+ item
! 											+ ". Most likely cause is that this item was not stackable in the past");
  							}
  							((StackableItem) entity).setQuantity(quantity);
  
  							if (quantity <= 0) {
! 								logger.warn("Ignoring item "
! 											+ name
! 											+ " on restore of stored chest"
! 											+ " because this item has an invalid quantity: "
! 											+ quantity);
  								continue;
  							}
  						}
! 						
! 						// make sure saved individual information is
! 						// restored
! 						final String[] individualAttributes = { "infostring",
! 																"description", "bound", "undroppableondeath" };
  						for (final String attribute : individualAttributes) {
  							if (item.has(attribute)) {
--- 103,122 ----
  								quantity = item.getInt("quantity");
  							} else {
! 								logger.warn("Adding quantity=1 to " + item
! 									+ ". Most likely cause is that this item was not stackable in the past");
  							}
  							((StackableItem) entity).setQuantity(quantity);
  
  							if (quantity <= 0) {
! 								logger.warn("Ignoring item " + name
! 									+ " on restore of stored chest"
! 									+ " because this item has an invalid quantity: "
! 									+ quantity);
  								continue;
  							}
  						}
! 
! 						// make sure saved individual information is restored
! 						final String[] individualAttributes = { "infostring", "description", "bound", "undroppableondeath" };
  						for (final String attribute : individualAttributes) {
  							if (item.has(attribute)) {
***************
*** 134,139 ****
  					}
  				} catch (final Exception e) {
! 					logger.error("Error adding " + item + " to stored chest slot",
! 								 e);
  				}
  			}
--- 133,137 ----
  					}
  				} catch (final Exception e) {
! 					logger.error("Error adding " + item + " to stored chest slot", e);
  				}
  			}
***************
*** 142,148 ****
  
  	@Override
!     public String getDescriptionName(final boolean definite) {
! 	    return Grammar.article_noun("chest in " + this.getZone().getName(), definite);
!     }
  
  }
--- 140,146 ----
  
  	@Override
! 	public String getDescriptionName(final boolean definite) {
! 		return Grammar.article_noun("chest in " + this.getZone().getName(), definite);
! 	}
  
  }