[Arianne-commits] stendhal/src/games/stendhal/client GameObjects.java, 1.125, 1.126 StendhalClient.java, 1.124, 1.125

[ChadF <ch...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12906/src/games/stendhal/client

Modified Files:
	GameObjects.java StendhalClient.java 
Log Message:
Switched to using the listener interface.


Index: GameObjects.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameObjects.java,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** GameObjects.java	19 Apr 2007 01:59:19 -0000	1.125
--- GameObjects.java	19 Apr 2007 02:31:18 -0000	1.126
***************
*** 125,169 ****
  	}
  
- 	/** Add a new Entity to the game */
- 	public void add(RPObject object) throws AttributeNotFoundException {
- 		Log4J.startMethod(logger, "add");
- 
- 		if (!object.has("server-only")) {
- 			Entity entity = EntityFactory.createEntity(object);
- 
- 			entity.onAdded(object);
- 
- 			objects.put(entity.getID(), entity);
- 			sortedObjects.add(entity);
- 
- 			logger.debug("added " + entity);
- 		} else {
- 			logger.debug("Discarding object: " + object);
- 		}
- 
- 		Log4J.finishMethod(logger, "add");
- 	}
- 
- 	/** Modify a existing Entity so its propierties change */
- 	public void modifyAdded(RPObject object, RPObject changes) throws AttributeNotFoundException {
- 		Log4J.startMethod(logger, "modifyAdded");
- 		Entity entity = objects.get(object.getID());
- 		if (entity != null) {
- 			entity.onChangedAdded(object, changes);
- 		}
- 
- 		Log4J.finishMethod(logger, "modifyAdded");
- 	}
- 
- 	public void modifyRemoved(RPObject object, RPObject changes) throws AttributeNotFoundException {
- 		Log4J.startMethod(logger, "modifyRemoved");
- 		Entity entity = objects.get(object.getID());
- 		if (entity != null) {
- 			entity.onChangedRemoved(object, changes);
- 		}
- 
- 		Log4J.finishMethod(logger, "modifyRemoved");
- 	}
- 
  	public boolean has(Entity entity) {
  		return objects.containsKey(entity.getID());
--- 125,128 ----
***************
*** 174,195 ****
  	}
  
- 	/** Removes a Entity from game */
- 	public void remove(RPObject object) {
- 		Log4J.startMethod(logger, "remove");
- 
- 		RPObject.ID id = object.getID();
- 
- 		logger.debug("removed " + id);
- 
- 		Entity entity = objects.remove(id);
- 
- 		if (entity != null) {
- 			entity.onRemoved(object);
- 			sortedObjects.remove(entity);
- 		}
- 
- 		Log4J.finishMethod(logger, "remove");
- 	}
- 
  	/** Removes all the object entities */
  	public void clear() {
--- 133,136 ----
***************
*** 355,365 ****
  			entity.draw(screen);
  		}
- 		// System.err.println(temp);
  	}
  
  	/** Draw the creature's Name/HP Bar */
  	public void drawHPbar(GameScreen screen) {
- 		//sort();
- 
  		for (Entity entity : sortedObjects) {
  			if (entity instanceof RPEntity) {
--- 296,303 ----
***************
*** 368,372 ****
  			}
  		}
- 		// System.err.println(temp);
  	}
  
--- 306,309 ----
***************
*** 395,399 ****
  	 */
  	public void onAdded(final RPObject object) {
! 		add(object);
  	}
  
--- 332,351 ----
  	 */
  	public void onAdded(final RPObject object) {
! 		Log4J.startMethod(logger, "onAdded");
! 
! 		if (!object.has("server-only")) {
! 			Entity entity = EntityFactory.createEntity(object);
! 
! 			entity.onAdded(object);
! 
! 			objects.put(entity.getID(), entity);
! 			sortedObjects.add(entity);
! 
! 			logger.debug("added " + entity);
! 		} else {
! 			logger.debug("Discarding object: " + object);
! 		}
! 
! 		Log4J.finishMethod(logger, "onAdded");
  	}
  
***************
*** 406,410 ****
  	 */
  	public void onChangedAdded(final RPObject object, final RPObject changes) {
! 		modifyAdded(object, changes);
  	}
  
--- 358,370 ----
  	 */
  	public void onChangedAdded(final RPObject object, final RPObject changes) {
! 		Log4J.startMethod(logger, "onChangedAdded");
! 
! 		Entity entity = objects.get(object.getID());
! 
! 		if (entity != null) {
! 			entity.onChangedAdded(object, changes);
! 		}
! 
! 		Log4J.finishMethod(logger, "onChangedAdded");
  	}
  
***************
*** 434,438 ****
  	 */
  	public void onChangedRemoved(final RPObject object, final RPObject changes) {
! 		modifyRemoved(object, changes);
  	}
  
--- 394,406 ----
  	 */
  	public void onChangedRemoved(final RPObject object, final RPObject changes) {
! 		Log4J.startMethod(logger, "onChangedRemoved");
! 
! 		Entity entity = objects.get(object.getID());
! 
! 		if (entity != null) {
! 			entity.onChangedRemoved(object, changes);
! 		}
! 
! 		Log4J.finishMethod(logger, "onChangedRemoved");
  	}
  
***************
*** 461,465 ****
  	 */
  	public void onRemoved(final RPObject object) {
! 		remove(object);
  	}
  }
--- 429,446 ----
  	 */
  	public void onRemoved(final RPObject object) {
! 		Log4J.startMethod(logger, "onRemoved");
! 
! 		RPObject.ID id = object.getID();
! 
! 		logger.debug("removed " + id);
! 
! 		Entity entity = objects.remove(id);
! 
! 		if (entity != null) {
! 			entity.onRemoved(object);
! 			sortedObjects.remove(entity);
! 		}
! 
! 		Log4J.finishMethod(logger, "onRemoved");
  	}
  }

Index: StendhalClient.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/StendhalClient.java,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** StendhalClient.java	19 Apr 2007 01:34:56 -0000	1.124
--- StendhalClient.java	19 Apr 2007 02:31:18 -0000	1.125
***************
*** 515,519 ****
  		try {
  			logger.debug("Object(" + object.getID() + ") added to Game Objects container");
! 			gameObjects.add(object);
  		} catch (Exception e) {
  			logger.error("onAdded failed, object is " + object, e);
--- 515,519 ----
  		try {
  			logger.debug("Object(" + object.getID() + ") added to Game Objects container");
! 			gameObjects.onAdded(object);
  		} catch (Exception e) {
  			logger.error("onAdded failed, object is " + object, e);
***************
*** 531,535 ****
  		try {
  			logger.debug("Object(" + object.getID() + ") removed from Static Objects container");
! 			gameObjects.remove(object);
  		} catch (Exception e) {
  			logger.error("onDeleted failed, object is " + object, e);
--- 531,535 ----
  		try {
  			logger.debug("Object(" + object.getID() + ") removed from Static Objects container");
! 			gameObjects.onRemoved(object);
  		} catch (Exception e) {
  			logger.error("onDeleted failed, object is " + object, e);
***************
*** 548,552 ****
  		try {
  			logger.debug("Object(" + object.getID() + ") modified in Game Objects container");
! 			gameObjects.modifyAdded(object, changes);
  			object.applyDifferences(changes, null);
  		} catch (Exception e) {
--- 548,552 ----
  		try {
  			logger.debug("Object(" + object.getID() + ") modified in Game Objects container");
! 			gameObjects.onChangedAdded(object, changes);
  			object.applyDifferences(changes, null);
  		} catch (Exception e) {
***************
*** 568,572 ****
  			logger.debug("Original(" + object + ") modified in Game Objects container");
  
! 			gameObjects.modifyRemoved(object, changes);
  			object.applyDifferences(null, changes);
  
--- 568,572 ----
  			logger.debug("Original(" + object + ") modified in Game Objects container");
  
! 			gameObjects.onChangedRemoved(object, changes);
  			object.applyDifferences(null, changes);