[Arianne-commits] marauroa/src/marauroa/server/game/db JDBCDatabase.java, 1.54, 1.55

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

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

Modified Files:
	JDBCDatabase.java 
Log Message:
moved reading of configuration parameters out of singleton method into its own message to allow simpler subclassing for testing (and low level access needed by porting)

Index: JDBCDatabase.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/JDBCDatabase.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** JDBCDatabase.java	10 Oct 2007 22:05:21 -0000	1.54
--- JDBCDatabase.java	12 Oct 2007 23:28:55 -0000	1.55
***************
*** 100,126 ****
  
  	/**
! 	 * Returns an unique instance of the Database.
  	 *
! 	 * @return an unique instance of the Database.
  	 */
! 	public static JDBCDatabase getDatabase() {
! 		if (database == null) {
! 			Configuration conf = null;
  
! 			try {
! 				conf = Configuration.getConfiguration();
! 			} catch (Exception e) {
! 				logger.fatal("Unable to locate Configuration file: "
! 				        + Configuration.getConfigurationFile(), e);
! 				throw new NoDatabaseConfException();
! 			}
  
! 			Properties props = new Properties();
  
! 			props.put("jdbc_url", conf.get("jdbc_url"));
! 			props.put("jdbc_class", conf.get("jdbc_class"));
! 			props.put("jdbc_user", conf.get("jdbc_user"));
! 			props.put("jdbc_pwd", conf.get("jdbc_pwd"));
  
  			database = new JDBCDatabase(props);
  		}
--- 100,135 ----
  
  	/**
! 	 * Reads the database connection information
  	 *
! 	 * @return database connection information
  	 */
! 	protected static Properties getInitProps() {
! 		Configuration conf = null;
  
! 		try {
! 			conf = Configuration.getConfiguration();
! 		} catch (Exception e) {
! 			logger.fatal("Unable to locate Configuration file: "
! 			        + Configuration.getConfigurationFile(), e);
! 			throw new NoDatabaseConfException();
! 		}
  
! 		Properties props = new Properties();
  
! 		props.put("jdbc_url", conf.get("jdbc_url"));
! 		props.put("jdbc_class", conf.get("jdbc_class"));
! 		props.put("jdbc_user", conf.get("jdbc_user"));
! 		props.put("jdbc_pwd", conf.get("jdbc_pwd"));
! 		return props;
! 	}
  
+ 	/**
+ 	 * Returns an unique instance of the Database.
+ 	 *
+ 	 * @return an unique instance of the Database.
+ 	 */
+ 	public static JDBCDatabase getDatabase() {
+ 		if (database == null) {
+ 			Properties props = JDBCDatabase.getInitProps();
  			database = new JDBCDatabase(props);
  		}