From: Astrid S. <ast...@us...> - 2007-05-20 15:03:59
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv14151/src/games/stendhal/server Modified Files: StendhalRPRuleProcessor.java StendhalRPWorld.java Log Message: set accessability of instance to protected for the sake of testing Index: StendhalRPWorld.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPWorld.java,v retrieving revision 1.197 retrieving revision 1.198 diff -C2 -d -r1.197 -r1.198 *** StendhalRPWorld.java 11 May 2007 03:58:04 -0000 1.197 --- StendhalRPWorld.java 20 May 2007 14:59:56 -0000 1.198 *************** *** 72,76 **** /** The Singleton instance */ ! private static StendhalRPWorld instance; /** The pathfinder thread. */ --- 72,76 ---- /** The Singleton instance */ ! protected static StendhalRPWorld instance; /** The pathfinder thread. */ *************** *** 80,84 **** private RuleManager ruleManager; ! private StendhalRPWorld() { super(); --- 80,84 ---- private RuleManager ruleManager; ! protected StendhalRPWorld() { super(); Index: StendhalRPRuleProcessor.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPRuleProcessor.java,v retrieving revision 1.222 retrieving revision 1.223 diff -C2 -d -r1.222 -r1.223 *** StendhalRPRuleProcessor.java 18 May 2007 09:04:52 -0000 1.222 --- StendhalRPRuleProcessor.java 20 May 2007 14:59:56 -0000 1.223 *************** *** 71,75 **** /** The Singleton instance */ ! private static StendhalRPRuleProcessor instance; private StendhalPlayerDatabase database; --- 71,75 ---- /** The Singleton instance */ ! protected static StendhalRPRuleProcessor instance; private StendhalPlayerDatabase database; *************** *** 141,145 **** } ! private StendhalRPRuleProcessor() { database = (StendhalPlayerDatabase) StendhalPlayerDatabase.getDatabase(); players = new LinkedList<Player>(); --- 141,149 ---- } ! protected StendhalRPRuleProcessor() { ! ! } ! ! private void init() { database = (StendhalPlayerDatabase) StendhalPlayerDatabase.getDatabase(); players = new LinkedList<Player>(); *************** *** 162,165 **** --- 166,170 ---- if (instance == null) { instance = new StendhalRPRuleProcessor(); + instance.init(); } return instance; |