[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida Pyxida.java, 1.24, 1.25

[Peter P. <pr...@us...>]

Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27511/src/edu/harvard/syrah/pyxida

Modified Files:
	Pyxida.java 
Log Message:
Updated handling of config parameters

Index: Pyxida.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/Pyxida.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Pyxida.java	30 Mar 2007 18:03:27 -0000	1.24
--- Pyxida.java	20 Jul 2007 13:22:18 -0000	1.25
***************
*** 27,36 ****
  		 * All config properties in the file must start with 'pyxida.'
  		 */
! 		Config.read("pyxida", System.getProperty("config", "config/pyxida.cfg"));
  	}
  	
- 	private static final String CONFIG_FILE = System.getProperty("config",
- 			"config/pyxida.cfg");
- 
  	// Imperial blocks ports outside of 55000-56999
  	public static final int COMM_PORT = Integer.parseInt(Config.getConfigProps().getProperty("port", "55504"));  
--- 27,33 ----
  		 * All config properties in the file must start with 'pyxida.'
  		 */
! 		Config.read("pyxida", System.getProperty("pyxida.config", "config/pyxida.cfg"));
  	}
  	
  	// Imperial blocks ports outside of 55000-56999
  	public static final int COMM_PORT = Integer.parseInt(Config.getConfigProps().getProperty("port", "55504"));  
***************
*** 50,55 ****
  	public static Random random;
  
! 	private Pyxida() {
! 	}
  
  	private void init(final CB0 cbDone) {
--- 47,51 ----
  	public static Random random;
  
! 	private Pyxida() { /* empty */ }
  
  	private void init(final CB0 cbDone) {