[Arianne-commits] marauroa/src/marauroa/server/game IRPRuleProcessor.java, 1.9, 1.10 RPServerManager.java, 1.38, 1.39 MarauroaRPRuleProcessor.java, 1.10, 1.11

[Daniel H. <wik...@us...>]

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv27152/src/marauroa/server/game

Modified Files:
	IRPRuleProcessor.java RPServerManager.java 
	MarauroaRPRuleProcessor.java 
Log Message:
made use of the fact that StendhalRPWorld is a Singleton

Index: IRPRuleProcessor.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/IRPRuleProcessor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IRPRuleProcessor.java	22 Aug 2006 01:18:20 -0000	1.9
--- IRPRuleProcessor.java	23 Aug 2006 02:11:45 -0000	1.10
***************
*** 36,43 ****
  	 * Set the context where the actions are executed.
  	 * 
! 	 * @param zone
! 	 *            The zone where actions happens.
  	 */
! 	public void setContext(RPServerManager rpman, RPWorld world);
  
  	/** Returns true if the version of the game is compatible */
--- 36,43 ----
  	 * Set the context where the actions are executed.
  	 * 
! 	 * @param rpman
! 	 *            ...
  	 */
! 	public void setContext(RPServerManager rpman);
  
  	/** Returns true if the version of the game is compatible */

Index: MarauroaRPRuleProcessor.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/MarauroaRPRuleProcessor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MarauroaRPRuleProcessor.java	22 Aug 2006 01:18:20 -0000	1.10
--- MarauroaRPRuleProcessor.java	23 Aug 2006 02:11:45 -0000	1.11
***************
*** 27,32 ****
  	private static MarauroaRPRuleProcessor instance;
  	
- 	private RPWorld world;
- 
  	private RPServerManager rpman;
  
--- 27,30 ----
***************
*** 41,46 ****
  	}
  
! 	public void setContext(RPServerManager rpman, RPWorld world) {
! 		this.world = world;
  		this.rpman = rpman;
  	}
--- 39,43 ----
  	}
  
! 	public void setContext(RPServerManager rpman) {
  		this.rpman = rpman;
  	}

Index: RPServerManager.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/RPServerManager.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** RPServerManager.java	22 Aug 2006 01:18:20 -0000	1.38
--- RPServerManager.java	23 Aug 2006 02:11:45 -0000	1.39
***************
*** 104,109 ****
  			Class ruleProcessorClass = Class.forName(conf
  					.get("rp_RPRuleProcessorClass"));
  			ruleProcessor = (IRPRuleProcessor) ruleProcessorClass.getDeclaredMethod("get", new Class[0]).invoke(null, (Object[]) null);
! 			ruleProcessor.setContext(this, world);
  
  			String duration = conf.get("rp_turnDuration");
--- 104,110 ----
  			Class ruleProcessorClass = Class.forName(conf
  					.get("rp_RPRuleProcessorClass"));
+ 			// call the get() method without parameters to retrieve the singleton instance
  			ruleProcessor = (IRPRuleProcessor) ruleProcessorClass.getDeclaredMethod("get", new Class[0]).invoke(null, (Object[]) null);
! 			ruleProcessor.setContext(this);
  
  			String duration = conf.get("rp_turnDuration");