From: Travis C. <tc...@us...> - 2008-04-10 22:34:33
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5164/ERExtensions/Sources/er/extensions Modified Files: Tag: Wonder_2_0_0_Branch ERXProperties.java Log Message: Minor fix to ERXProperties Index: ERXProperties.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXProperties.java,v retrieving revision 1.27.2.12 retrieving revision 1.27.2.13 diff -C2 -d -r1.27.2.12 -r1.27.2.13 *** ERXProperties.java 3 Mar 2008 23:42:00 -0000 1.27.2.12 --- ERXProperties.java 10 Apr 2008 22:34:30 -0000 1.27.2.13 *************** *** 122,126 **** */ public static String sourceVersionString() { ! NSDictionary versionDictionary = (NSDictionary)ERXFileUtilities.readPropertyListFromFileInFramework("version.plist", "JavaWebObjects", null); String versionString = (String) versionDictionary.objectForKey("SourceVersion"); --- 122,126 ---- */ public static String sourceVersionString() { ! NSDictionary versionDictionary = (NSDictionary)ERXFileUtilities.readPropertyListFromFileInFramework("version.plist", "JavaWebObjects"); String versionString = (String) versionDictionary.objectForKey("SourceVersion"); *************** *** 510,513 **** --- 510,546 ---- } + /** + * Returns an array of strings separated with the given separator string. + * + * @param key the key to lookup + * @param separator the separator (",") + * @return the array of strings or NSArray.EmptyArray if not found + */ + @SuppressWarnings("unchecked") + public static NSArray componentsSeparatedByString(String key, String separator) { + return ERXProperties.componentsSeparatedByStringWithDefault(key, separator, NSArray.EmptyArray); + } + + /** + * Returns an array of strings separated with the given separator string. + * + * @param key the key to lookup + * @param separator the separator (",") + * @param defaultValue the default array to return if there is no value + * @return the array of strings + */ + @SuppressWarnings("unchecked") + public static NSArray componentsSeparatedByStringWithDefault(String key, String separator, NSArray defaultValue) { + NSArray array; + String str = stringForKeyWithDefault(key, null); + if (str == null) { + array = defaultValue; + } + else { + array = NSArray.componentsSeparatedByString(str, separator); + } + return array; + } + /** * Sets an array in the System properties for |