[Arianne-commits] marauroa/src/marauroa/server/game/db IDatabase.java, 1.13, 1.14 JDBCDatabase.java, 1.20, 1.21 JDBCTransaction.java, 1.7, 1.8 Transaction.java, 1.4, 1.5

[Miguel A. B. L. <ari...@us...>]

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

Modified Files:
	IDatabase.java JDBCDatabase.java JDBCTransaction.java 
	Transaction.java 
Log Message:
fixed [ 1656204 ] Marauroa: JDBCTransaction should move methods to 
Transaction


Index: JDBCTransaction.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/JDBCTransaction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JDBCTransaction.java	19 Feb 2007 18:37:25 -0000	1.7
--- JDBCTransaction.java	28 Feb 2007 20:37:50 -0000	1.8
***************
*** 26,30 ****
   *
   */
! public class JDBCTransaction extends Transaction {
  	/** the logger instance. */
  	private static final marauroa.common.Logger logger = Log4J.getLogger(JDBCTransaction.class);
--- 26,30 ----
   *
   */
! public class JDBCTransaction implements Transaction {
  	/** the logger instance. */
  	private static final marauroa.common.Logger logger = Log4J.getLogger(JDBCTransaction.class);
***************
*** 42,46 ****
  	/**
  	 * Sets Connection
! 	 * 
  	 * @param connection  a Connection
  	 */
--- 42,46 ----
  	/**
  	 * Sets Connection
! 	 *
  	 * @param connection  a Connection
  	 */
***************
*** 51,55 ****
  	/**
  	 * Returns Connection
! 	 * 
  	 * @return a Connection
  	 */
--- 51,55 ----
  	/**
  	 * Returns Connection
! 	 *
  	 * @return a Connection
  	 */
***************
*** 58,64 ****
  	}
  
! 	/** 
! 	 * Starts a transaction 
! 	 * @throws SQLException 
  	 */
  	public void begin() throws SQLException {
--- 58,64 ----
  	}
  
! 	/**
! 	 * Starts a transaction
! 	 * @throws SQLException
  	 */
  	public void begin() throws SQLException {
***************
*** 69,75 ****
  	/**
  	 * commits the changes made to backstore.
! 	 * 
  	 * @exception TransactionException if the underlaying backstore throws an Exception
! 	 * @throws SQLException 
  	 */
  	public void commit() throws SQLException {
--- 69,75 ----
  	/**
  	 * commits the changes made to backstore.
! 	 *
  	 * @exception TransactionException if the underlaying backstore throws an Exception
! 	 * @throws SQLException
  	 */
  	public void commit() throws SQLException {
***************
*** 78,83 ****
  	}
  
! 	/** 
! 	 * Makes previous changes to backstore invalid 
  	 */
  	public void rollback() throws SQLException {
--- 78,83 ----
  	}
  
! 	/**
! 	 * Makes previous changes to backstore invalid
  	 */
  	public void rollback() throws SQLException {

Index: IDatabase.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/IDatabase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IDatabase.java	27 Feb 2007 22:38:15 -0000	1.13
--- IDatabase.java	28 Feb 2007 20:37:50 -0000	1.14
***************
*** 39,43 ****
  	 * @throws SQLException
  	 */
! 	public void addPlayer(JDBCTransaction transaction, String username,
  			byte[] password, String email) throws SQLException;
  
--- 39,43 ----
  	 * @throws SQLException
  	 */
! 	public void addPlayer(Transaction transaction, String username,
  			byte[] password, String email) throws SQLException;
  
***************
*** 54,58 ****
  	 * @return the generated player id
  	 */
! 	public String generatePlayer(JDBCTransaction transaction, String pattern) throws SQLException;
  
  	/**
--- 54,58 ----
  	 * @return the generated player id
  	 */
! 	public String generatePlayer(Transaction transaction, String pattern) throws SQLException;
  
  	/**
***************
*** 65,69 ****
  	 * @throws SQLException
  	 */
! 	public void changePassword(JDBCTransaction transaction, String username, String password) throws SQLException;
  
  	/**
--- 65,69 ----
  	 * @throws SQLException
  	 */
! 	public void changePassword(Transaction transaction, String username, String password) throws SQLException;
  
  	/**
***************
*** 75,79 ****
  	 * @throws SQLException
  	 */
! 	public void changeEmail(JDBCTransaction transaction, String username, String email) throws SQLException;
  
  	/**
--- 75,79 ----
  	 * @throws SQLException
  	 */
! 	public void changeEmail(Transaction transaction, String username, String email) throws SQLException;
  
  	/**
***************
*** 84,88 ****
  	 * @throws SQLException
  	 */
! 	public boolean removePlayer(JDBCTransaction transaction, String username) throws SQLException;
  
  	/**
--- 84,88 ----
  	 * @throws SQLException
  	 */
! 	public boolean removePlayer(Transaction transaction, String username) throws SQLException;
  
  	/**
***************
*** 93,97 ****
  	 * @throws SQLException if there is a database problem.
  	 */
! 	public boolean hasPlayer(JDBCTransaction transaction, String username)
  			throws SQLException;
  
--- 93,97 ----
  	 * @throws SQLException if there is a database problem.
  	 */
! 	public boolean hasPlayer(Transaction transaction, String username)
  			throws SQLException;
  
***************
*** 108,112 ****
  	 * @throws SQLException if there is a database problem
  	 */
! 	public void setAccountStatus(JDBCTransaction transaction, String username,
  			String status) throws SQLException;
  
--- 108,112 ----
  	 * @throws SQLException if there is a database problem
  	 */
! 	public void setAccountStatus(Transaction transaction, String username,
  			String status) throws SQLException;
  
***************
*** 119,123 ****
  	 * @throws SQLException if there is any database problem
  	 */
! 	public String getAccountStatus(JDBCTransaction transaction, String username) throws SQLException;
  
  	/**
--- 119,123 ----
  	 * @throws SQLException if there is any database problem
  	 */
! 	public String getAccountStatus(Transaction transaction, String username) throws SQLException;
  
  	/**
***************
*** 131,135 ****
  	 * @throws IOException if RPObject can NOT be serialized
  	 */
! 	public void addCharacter(JDBCTransaction transaction, String username,
  			String character, RPObject player) throws SQLException, IOException;
  
--- 131,135 ----
  	 * @throws IOException if RPObject can NOT be serialized
  	 */
! 	public void addCharacter(Transaction transaction, String username,
  			String character, RPObject player) throws SQLException, IOException;
  
***************
*** 143,147 ****
  	 * @throws SQLException if there is any database problem
  	 */
! 	public boolean removeCharacter(JDBCTransaction transaction,
  			String username, String character) throws SQLException;
  
--- 143,147 ----
  	 * @throws SQLException if there is any database problem
  	 */
! 	public boolean removeCharacter(Transaction transaction,
  			String username, String character) throws SQLException;
  
***************
*** 155,159 ****
  	 * @throws SQLException if there is any problem with database
  	 */
! 	public boolean hasCharacter(JDBCTransaction transaction, String username,
  			String character) throws SQLException;
  
--- 155,159 ----
  	 * @throws SQLException if there is any problem with database
  	 */
! 	public boolean hasCharacter(Transaction transaction, String username,
  			String character) throws SQLException;
  
***************
*** 166,170 ****
  	 * @throws SQLException if there is any database problem.
  	 */
! 	public List<String> getCharacters(JDBCTransaction transaction,
  			String username) throws SQLException;
  
--- 166,170 ----
  	 * @throws SQLException if there is any database problem.
  	 */
! 	public List<String> getCharacters(Transaction transaction,
  			String username) throws SQLException;
  
***************
*** 180,184 ****
  	 * @throws IOException if player can NOT be serialized
  	 */
! 	public RPObject loadCharacter(JDBCTransaction transaction, String username, String character) throws SQLException, IOException;
  
  	/**
--- 180,184 ----
  	 * @throws IOException if player can NOT be serialized
  	 */
! 	public RPObject loadCharacter(Transaction transaction, String username, String character) throws SQLException, IOException;
  
  	/**
***************
*** 192,196 ****
  	 * @throws IOException if player can NOT be serialized
  	 */
! 	public void storeCharacter(JDBCTransaction transaction, String username, String character, RPObject player) throws SQLException, IOException;
  
  	/**
--- 192,196 ----
  	 * @throws IOException if player can NOT be serialized
  	 */
! 	public void storeCharacter(Transaction transaction, String username, String character, RPObject player) throws SQLException, IOException;
  
  	/**
***************
*** 204,208 ****
  	 * @throws SQLException
  	 */
! 	public void storeRPZone(JDBCTransaction transaction, IRPZone zone) throws IOException, SQLException;
  
  	/**
--- 204,208 ----
  	 * @throws SQLException
  	 */
! 	public void storeRPZone(Transaction transaction, IRPZone zone) throws IOException, SQLException;
  
  	/**
***************
*** 214,218 ****
  	 * @throws IOException
  	 */
! 	public void loadRPZone(JDBCTransaction transaction, IRPZone zone) throws SQLException, IOException;
  
  	/**
--- 214,218 ----
  	 * @throws IOException
  	 */
! 	public void loadRPZone(Transaction transaction, IRPZone zone) throws SQLException, IOException;
  
  	/**
***************
*** 224,228 ****
  	 * @param params any params the event may need.
  	 */
! 	public void addGameEvent(JDBCTransaction trans, String source, String event, String... params);
  
  	/**
--- 224,228 ----
  	 * @param params any params the event may need.
  	 */
! 	public void addGameEvent(Transaction trans, String source, String event, String... params);
  
  	/**
***************
*** 231,235 ****
  	 * @param var the statistics variables. @See marauroa.server.game.Statistics.Variables
  	 */
! 	public void addStatisticsEvent(JDBCTransaction trans, Variables var);
  
  
--- 231,235 ----
  	 * @param var the statistics variables. @See marauroa.server.game.Statistics.Variables
  	 */
! 	public void addStatisticsEvent(Transaction trans, Variables var);
  
  
***************
*** 241,245 ****
  	 * @throws SQLException if there is any database problem.
  	 */
! 	public boolean verify(JDBCTransaction transaction,
  			PlayerEntry.SecuredLoginInfo informations) throws SQLException;
  
--- 241,245 ----
  	 * @throws SQLException if there is any database problem.
  	 */
! 	public boolean verify(Transaction transaction,
  			PlayerEntry.SecuredLoginInfo informations) throws SQLException;
  
***************
*** 253,257 ****
  	 * @throws SQLException if there is any problem such as a player that doesn't exist
  	 */
! 	public void addLoginEvent(JDBCTransaction transaction,
  			String username, InetSocketAddress source, boolean correctLogin)
  			throws SQLException;
--- 253,257 ----
  	 * @throws SQLException if there is any problem such as a player that doesn't exist
  	 */
! 	public void addLoginEvent(Transaction transaction,
  			String username, InetSocketAddress source, boolean correctLogin)
  			throws SQLException;
***************
*** 266,270 ****
  	 * @throws SQLException if there is any database problem.
  	 */
! 	public List<String> getLoginEvents(JDBCTransaction transaction, String username, int events) throws SQLException;
  
  	/**
--- 266,270 ----
  	 * @throws SQLException if there is any database problem.
  	 */
! 	public List<String> getLoginEvents(Transaction transaction, String username, int events) throws SQLException;
  
  	/**
***************
*** 275,282 ****
  	 * @throws SQLException if there is any database problem.
  	 */
! 	public List<InetAddressMask> getBannedAddresses(JDBCTransaction transaction) throws SQLException;
  
  	/** This method returns a transaction to the database. */
! 	// TODO: Generalize it.
! 	public JDBCTransaction getTransaction();
  }
--- 275,281 ----
  	 * @throws SQLException if there is any database problem.
  	 */
! 	public List<InetAddressMask> getBannedAddresses(Transaction transaction) throws SQLException;
  
  	/** This method returns a transaction to the database. */
! 	public Transaction getTransaction();
  }

Index: Transaction.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/Transaction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Transaction.java	10 Feb 2007 18:23:03 -0000	1.4
--- Transaction.java	28 Feb 2007 20:37:50 -0000	1.5
***************
*** 17,45 ****
  
  /**
!  * This class represents a transaction which can be used to retrieve/store/change in Database. 
   * <p>
   * Different Database implementaions may requiere different implementations of this class.
   */
! public class Transaction {
! 	/** 
! 	 * Starts a transaction 
! 	 * @throws SQLException 
  	 */
! 	public void begin() throws SQLException {
! 	}
  
  	/**
  	 * commits the changes made to backstore.
! 	 * 
  	 * @exception TransactionException if the underlaying backstore throws an Exception
! 	 * @throws SQLException 
  	 */
! 	public void commit() throws SQLException {
! 	}
  
! 	/** 
! 	 * Makes previous changes to backstore invalid 
  	 */
! 	public void rollback() throws SQLException {
! 	}
  }
--- 17,49 ----
  
  /**
!  * This class represents a transaction which can be used to retrieve/store/change in Database.
   * <p>
   * Different Database implementaions may requiere different implementations of this class.
   */
! public interface Transaction {
! 	/**
! 	 * Returns Connection
! 	 *
! 	 * @return a Connection
  	 */
! 	public java.sql.Connection getConnection();
! 
! 	/**
! 	 * Starts a transaction
! 	 * @throws SQLException
! 	 */
! 	public void begin() throws SQLException;
  
  	/**
  	 * commits the changes made to backstore.
! 	 *
  	 * @exception TransactionException if the underlaying backstore throws an Exception
! 	 * @throws SQLException
  	 */
! 	public void commit() throws SQLException;
  
! 	/**
! 	 * Makes previous changes to backstore invalid
  	 */
! 	public void rollback() throws SQLException;
  }

Index: JDBCDatabase.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/JDBCDatabase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** JDBCDatabase.java	27 Feb 2007 22:38:16 -0000	1.20
--- JDBCDatabase.java	28 Feb 2007 20:37:50 -0000	1.21
***************
*** 82,86 ****
  
  		sql=JDBCSQLHelper.get();
! 		transaction=getTransaction();
  
  		initialize();
--- 82,86 ----
  
  		sql=JDBCSQLHelper.get();
! 		transaction=(JDBCTransaction)getTransaction();
  
  		initialize();
***************
*** 169,173 ****
  	 * @return a valid transaction.
  	 */
! 	public JDBCTransaction getTransaction() {
  		if (transaction == null || !transaction.isValid()) {
  			transaction = new JDBCTransaction(createConnection(connInfo));
--- 169,173 ----
  	 * @return a valid transaction.
  	 */
! 	public Transaction getTransaction() {
  		if (transaction == null || !transaction.isValid()) {
  			transaction = new JDBCTransaction(createConnection(connInfo));
***************
*** 178,184 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#addPlayer(marauroa.server.game.db.JDBCTransaction, java.lang.String, byte[], java.lang.String)
  	 */
! 	public void addPlayer(JDBCTransaction transaction, String username, byte[] password, String email) throws SQLException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(email)) {
--- 178,184 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#addPlayer(marauroa.server.game.db.Transaction, java.lang.String, byte[], java.lang.String)
  	 */
! 	public void addPlayer(Transaction transaction, String username, byte[] password, String email) throws SQLException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(email)) {
***************
*** 209,215 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#generatePlayer(marauroa.server.game.db.JDBCTransaction, java.lang.String)
  	 */
! 	public String generatePlayer(JDBCTransaction transaction, String pattern) throws SQLException {
  		int length=pattern.length();
  		Random rand=new Random();
--- 209,215 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#generatePlayer(marauroa.server.game.db.Transaction, java.lang.String)
  	 */
! 	public String generatePlayer(Transaction transaction, String pattern) throws SQLException {
  		int length=pattern.length();
  		Random rand=new Random();
***************
*** 235,241 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#changeEmail(marauroa.server.game.db.JDBCTransaction, java.lang.String, java.lang.String)
  	 */
! 	public void changeEmail(JDBCTransaction transaction, String username, String email) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
--- 235,241 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#changeEmail(marauroa.server.game.db.Transaction, java.lang.String, java.lang.String)
  	 */
! 	public void changeEmail(Transaction transaction, String username, String email) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
***************
*** 260,266 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#changePassword(marauroa.server.game.db.JDBCTransaction, java.lang.String, byte[])
  	 */
! 	public void changePassword(JDBCTransaction transaction, String username, String password) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
--- 260,266 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#changePassword(marauroa.server.game.db.Transaction, java.lang.String, byte[])
  	 */
! 	public void changePassword(Transaction transaction, String username, String password) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
***************
*** 287,293 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#removePlayer(marauroa.server.game.db.JDBCTransaction, java.lang.String)
  	 */
! 	public boolean removePlayer(JDBCTransaction transaction, String username) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
--- 287,293 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#removePlayer(marauroa.server.game.db.Transaction, java.lang.String)
  	 */
! 	public boolean removePlayer(Transaction transaction, String username) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
***************
*** 317,323 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#hasPlayer(marauroa.server.game.db.JDBCTransaction, java.lang.String)
  	 */
! 	public boolean hasPlayer(JDBCTransaction transaction, String username) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
--- 317,323 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#hasPlayer(marauroa.server.game.db.Transaction, java.lang.String)
  	 */
! 	public boolean hasPlayer(Transaction transaction, String username) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
***************
*** 348,354 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#setAccountStatus(marauroa.server.game.db.JDBCTransaction, java.lang.String, java.lang.String)
  	 */
! 	public void setAccountStatus(JDBCTransaction transaction, String username, String status) throws SQLException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(status)) {
--- 348,354 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#setAccountStatus(marauroa.server.game.db.Transaction, java.lang.String, java.lang.String)
  	 */
! 	public void setAccountStatus(Transaction transaction, String username, String status) throws SQLException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(status)) {
***************
*** 371,377 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#getAccountStatus(marauroa.server.game.db.JDBCTransaction, java.lang.String)
  	 */
! 	public String getAccountStatus(JDBCTransaction transaction, String username) throws SQLException {
  		try{
  			Connection connection = transaction.getConnection();
--- 371,377 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.IPlayerAccess#getAccountStatus(marauroa.server.game.db.Transaction, java.lang.String)
  	 */
! 	public String getAccountStatus(Transaction transaction, String username) throws SQLException {
  		try{
  			Connection connection = transaction.getConnection();
***************
*** 404,408 ****
  	}
  
! 	private int getDatabasePlayerId(JDBCTransaction trans, String username) throws SQLException {
  		Connection connection = trans.getConnection();
  		Statement stmt = connection.createStatement();
--- 404,408 ----
  	}
  
! 	private int getDatabasePlayerId(Transaction trans, String username) throws SQLException {
  		Connection connection = trans.getConnection();
  		Statement stmt = connection.createStatement();
***************
*** 431,437 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ICharacterAccess#addCharacter(marauroa.server.game.db.JDBCTransaction, java.lang.String, java.lang.String, marauroa.common.game.RPObject)
  	 */
! 	public void addCharacter(JDBCTransaction transaction, String username, String character, RPObject player) throws SQLException, IOException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
--- 431,437 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ICharacterAccess#addCharacter(marauroa.server.game.db.Transaction, java.lang.String, java.lang.String, marauroa.common.game.RPObject)
  	 */
! 	public void addCharacter(Transaction transaction, String username, String character, RPObject player) throws SQLException, IOException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
***************
*** 460,466 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ICharacterAccess#removeCharacter(marauroa.server.game.db.JDBCTransaction, java.lang.String, java.lang.String)
  	 */
! 	public boolean removeCharacter(JDBCTransaction transaction, String username, String character) throws SQLException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
--- 460,466 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ICharacterAccess#removeCharacter(marauroa.server.game.db.Transaction, java.lang.String, java.lang.String)
  	 */
! 	public boolean removeCharacter(Transaction transaction, String username, String character) throws SQLException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
***************
*** 501,507 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ICharacterAccess#hasCharacter(marauroa.server.game.db.JDBCTransaction, java.lang.String, java.lang.String)
  	 */
! 	public boolean hasCharacter(JDBCTransaction transaction, String username, String character) throws SQLException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
--- 501,507 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ICharacterAccess#hasCharacter(marauroa.server.game.db.Transaction, java.lang.String, java.lang.String)
  	 */
! 	public boolean hasCharacter(Transaction transaction, String username, String character) throws SQLException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
***************
*** 537,543 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ICharacterAccess#getCharacters(marauroa.server.game.db.JDBCTransaction, java.lang.String)
  	 */
! 	public List<String> getCharacters(JDBCTransaction transaction, String username) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
--- 537,543 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ICharacterAccess#getCharacters(marauroa.server.game.db.Transaction, java.lang.String)
  	 */
! 	public List<String> getCharacters(Transaction transaction, String username) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
***************
*** 585,589 ****
  	 * @throws IOException
  	 */
! 	public void storeCharacter(JDBCTransaction transaction, String username, String character, RPObject player) throws SQLException, IOException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
--- 585,589 ----
  	 * @throws IOException
  	 */
! 	public void storeCharacter(Transaction transaction, String username, String character, RPObject player) throws SQLException, IOException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
***************
*** 617,621 ****
  	 * @throws IOException
  	 */
! 	public RPObject loadCharacter(JDBCTransaction transaction, String username, String character) throws SQLException, IOException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
--- 617,621 ----
  	 * @throws IOException
  	 */
! 	public RPObject loadCharacter(Transaction transaction, String username, String character) throws SQLException, IOException {
  		try {
  			if (!StringChecker.validString(username) || !StringChecker.validString(character)) {
***************
*** 652,656 ****
  	 *
  	 */
! 	public void loadRPZone(JDBCTransaction transaction, IRPZone zone) throws SQLException, IOException {
  		String zoneid=zone.getID().getID();
  		if (!StringChecker.validString(zoneid)) {
--- 652,656 ----
  	 *
  	 */
! 	public void loadRPZone(Transaction transaction, IRPZone zone) throws SQLException, IOException {
  		String zoneid=zone.getID().getID();
  		if (!StringChecker.validString(zoneid)) {
***************
*** 715,721 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#storeRPZone(marauroa.server.game.db.JDBCTransaction, marauroa.common.game.IRPZone)
  	 */
! 	public void storeRPZone(JDBCTransaction transaction, IRPZone zone) throws IOException, SQLException {
  		String zoneid=zone.getID().getID();
  		if (!StringChecker.validString(zoneid)) {
--- 715,721 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#storeRPZone(marauroa.server.game.db.Transaction, marauroa.common.game.IRPZone)
  	 */
! 	public void storeRPZone(Transaction transaction, IRPZone zone) throws IOException, SQLException {
  		String zoneid=zone.getID().getID();
  		if (!StringChecker.validString(zoneid)) {
***************
*** 764,775 ****
  	}
  
! 	private boolean hasRPZone(JDBCTransaction transaction, IRPZone.ID zone) {
  		return false;
  	}
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ILoginEventsAccess#verify(marauroa.server.game.db.JDBCTransaction, marauroa.server.game.container.PlayerEntry.SecuredLoginInfo)
  	 */
! 	public boolean verify(JDBCTransaction transaction, PlayerEntry.SecuredLoginInfo informations) throws SQLException {
  		try {
  			if (Hash.compare(Hash.hash(informations.clientNonce),informations.clientNonceHash) != 0) {
--- 764,775 ----
  	}
  
! 	private boolean hasRPZone(Transaction transaction, IRPZone.ID zone) {
  		return false;
  	}
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ILoginEventsAccess#verify(marauroa.server.game.db.Transaction, marauroa.server.game.container.PlayerEntry.SecuredLoginInfo)
  	 */
! 	public boolean verify(Transaction transaction, PlayerEntry.SecuredLoginInfo informations) throws SQLException {
  		try {
  			if (Hash.compare(Hash.hash(informations.clientNonce),informations.clientNonceHash) != 0) {
***************
*** 833,839 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ILoginEventsAccess#addLoginEvent(marauroa.server.game.db.JDBCTransaction, java.lang.String, java.net.InetSocketAddress, boolean)
  	 */
! 	public void addLoginEvent(JDBCTransaction transaction, String username, InetSocketAddress source, boolean correctLogin) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
--- 833,839 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ILoginEventsAccess#addLoginEvent(marauroa.server.game.db.Transaction, java.lang.String, java.net.InetSocketAddress, boolean)
  	 */
! 	public void addLoginEvent(Transaction transaction, String username, InetSocketAddress source, boolean correctLogin) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
***************
*** 900,906 ****
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ILoginEventsAccess#getLoginEvents(marauroa.server.game.db.JDBCTransaction, java.lang.String)
  	 */
! 	public List<String> getLoginEvents(JDBCTransaction transaction, String username, int events) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
--- 900,906 ----
  
  	/* (non-Javadoc)
! 	 * @see marauroa.server.game.db.nio.ILoginEventsAccess#getLoginEvents(marauroa.server.game.db.Transaction, java.lang.String)
  	 */
! 	public List<String> getLoginEvents(Transaction transaction, String username, int events) throws SQLException {
  		try {
  			if (!StringChecker.validString(username)) {
***************
*** 941,945 ****
  	 * @see marauroa.server.game.db.nio.IEventsAccess#addGameEvent(marauroa.server.game.db.Transaction, java.lang.String, java.lang.String, java.lang.String)
  	 */
! 	public void addGameEvent(JDBCTransaction trans, String source, String event, String... params) {
  		try {
  			Connection connection = trans.getConnection();
--- 941,945 ----
  	 * @see marauroa.server.game.db.nio.IEventsAccess#addGameEvent(marauroa.server.game.db.Transaction, java.lang.String, java.lang.String, java.lang.String)
  	 */
! 	public void addGameEvent(Transaction trans, String source, String event, String... params) {
  		try {
  			Connection connection = trans.getConnection();
***************
*** 971,975 ****
  	 * @see marauroa.server.game.db.nio.IEventsAccess#addStatisticsEvent(marauroa.server.game.db.Transaction, marauroa.server.game.Statistics.Variables)
  	 */
! 	public void addStatisticsEvent(JDBCTransaction trans, Variables var) {
  		try {
  			Connection connection = trans.getConnection();
--- 971,975 ----
  	 * @see marauroa.server.game.db.nio.IEventsAccess#addStatisticsEvent(marauroa.server.game.db.Transaction, marauroa.server.game.Statistics.Variables)
  	 */
! 	public void addStatisticsEvent(Transaction trans, Variables var) {
  		try {
  			Connection connection = trans.getConnection();
***************
*** 990,994 ****
  	}
  
! 	private RPObject loadRPObject(JDBCTransaction transaction, int objectid) throws SQLException, IOException {
  		Connection connection = transaction.getConnection();
  
--- 990,994 ----
  	}
  
! 	private RPObject loadRPObject(Transaction transaction, int objectid) throws SQLException, IOException {
  		Connection connection = transaction.getConnection();
  
***************
*** 1040,1044 ****
  	}
  
! 	private int removeRPObject(JDBCTransaction transaction, int objectid) throws SQLException {
  		Connection connection = transaction.getConnection();
  
--- 1040,1044 ----
  	}
  
! 	private int removeRPObject(Transaction transaction, int objectid) throws SQLException {
  		Connection connection = transaction.getConnection();
  
***************
*** 1054,1058 ****
  	}
  
! 	private boolean hasRPObject(JDBCTransaction transaction, int objectid) throws SQLException {
  		Connection connection = transaction.getConnection();
  		Statement stmt = connection.createStatement();
--- 1054,1058 ----
  	}
  
! 	private boolean hasRPObject(Transaction transaction, int objectid) throws SQLException {
  		Connection connection = transaction.getConnection();
  		Statement stmt = connection.createStatement();
***************
*** 1077,1081 ****
  	}
  
! 	private int storeRPObject(JDBCTransaction transaction, RPObject object) throws IOException, SQLException {
  		Connection connection = transaction.getConnection();
  
--- 1077,1081 ----
  	}
  
! 	private int storeRPObject(Transaction transaction, RPObject object) throws IOException, SQLException {
  		Connection connection = transaction.getConnection();
  
***************
*** 1139,1145 ****
  	/*
  	 * (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#getBannedAddresses(marauroa.server.game.db.JDBCTransaction)
  	 */
! 	public List<InetAddressMask> getBannedAddresses(JDBCTransaction transaction) throws SQLException {
  		List<InetAddressMask> permanentBans=new LinkedList<InetAddressMask>();
  
--- 1139,1145 ----
  	/*
  	 * (non-Javadoc)
! 	 * @see marauroa.server.game.db.IDatabase#getBannedAddresses(marauroa.server.game.db.Transaction)
  	 */
! 	public List<InetAddressMask> getBannedAddresses(Transaction transaction) throws SQLException {
  		List<InetAddressMask> permanentBans=new LinkedList<InetAddressMask>();