From: Tim P <ti...@us...> - 2010-02-20 11:10:38
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8981/src/org/webmacro/util Modified Files: Settings.java Log Message: Typo in javadoc, make slightly more debuggable Index: Settings.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/Settings.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Settings.java 19 Mar 2008 09:54:24 -0000 1.18 --- Settings.java 20 Feb 2010 11:10:27 -0000 1.19 *************** *** 96,101 **** /** ! * Instantaite a new Settings object using the supplied ! * Settings as the defaults */ public Settings (Settings defaults) --- 96,101 ---- /** ! * Instantiate a new Settings object using the supplied ! * Settings as the defaults. */ public Settings (Settings defaults) *************** *** 181,191 **** String key = (String) e.nextElement(); if (prefix == null) ! _props.setProperty(key, props.getProperty(key)); ! else if (key.startsWith(dotPrefix)) ! _props.setProperty(key.substring(dotPrefix.length()), props.getProperty(key)); } } /** * Load settings from a Properties --- 181,196 ---- String key = (String) e.nextElement(); if (prefix == null) ! setProperty(_props,key, props.getProperty(key)); ! else if (key.startsWith(dotPrefix)) { ! setProperty(_props,key.substring(dotPrefix.length()), props.getProperty(key)); + } } } + private static void setProperty(Properties props, String key, String value) { + //System.out.println("Setting " + key + " to " + value); + props.setProperty(key, value); + } /** * Load settings from a Properties |