[Arianne-commits] stendhal/src/games/stendhal/server/entity/item Corpse.java, 1.77, 1.78 Box.java, 1.13, 1.14 StackableItem.java, 1.30, 1.31 WeddingRing.java, 1.15, 1.16

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

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

Modified Files:
	Corpse.java Box.java StackableItem.java WeddingRing.java 
Log Message:
stop using marauroa.Logger class use Log4J directly instead
still uses init() from marauroa

Index: Corpse.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/Corpse.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** Corpse.java	14 Oct 2007 09:00:32 -0000	1.77
--- Corpse.java	1 Nov 2007 23:32:51 -0000	1.78
***************
*** 27,32 ****
  import java.util.Iterator;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPClass;
  import marauroa.common.game.RPObject;
--- 27,32 ----
  import java.util.Iterator;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPClass;
  import marauroa.common.game.RPObject;
***************
*** 46,50 ****
  	protected static final String ATTR_NAME = "name";
  
! 	private static final Logger logger = Log4J.getLogger(Corpse.class);
  
  	/** Time (in seconds) until a corpse disappears. */
--- 46,50 ----
  	protected static final String ATTR_NAME = "name";
  
! 	private static final Logger logger = Logger.getLogger(Corpse.class);
  
  	/** Time (in seconds) until a corpse disappears. */

Index: StackableItem.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/StackableItem.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** StackableItem.java	9 Oct 2007 16:18:52 -0000	1.30
--- StackableItem.java	1 Nov 2007 23:32:51 -0000	1.31
***************
*** 17,22 ****
  import java.util.Map;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPObject;
  
--- 17,22 ----
  import java.util.Map;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPObject;
  
***************
*** 25,29 ****
  	private int quantity = 1;
  
! 	private static Logger logger = Log4J.getLogger(StackableItem.class);
  
  	public StackableItem(String name, String clazz, String subclass, Map<String, String> attributes) {
--- 25,29 ----
  	private int quantity = 1;
  
! 	private static Logger logger = Logger.getLogger(StackableItem.class);
  
  	public StackableItem(String name, String clazz, String subclass, Map<String, String> attributes) {

Index: WeddingRing.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/WeddingRing.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** WeddingRing.java	19 Sep 2007 01:56:32 -0000	1.15
--- WeddingRing.java	1 Nov 2007 23:32:51 -0000	1.16
***************
*** 22,27 ****
  import java.util.Map;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPObject;
  
--- 22,27 ----
  import java.util.Map;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPObject;
  
***************
*** 37,41 ****
  public class WeddingRing extends Ring {
  
! 	private static final Logger logger = Log4J.getLogger(WeddingRing.class);
  
  	/**
--- 37,41 ----
  public class WeddingRing extends Ring {
  
! 	private static final Logger logger = Logger.getLogger(WeddingRing.class);
  
  	/**

Index: Box.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/Box.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Box.java	3 Oct 2007 00:33:42 -0000	1.13
--- Box.java	1 Nov 2007 23:32:51 -0000	1.14
***************
*** 11,16 ****
  import java.util.Map;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPObject;
  
--- 11,16 ----
  import java.util.Map;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPObject;
  
***************
*** 22,26 ****
  public class Box extends Item implements UseListener {
  
! 	private Logger logger = Log4J.getLogger(Box.class);
  
  	// TODO: Make these configurable
--- 22,26 ----
  public class Box extends Item implements UseListener {
  
! 	private Logger logger = Logger.getLogger(Box.class);
  
  	// TODO: Make these configurable