[Arianne-commits] jmapacman/games/mapacman/server MaPacmanRPRuleProcessor.java, 1.14, 1.15 MaPacmanRPWorld.java, 1.8, 1.9 MaPacmanZone.java, 1.21, 1.22 MaPacmancreateaccount.java, 1.7, 1.8

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/jmapacman/games/mapacman/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15729/games/mapacman/server

Modified Files:
	MaPacmanRPRuleProcessor.java MaPacmanRPWorld.java 
	MaPacmanZone.java MaPacmancreateaccount.java 
Log Message:
automatic code-cleanup (no other changes)

Index: MaPacmancreateaccount.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/server/MaPacmancreateaccount.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MaPacmancreateaccount.java	1 Nov 2009 15:36:23 -0000	1.7
--- MaPacmancreateaccount.java	1 Nov 2009 16:04:24 -0000	1.8
***************
*** 7,17 ****
  
  public class MaPacmancreateaccount {
!     public static void main(String[] args) {
!     	Log4J.init();
!     	new DatabaseFactory().initializeDatabase();
  
!         IRPRuleProcessor rule = MaPacmanRPRuleProcessor.get();
!         System.out.println(rule.createAccount("test1", "test1", "te...@ma..."));
!         System.out.println(rule.createCharacter("test1", "char1", new RPObject()));
!     }
  }
\ No newline at end of file
--- 7,19 ----
  
  public class MaPacmancreateaccount {
! 	public static void main(String[] args) {
! 		Log4J.init();
! 		new DatabaseFactory().initializeDatabase();
  
! 		IRPRuleProcessor rule = MaPacmanRPRuleProcessor.get();
! 		System.out.println(rule.createAccount("test1", "test1",
! 				"te...@ma..."));
! 		System.out.println(rule.createCharacter("test1", "char1",
! 				new RPObject()));
! 	}
  }
\ No newline at end of file

Index: MaPacmanRPWorld.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/server/MaPacmanRPWorld.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MaPacmanRPWorld.java	11 Jul 2009 15:06:52 -0000	1.8
--- MaPacmanRPWorld.java	1 Nov 2009 16:04:24 -0000	1.9
***************
*** 14,31 ****
  import marauroa.server.game.rp.RPWorld;
  
! 
! public class MaPacmanRPWorld extends RPWorld
!   {
! 	private static final marauroa.common.Logger logger = Log4J.getLogger(MaPacmanRPWorld.class);
  	private Vector<RPObject> Players = new Vector<RPObject>();
  	private Statistics stats;
  	private Random randomGen = new Random();
! 	private int GhostMoveInt=10;
  	private static MaPacmanRPWorld instance = null;
! 	
! 	public static MaPacmanRPWorld get()
! 	{
! 		if (instance == null)
! 		{
  			instance = new MaPacmanRPWorld();
  			instance.initialize();
--- 14,28 ----
  import marauroa.server.game.rp.RPWorld;
  
! public class MaPacmanRPWorld extends RPWorld {
! 	private static final marauroa.common.Logger logger = Log4J
! 			.getLogger(MaPacmanRPWorld.class);
  	private Vector<RPObject> Players = new Vector<RPObject>();
  	private Statistics stats;
  	private Random randomGen = new Random();
! 	private int GhostMoveInt = 10;
  	private static MaPacmanRPWorld instance = null;
! 
! 	public static MaPacmanRPWorld get() {
! 		if (instance == null) {
  			instance = new MaPacmanRPWorld();
  			instance.initialize();
***************
*** 33,93 ****
  		return instance;
  	}
! 	
! 	private MaPacmanRPWorld()
! 	{
  		super();
  		Common.initRPClasses();
  	}
- 	
  
! 	public void removePlayer(ID id)
! 	{
! 		RPObject player = this.get(id);	
! 		((MaPacmanZone)getRPZone(id)).removePlayer(player);
  		Players.remove(player);
  		this.remove(id);
  	}
! 	
! 	public boolean addPlayer(RPObject object)
! 	{
! 		// set GhostMoveInt, that Ghosts move 100turns after last player has left
! 		GhostMoveInt=100;
! 		
! 		for(IRPZone RPzone : this)
! 		{
! 			MaPacmanZone zone = (MaPacmanZone) RPzone; 
! 			if (zone.getName().equals(object.get("zoneid")))
! 			{
  				this.add(object);
  				this.modify(object);
! 				zone.addPlayer(object);	
! 				object.put("type",Constants.TYPE_PLAYER);
  				return Players.add(object);
  			}
  		}
! 		logger.debug("MaPacman::MaPacmanRPWorld::addPlayer Zone "+object.get("zoneid")+"not found for Player "+object.get("name"));
  		return false;
  	}
! 	
! 	public Vector<RPObject> getPlayers()
! 	{
! 		return Players;		
  	}
  
  	public void beginTurn() {
! 		for(IRPZone RPzone : this)
! 		{
  			MaPacmanZone zone = (MaPacmanZone) RPzone;
  			zone.beginTurn();
  		}
! 		
  	}
  
  	public boolean hasPlayer(RPObject newPlayer) {
! 		for(IRPZone RPzone : this)
! 		{
! 			for (RPObject player : ((MaPacmanZone) RPzone).getPlayers())
! 			{
! 				if (player.get("name").equals(newPlayer.get("name"))) return true;
  			}
  		}
--- 30,85 ----
  		return instance;
  	}
! 
! 	private MaPacmanRPWorld() {
  		super();
  		Common.initRPClasses();
  	}
  
! 	public void removePlayer(ID id) {
! 		RPObject player = this.get(id);
! 		((MaPacmanZone) getRPZone(id)).removePlayer(player);
  		Players.remove(player);
  		this.remove(id);
  	}
! 
! 	public boolean addPlayer(RPObject object) {
! 		// set GhostMoveInt, that Ghosts move 100turns after last player has
! 		// left
! 		GhostMoveInt = 100;
! 
! 		for (IRPZone RPzone : this) {
! 			MaPacmanZone zone = (MaPacmanZone) RPzone;
! 			if (zone.getName().equals(object.get("zoneid"))) {
  				this.add(object);
  				this.modify(object);
! 				zone.addPlayer(object);
! 				object.put("type", Constants.TYPE_PLAYER);
  				return Players.add(object);
  			}
  		}
! 		logger.debug("MaPacman::MaPacmanRPWorld::addPlayer Zone "
! 				+ object.get("zoneid") + "not found for Player "
! 				+ object.get("name"));
  		return false;
  	}
! 
! 	public Vector<RPObject> getPlayers() {
! 		return Players;
  	}
  
  	public void beginTurn() {
! 		for (IRPZone RPzone : this) {
  			MaPacmanZone zone = (MaPacmanZone) RPzone;
  			zone.beginTurn();
  		}
! 
  	}
  
  	public boolean hasPlayer(RPObject newPlayer) {
! 		for (IRPZone RPzone : this) {
! 			for (RPObject player : ((MaPacmanZone) RPzone).getPlayers()) {
! 				if (player.get("name").equals(newPlayer.get("name"))) {
! 					return true;
! 				}
  			}
  		}
***************
*** 97,120 ****
  	public void setStats(Statistics stats) {
  		this.stats = stats;
! 		
  	}
! 	
! 	public Statistics getStats()
! 	{
  		return stats;
  	}
  
! 
! 	public void changeZone(RPObject object, MaPacmanZone oldzone, String newZoneName) {
! 		if (object.get("type").equals(Constants.TYPE_PLAYER))
! 		{
  			oldzone.removePlayer(object);
! 			for(IRPZone RPzone : this)
! 			{
! 				MaPacmanZone zone = (MaPacmanZone) RPzone; 
! 				if (zone.getName().equals(newZoneName))
! 				{
! 					changeZone(zone.getID(),object);
! 					zone.addPlayer(object);	
  				}
  			}
--- 89,108 ----
  	public void setStats(Statistics stats) {
  		this.stats = stats;
! 
  	}
! 
! 	public Statistics getStats() {
  		return stats;
  	}
  
! 	public void changeZone(RPObject object, MaPacmanZone oldzone,
! 			String newZoneName) {
! 		if (object.get("type").equals(Constants.TYPE_PLAYER)) {
  			oldzone.removePlayer(object);
! 			for (IRPZone RPzone : this) {
! 				MaPacmanZone zone = (MaPacmanZone) RPzone;
! 				if (zone.getName().equals(newZoneName)) {
! 					changeZone(zone.getID(), object);
! 					zone.addPlayer(object);
  				}
  			}
***************
*** 122,135 ****
  	}
  
- 
  	public Random getRandom() {
  		return randomGen;
  	}
  
- 
  	public boolean moveGhosts() {
! 		if (Players.size()>0) return true;
! 		else if (GhostMoveInt>0) 
! 		{
  			GhostMoveInt--;
  			return true;
--- 110,121 ----
  	}
  
  	public Random getRandom() {
  		return randomGen;
  	}
  
  	public boolean moveGhosts() {
! 		if (Players.size() > 0) {
! 			return true;
! 		} else if (GhostMoveInt > 0) {
  			GhostMoveInt--;
  			return true;
***************
*** 138,141 ****
  		return false;
  	}
! 	
!   }
--- 124,127 ----
  		return false;
  	}
! 
! }

Index: MaPacmanRPRuleProcessor.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/server/MaPacmanRPRuleProcessor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MaPacmanRPRuleProcessor.java	11 Jul 2009 15:23:24 -0000	1.14
--- MaPacmanRPRuleProcessor.java	1 Nov 2009 16:04:24 -0000	1.15
***************
*** 25,44 ****
  import marauroa.server.game.rp.RPServerManager;
  
! public class MaPacmanRPRuleProcessor implements IRPRuleProcessor
!   {
! 	private static final marauroa.common.Logger logger = Log4J.getLogger(MaPacmanRPRuleProcessor.class);
  
! 	private RPServerManager rpman = null;
! 	private MaPacmanRPWorld world = (MaPacmanRPWorld)MaPacmanRPWorld.get();
! 	private MaPacmanZone zone;
  	private Vector<RPObject> chatChanges;
  	private Statistics stats;
  
  	private static MaPacmanRPRuleProcessor instance;
! 	
! 	public static IRPRuleProcessor get()
! 	{
! 		if (instance == null)
! 		{
  			instance = new MaPacmanRPRuleProcessor();
  		}
--- 25,40 ----
  import marauroa.server.game.rp.RPServerManager;
  
! public class MaPacmanRPRuleProcessor implements IRPRuleProcessor {
! 	private static final marauroa.common.Logger logger = Log4J
! 			.getLogger(MaPacmanRPRuleProcessor.class);
  
! 	private MaPacmanRPWorld world = MaPacmanRPWorld.get();
  	private Vector<RPObject> chatChanges;
  	private Statistics stats;
  
  	private static MaPacmanRPRuleProcessor instance;
! 
! 	public static IRPRuleProcessor get() {
! 		if (instance == null) {
  			instance = new MaPacmanRPRuleProcessor();
  		}
***************
*** 46,83 ****
  	}
  
! 	public void setContext(RPServerManager rpman)
! 	{
  		stats = Statistics.getStatistics();
! 		chatChanges = new Vector<RPObject>();	
  		world.setStats(getStats());
! 		this.rpman = rpman;
! 		(new MaPacmanZone("start",this.world)).initialize();
! 		(new MaPacmanZone("orginal",this.world)).initialize();
! 		(new MaPacmanZone("map1",this.world)).initialize();
! 		(new MaPacmanZone("small1",this.world)).initialize();
! 		(new MaPacmanZone("dungeon1",this.world)).initialize();
! 		(new MaPacmanZone("dungeon2",this.world)).initialize();
! 		logger.debug("MaPacman::MaPacmanRPRuleProcessor::start creating Zones finished");
! 		
  	}
  
! 	public Statistics getStats()
! 	{
  		return stats;
  	}
! 	
  	public boolean checkGameVersion(String game, String version) {
! 		if (game.equals(Constants.GAMENAME) && version.equals(Constants.VERSION))
  			return true;
! 		else
! 		{
  			return false;
  		}
! 			
  	}
  
! 	public boolean onActionAdd(RPObject object,
! 							   RPAction action,
! 							   List<RPAction> actionList) {
  		// TODO Auto-generated method stub
  		return true;
--- 42,76 ----
  	}
  
! 	public void setContext(RPServerManager rpman) {
  		stats = Statistics.getStatistics();
! 		chatChanges = new Vector<RPObject>();
  		world.setStats(getStats());
! 		(new MaPacmanZone("start", this.world)).initialize();
! 		(new MaPacmanZone("orginal", this.world)).initialize();
! 		(new MaPacmanZone("map1", this.world)).initialize();
! 		(new MaPacmanZone("small1", this.world)).initialize();
! 		(new MaPacmanZone("dungeon1", this.world)).initialize();
! 		(new MaPacmanZone("dungeon2", this.world)).initialize();
! 		logger
! 				.debug("MaPacman::MaPacmanRPRuleProcessor::start creating Zones finished");
! 
  	}
  
! 	public Statistics getStats() {
  		return stats;
  	}
! 
  	public boolean checkGameVersion(String game, String version) {
! 		if (game.equals(Constants.GAMENAME)
! 				&& version.equals(Constants.VERSION)) {
  			return true;
! 		} else {
  			return false;
  		}
! 
  	}
  
! 	public boolean onActionAdd(RPObject object, RPAction action,
! 			List<RPAction> actionList) {
  		// TODO Auto-generated method stub
  		return true;
***************
*** 85,99 ****
  
  	public void execute(RPObject object, RPAction action) {
! 		//System.out.println(action);
  		RPObject.ID id = object.getID();
! 		if(action.get("type").equals(Constants.CHATMESSAGE)) 
! 	    {
! 	      world.get(id).put("text",action.get("content"));
! 	      world.modify(world.get(id)); 
! 		  chatChanges.add(world.get(id));
! 	    }
! 		else if(action.get("type").equals(Constants.CHANGEDIR)) 
! 	    {
! 			world.get(id).put("nextdir",action.getInt("content"));
  			world.modify(world.get(id));
  		}
--- 78,89 ----
  
  	public void execute(RPObject object, RPAction action) {
! 		// System.out.println(action);
  		RPObject.ID id = object.getID();
! 		if (action.get("type").equals(Constants.CHATMESSAGE)) {
! 			world.get(id).put("text", action.get("content"));
! 			world.modify(world.get(id));
! 			chatChanges.add(world.get(id));
! 		} else if (action.get("type").equals(Constants.CHANGEDIR)) {
! 			world.get(id).put("nextdir", action.getInt("content"));
  			world.modify(world.get(id));
  		}
***************
*** 102,109 ****
  	synchronized public void beginTurn() {
  		// check for chat Messages
! 		for(RPObject object: chatChanges)
! 		{
! 			if(object.has("text"))
! 			{
  				object.remove("text");
  				world.modify(object);
--- 92,97 ----
  	synchronized public void beginTurn() {
  		// check for chat Messages
! 		for (RPObject object : chatChanges) {
! 			if (object.has("text")) {
  				object.remove("text");
  				world.modify(object);
***************
*** 111,115 ****
  		}
  		chatChanges.clear();
! 		
  		world.beginTurn();
  	}
--- 99,103 ----
  		}
  		chatChanges.clear();
! 
  		world.beginTurn();
  	}
***************
*** 117,204 ****
  	synchronized public void endTurn() {
  		// TODO Auto-generated method stub
! 		
  	}
  
  	synchronized public boolean onInit(RPObject object)
! 		throws RPObjectInvalidException 
! 	{
! 			object.put("zoneid","start");
! 			if(object.has("text")) object.remove("text");
! 			object.put("dir",Constants.DIR_NONE);
! 			object.put("power",0);
! 			object.put("nextdir",Constants.DIR_NONE);
! 			logger.debug("MaPacman::MaPacmanRPRuleProcessor::onInit Player "+object.get("name")+" entered");
! 			world.addPlayer(object);
! 			world.modify(object);
! 			return true;
  	}
  
  	synchronized public boolean onExit(RPObject object)
! 		throws RPObjectNotFoundException
! 	{
  		world.removePlayer(object.getID());
  		return true;
  	}
  
! 	synchronized public void onTimeout(RPObject object) throws RPObjectNotFoundException {
  		onExit(object);
  	}
  
!   public AccountResult createAccount(String username,
!                                      String password,
!                                      String email) {
!     TransactionPool transactionPool = TransactionPool.get();  
!     DBTransaction trans = transactionPool.beginWork();
!     AccountDAO accountDAO = DAORegister.get().get(AccountDAO.class);
!     try {
  
!       if (accountDAO.hasPlayer(trans, username)) {
!         //logger.warn("Account already exist: " + username);
!         return new AccountResult(Result.FAILED_PLAYER_EXISTS, username);
!       }
  
!       accountDAO.addPlayer(trans, username, Hash.hash(password), email);
  
!       transactionPool.commit(trans);
!       //logger.info("Account " + username + " created.");
  
!       return new AccountResult(Result.OK_CREATED, username);
!     } catch (SQLException e1) {
!       //logger.warn("SQL exception while trying to create a new account: ", e1);
!       transactionPool.rollback(trans);
!       return new AccountResult(Result.FAILED_EXCEPTION, username);
!     }
!   }
  
!   public CharacterResult createCharacter(String username,
!                                          String character,
!                                          RPObject tmpl) {
!     TransactionPool transactionPool = TransactionPool.get();  
!     DBTransaction trans = transactionPool.beginWork();
!     CharacterDAO characterDAO = DAORegister.get().get(CharacterDAO.class);
!     try {
  
!       if (characterDAO.hasCharacter(trans, username, character)) {
!         //logger.warn("Character already exist: " + character);
!         return new CharacterResult(Result.FAILED_PLAYER_EXISTS, character, tmpl);
!       }
!       RPObject object = new RPObject();
!       object.put("type", Constants.TYPE_PLAYER);
!       object.put("name", character);
!       object.put("text", "");
!       object.put("x", 0);
!       object.put("y", 0);
!       object.put("dir", -1);
!       object.put("score", 0);
!       characterDAO.addCharacter(trans, username, character, object);
!       transactionPool.commit(trans);
!       //logger.info("Character " + character + " created.");
!       return new CharacterResult(Result.OK_CREATED, character, object);
!     } catch (Exception e1) {
!       //logger.warn("SQL exception while trying to create a new character: ", e1);
!       transactionPool.rollback(trans);
!       return new CharacterResult(Result.FAILED_EXCEPTION, character, tmpl);
!     }
!   }
  
  }
--- 105,195 ----
  	synchronized public void endTurn() {
  		// TODO Auto-generated method stub
! 
  	}
  
  	synchronized public boolean onInit(RPObject object)
! 			throws RPObjectInvalidException {
! 		object.put("zoneid", "start");
! 		if (object.has("text")) {
! 			object.remove("text");
! 		}
! 		object.put("dir", Constants.DIR_NONE);
! 		object.put("power", 0);
! 		object.put("nextdir", Constants.DIR_NONE);
! 		logger.debug("MaPacman::MaPacmanRPRuleProcessor::onInit Player "
! 				+ object.get("name") + " entered");
! 		world.addPlayer(object);
! 		world.modify(object);
! 		return true;
  	}
  
  	synchronized public boolean onExit(RPObject object)
! 			throws RPObjectNotFoundException {
  		world.removePlayer(object.getID());
  		return true;
  	}
  
! 	synchronized public void onTimeout(RPObject object)
! 			throws RPObjectNotFoundException {
  		onExit(object);
  	}
  
! 	public AccountResult createAccount(String username, String password,
! 			String email) {
! 		TransactionPool transactionPool = TransactionPool.get();
! 		DBTransaction trans = transactionPool.beginWork();
! 		AccountDAO accountDAO = DAORegister.get().get(AccountDAO.class);
! 		try {
  
! 			if (accountDAO.hasPlayer(trans, username)) {
! 				// logger.warn("Account already exist: " + username);
! 				return new AccountResult(Result.FAILED_PLAYER_EXISTS, username);
! 			}
  
! 			accountDAO.addPlayer(trans, username, Hash.hash(password), email);
  
! 			transactionPool.commit(trans);
! 			// logger.info("Account " + username + " created.");
  
! 			return new AccountResult(Result.OK_CREATED, username);
! 		} catch (SQLException e1) {
! 			// logger.warn("SQL exception while trying to create a new account: ",
! 			// e1);
! 			transactionPool.rollback(trans);
! 			return new AccountResult(Result.FAILED_EXCEPTION, username);
! 		}
! 	}
  
! 	public CharacterResult createCharacter(String username, String character,
! 			RPObject tmpl) {
! 		TransactionPool transactionPool = TransactionPool.get();
! 		DBTransaction trans = transactionPool.beginWork();
! 		CharacterDAO characterDAO = DAORegister.get().get(CharacterDAO.class);
! 		try {
  
! 			if (characterDAO.hasCharacter(trans, username, character)) {
! 				// logger.warn("Character already exist: " + character);
! 				return new CharacterResult(Result.FAILED_PLAYER_EXISTS,
! 						character, tmpl);
! 			}
! 			RPObject object = new RPObject();
! 			object.put("type", Constants.TYPE_PLAYER);
! 			object.put("name", character);
! 			object.put("text", "");
! 			object.put("x", 0);
! 			object.put("y", 0);
! 			object.put("dir", -1);
! 			object.put("score", 0);
! 			characterDAO.addCharacter(trans, username, character, object);
! 			transactionPool.commit(trans);
! 			// logger.info("Character " + character + " created.");
! 			return new CharacterResult(Result.OK_CREATED, character, object);
! 		} catch (Exception e1) {
! 			// logger.warn("SQL exception while trying to create a new character: ",
! 			// e1);
! 			transactionPool.rollback(trans);
! 			return new CharacterResult(Result.FAILED_EXCEPTION, character, tmpl);
! 		}
! 	}
  
  }

Index: MaPacmanZone.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/server/MaPacmanZone.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MaPacmanZone.java	11 Jul 2009 15:06:52 -0000	1.21
--- MaPacmanZone.java	1 Nov 2009 16:04:24 -0000	1.22
***************
*** 21,32 ****
  
  public class MaPacmanZone extends MarauroaRPZone {
! 	
! 	private int x;
! 	private int y;
  	private boolean[][] collision;
  	private String zonename;
  	private MaPacmanRPWorld world;
  	private Dot[][] dots;
! 	private Vector <RPObject> Ghosts;
[...1310 lines suppressed...]
! 
! class zoneChangeNote
! {
  	ZoneChangePoint newZone;
  	RPObject object;
! 	
! 	public zoneChangeNote(RPObject object, ZoneChangePoint newZone)
! 	{
  		this.newZone = newZone;
  		this.object = object;
--- 708,716 ----
  }
  
! class zoneChangeNote {
  	ZoneChangePoint newZone;
  	RPObject object;
! 
! 	public zoneChangeNote(RPObject object, ZoneChangePoint newZone) {
  		this.newZone = newZone;
  		this.object = object;