[Arianne-commits] stendhal/src/games/stendhal/client GameObjects.java, 1.159, 1.160 GameScreen.java, 1.98, 1.99 stendhal.java, 1.84, 1.85 TileRenderer.java, 1.67, 1.68 TileStore.java, 1.45, 1.46 StendhalClient.java, 1.165, 1.166 UserContext.java, 1.12, 1.13 StaticGameLayers.java, 1.82, 1.83 RPObjectChangeDispatcher.java, 1.8, 1.9 Cache.java, 1.16, 1.17

[Astrid S. <ast...@us...>]

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

Modified Files:
	GameObjects.java GameScreen.java stendhal.java 
	TileRenderer.java TileStore.java StendhalClient.java 
	UserContext.java StaticGameLayers.java 
	RPObjectChangeDispatcher.java Cache.java 
Log Message:
stop using marauroa.Logger class use Log4J directly instead
still uses init() from marauroa

Index: Cache.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/Cache.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Cache.java	18 Oct 2007 10:08:18 -0000	1.16
--- Cache.java	1 Nov 2007 23:32:39 -0000	1.17
***************
*** 12,18 ****
  import java.util.Properties;
  
  import marauroa.common.Configuration;
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.io.Persistence;
  import marauroa.common.net.message.TransferContent;
--- 12,19 ----
  import java.util.Properties;
  
+ import org.apache.log4j.Logger;
+ 
  import marauroa.common.Configuration;
! 
  import marauroa.common.io.Persistence;
  import marauroa.common.net.message.TransferContent;
***************
*** 34,38 ****
   */
  public class Cache {
! 	private static Logger logger = Log4J.getLogger(Cache.class);
  	private Configuration cacheManager;
  	private Properties prefilledCacheManager;
--- 35,39 ----
   */
  public class Cache {
! 	private static Logger logger = Logger.getLogger(Cache.class);
  	private Configuration cacheManager;
  	private Properties prefilledCacheManager;

Index: TileRenderer.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/TileRenderer.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** TileRenderer.java	25 Oct 2007 10:11:30 -0000	1.67
--- TileRenderer.java	1 Nov 2007 23:32:38 -0000	1.68
***************
*** 22,27 ****
  import java.io.InputStream;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  
  /**
--- 22,27 ----
  import java.io.InputStream;
  
! 
! import org.apache.log4j.Logger;
  
  /**
***************
*** 31,35 ****
  public class TileRenderer extends LayerRenderer {
  	/** the logger instance. */
! 	private static final Logger logger = Log4J.getLogger(TileRenderer.class);
  
  	private int[] map;
--- 31,35 ----
  public class TileRenderer extends LayerRenderer {
  	/** the logger instance. */
! 	private static final Logger logger = Logger.getLogger(TileRenderer.class);
  
  	private int[] map;

Index: GameObjects.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameObjects.java,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** GameObjects.java	16 Oct 2007 01:29:22 -0000	1.159
--- GameObjects.java	1 Nov 2007 23:32:37 -0000	1.160
***************
*** 24,29 ****
  import java.util.Map;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPObject;
  import marauroa.common.game.RPSlot;
--- 24,29 ----
  import java.util.Map;
  
! import org.apache.log4j.Logger;
! 
  import marauroa.common.game.RPObject;
  import marauroa.common.game.RPSlot;
***************
*** 33,37 ****
  
  	/** the logger instance. */
! 	private static final Logger logger = Log4J.getLogger(GameObjects.class);
  
  	private Map<FQID, Entity> objects;
--- 33,37 ----
  
  	/** the logger instance. */
! 	private static final Logger logger = Logger.getLogger(GameObjects.class);
  
  	private Map<FQID, Entity> objects;

Index: StaticGameLayers.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/StaticGameLayers.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** StaticGameLayers.java	25 Oct 2007 10:11:31 -0000	1.82
--- StaticGameLayers.java	1 Nov 2007 23:32:39 -0000	1.83
***************
*** 24,29 ****
  import java.util.Map;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.net.InputSerializer;
  
--- 24,28 ----
  import java.util.Map;
  
! import org.apache.log4j.Logger;
  import marauroa.common.net.InputSerializer;
  
***************
*** 33,38 ****
  
  	/** the logger instance. */
! 	private static final Logger logger = Log4J
! 			.getLogger(StaticGameLayers.class);
  
  	/**
--- 32,36 ----
  
  	/** the logger instance. */
! 	private static final Logger logger = Logger.getLogger(StaticGameLayers.class);
  
  	/**
***************
*** 108,112 ****
  	 * @throws ClassNotFoundException
  	 */
! 	public void addLayer(String area, String layer, InputStream in) throws IOException, ClassNotFoundException {
  		String name = getLayerKey(area, layer);
  
--- 106,111 ----
  	 * @throws ClassNotFoundException
  	 */
! 	public void addLayer(String area, String layer, InputStream in)
! 			throws IOException, ClassNotFoundException {
  		String name = getLayerKey(area, layer);
  
***************
*** 297,302 ****
  	 *
  	 *
! 	 * TODO: Make the key an object with area/layer fields and replace
! 	 * ugly code that uses startsWith('area.').
  	 */
  	protected String getLayerKey(final String area, final String layer) {
--- 296,301 ----
  	 *
  	 *
! 	 * TODO: Make the key an object with area/layer fields and replace ugly code
! 	 * that uses startsWith('area.').
  	 */
  	protected String getLayerKey(final String area, final String layer) {

Index: StendhalClient.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/StendhalClient.java,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -d -r1.165 -r1.166
*** StendhalClient.java	25 Oct 2007 10:11:31 -0000	1.165
--- StendhalClient.java	1 Nov 2007 23:32:38 -0000	1.166
***************
*** 38,43 ****
  import marauroa.client.net.IPerceptionListener;
  import marauroa.client.net.PerceptionHandler;
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.Perception;
  import marauroa.common.game.RPAction;
--- 38,43 ----
  import marauroa.client.net.IPerceptionListener;
  import marauroa.client.net.PerceptionHandler;
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.Perception;
  import marauroa.common.game.RPAction;
***************
*** 56,60 ****
  
  	/** the logger instance. */
! 	private static final Logger logger = Log4J.getLogger(StendhalClient.class);
  
  	private Map<RPObject.ID, RPObject> world_objects;
--- 56,60 ----
  
  	/** the logger instance. */
! 	private static final Logger logger = Logger.getLogger(StendhalClient.class);
  
  	private Map<RPObject.ID, RPObject> world_objects;

Index: stendhal.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/stendhal.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** stendhal.java	27 Oct 2007 15:44:40 -0000	1.84
--- stendhal.java	1 Nov 2007 23:32:38 -0000	1.85
***************
*** 24,33 ****
  import javax.swing.JOptionPane;
  
  import marauroa.common.Log4J;
! import marauroa.common.Logger;
  
  public class stendhal extends Thread {
  
! 	private static final Logger logger = Log4J.getLogger(stendhal.class);
  
  	public static boolean doLogin;
--- 24,35 ----
  import javax.swing.JOptionPane;
  
+ 
  import marauroa.common.Log4J;
! 
! import org.apache.log4j.Logger;
  
  public class stendhal extends Thread {
  
! 	private static final Logger logger = Logger.getLogger(stendhal.class);
  
  	public static boolean doLogin;

Index: GameScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameScreen.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** GameScreen.java	25 Oct 2007 22:01:21 -0000	1.98
--- GameScreen.java	1 Nov 2007 23:32:38 -0000	1.99
***************
*** 57,62 ****
  import java.util.Map;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  
  /**
--- 57,63 ----
  import java.util.Map;
  
! import org.apache.log4j.Logger;
! 
! 
  
  /**
***************
*** 66,70 ****
  
  	/** the logger instance. */
! 	private static final Logger logger = Log4J.getLogger(GameScreen.class);
  
  	/**
--- 67,71 ----
  
  	/** the logger instance. */
! 	private static final Logger logger = Logger.getLogger(GameScreen.class);
  
  	/**

Index: UserContext.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/UserContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** UserContext.java	13 Oct 2007 11:54:05 -0000	1.12
--- UserContext.java	1 Nov 2007 23:32:39 -0000	1.13
***************
*** 19,24 ****
  import java.util.HashMap;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPObject;
  
--- 19,24 ----
  import java.util.HashMap;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPObject;
  
***************
*** 35,39 ****
  	 * The logger.
  	 */
! 	private static final Logger logger = Log4J.getLogger(UserContext.class);
  
  	/**
--- 35,39 ----
  	 * The logger.
  	 */
! 	private static final Logger logger = Logger.getLogger(UserContext.class);
  
  	/**

Index: TileStore.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/TileStore.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** TileStore.java	9 Sep 2007 11:19:59 -0000	1.45
--- TileStore.java	1 Nov 2007 23:32:38 -0000	1.46
***************
*** 28,33 ****
  import java.util.Map;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.net.InputSerializer;
  
--- 28,33 ----
  import java.util.Map;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.net.InputSerializer;
  
***************
*** 35,39 ****
  public class TileStore implements Tileset {
  	/** the logger instance. */
! 	private static final Logger logger = Log4J.getLogger(TileStore.class);
  
  	/**
--- 35,39 ----
  public class TileStore implements Tileset {
  	/** the logger instance. */
! 	private static final Logger logger = Logger.getLogger(TileStore.class);
  
  	/**

Index: RPObjectChangeDispatcher.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/RPObjectChangeDispatcher.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RPObjectChangeDispatcher.java	13 Oct 2007 11:50:26 -0000	1.8
--- RPObjectChangeDispatcher.java	1 Nov 2007 23:32:39 -0000	1.9
***************
*** 10,17 ****
  //
  
  import games.stendhal.client.events.RPObjectChangeListener;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPObject;
  import marauroa.common.game.RPSlot;
--- 10,19 ----
  //
  
+ import org.apache.log4j.Logger;
+ 
  import games.stendhal.client.events.RPObjectChangeListener;
  
! 
! 
  import marauroa.common.game.RPObject;
  import marauroa.common.game.RPSlot;
***************
*** 31,40 ****
  	 * The logger.
  	 */
! 	private static final Logger logger = Log4J.getLogger(RPObjectChangeDispatcher.class);
  
  	/**
  	 * The dump logger.
  	 */
! 	private static final Logger dlogger = Log4J.getLogger(Dump.class);
  
  	/**
--- 33,42 ----
  	 * The logger.
  	 */
! 	private static final Logger logger = Logger.getLogger(RPObjectChangeDispatcher.class);
  
  	/**
  	 * The dump logger.
  	 */
! 	private static final Logger dlogger =  Logger.getLogger(Dump.class);
  
  	/**