[pcgen-commit-svn] SF.net SVN: pcgen: [956] Trunk/pcgen/code/src/java/pcgen/core

[<jde...@us...>]

Revision: 956
Author:   jdempsey
Date:     2006-05-06 02:11:50 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/pcgen/?rev=956&view=rev

Log Message:
-----------
Fix part of bug [ 1465781 ] EQMOD NAMEOPT issues - Hide metamagic section when no metamagic

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java
    Trunk/pcgen/code/src/java/pcgen/core/utils/CoreUtility.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java	2006-05-06 02:11:35 UTC (rev 955)
+++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java	2006-05-06 09:11:50 UTC (rev 956)
@@ -914,7 +914,7 @@
 					aString.append(" (").append(info).append(')');
 				}
 
-				if (metaFeats.size() != 0)
+				if (!metaFeats.isEmpty())
 				{
 					aString.append('/').append(CoreUtility.join(metaFeats, "/"));
 				}

Modified: Trunk/pcgen/code/src/java/pcgen/core/utils/CoreUtility.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/utils/CoreUtility.java	2006-05-06 02:11:35 UTC (rev 955)
+++ Trunk/pcgen/code/src/java/pcgen/core/utils/CoreUtility.java	2006-05-06 09:11:50 UTC (rev 956)
@@ -509,10 +509,14 @@
 	 * @param  separator  The separator that separates the string.
 	 * @return            a List of Strings
 	 */
-	public static List split(final String aString, final char separator)
+	public static List<String> split(final String aString, final char separator)
 	{
-		ArrayList temp = new ArrayList();
+		ArrayList<String> temp = new ArrayList<String>();
 		String sepStr = "\\" + String.valueOf(separator);
+		if (aString.trim().length() == 0)
+		{
+			return temp;
+		}
 		
 		for (Iterator iter = Arrays.asList(aString.split(sepStr)).iterator(); iter
 			.hasNext();)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.