[Arianne-commits] stendhal/src/games/stendhal/server/actions/equip EquipUtil.java, 1.5, 1.6 SourceObject.java, 1.18, 1.19 EquipmentAction.java, 1.18, 1.19 DestinationObject.java, 1.20, 1.21

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

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

Modified Files:
	EquipUtil.java SourceObject.java EquipmentAction.java 
	DestinationObject.java 
Log Message:
stop using marauroa.Logger class use Log4J directly instead
still uses init() from marauroa

Index: EquipmentAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/EquipmentAction.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** EquipmentAction.java	14 Oct 2007 18:40:08 -0000	1.18
--- EquipmentAction.java	1 Nov 2007 23:32:49 -0000	1.19
***************
*** 25,30 ****
  import java.util.List;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPAction;
  
--- 25,30 ----
  import java.util.List;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPAction;
  
***************
*** 50,54 ****
  public class EquipmentAction implements ActionListener {
  
! 	static final Logger logger = Log4J.getLogger(EquipmentAction.class);
  
  	/** the list of valid container classes */
--- 50,54 ----
  public class EquipmentAction implements ActionListener {
  
! 	static final Logger logger = Logger.getLogger(EquipmentAction.class);
  
  	/** the list of valid container classes */

Index: EquipUtil.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/EquipUtil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EquipUtil.java	3 Jul 2007 17:38:21 -0000	1.5
--- EquipUtil.java	1 Nov 2007 23:32:49 -0000	1.6
***************
*** 7,12 ****
  import java.util.List;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPObject;
  
--- 7,12 ----
  import java.util.List;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPObject;
  
***************
*** 15,19 ****
   */
  public class EquipUtil {
! 	private static Logger logger = Log4J.getLogger(EquipUtil.class);
  
  	/**
--- 15,19 ----
   */
  public class EquipUtil {
! 	private static Logger logger = Logger.getLogger(EquipUtil.class);
  
  	/**

Index: SourceObject.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/SourceObject.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SourceObject.java	24 Oct 2007 19:06:29 -0000	1.18
--- SourceObject.java	1 Nov 2007 23:32:49 -0000	1.19
***************
*** 12,17 ****
  import java.util.List;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPAction;
  import marauroa.common.game.RPObject;
--- 12,17 ----
  import java.util.List;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPAction;
  import marauroa.common.game.RPObject;
***************
*** 22,26 ****
   */
  class SourceObject extends MoveableObject {
! 	private static Logger logger = Log4J.getLogger(SourceObject.class);
  	/** the item */
  	private Item item;
--- 22,26 ----
   */
  class SourceObject extends MoveableObject {
! 	private static Logger logger = Logger.getLogger(SourceObject.class);
  	/** the item */
  	private Item item;

Index: DestinationObject.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/DestinationObject.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** DestinationObject.java	19 Oct 2007 09:03:12 -0000	1.20
--- DestinationObject.java	1 Nov 2007 23:32:49 -0000	1.21
***************
*** 11,16 ****
  import java.util.List;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPAction;
  import marauroa.common.game.RPObject;
--- 11,16 ----
  import java.util.List;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPAction;
  import marauroa.common.game.RPObject;
***************
*** 21,25 ****
   */
  class DestinationObject extends MoveableObject {
! 	private static Logger logger = Log4J.getLogger(DestinationObject.class);
  
  	/** true when this object is valid */
--- 21,25 ----
   */
  class DestinationObject extends MoveableObject {
! 	private static Logger logger = Logger.getLogger(DestinationObject.class);
  
  	/** true when this object is valid */