[pcgen-commit-svn] SF.net SVN: pcgen: [1006] Branches/5.10.x/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java

[<boo...@us...>]

Revision: 1006
Author:   boomer70
Date:     2006-05-22 18:23:29 -0700 (Mon, 22 May 2006)
ViewCVS:  http://svn.sourceforge.net/pcgen/?rev=1006&view=rev

Log Message:
-----------
Fix for [ 1380461 ] [GUI] Skill list display issues and [ 1252859 ] Sorting equipment on cost has trouble with basetypes.

Modified Paths:
--------------
    Branches/5.10.x/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java
Modified: Branches/5.10.x/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java
===================================================================
--- Branches/5.10.x/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java	2006-05-23 01:22:09 UTC (rev 1005)
+++ Branches/5.10.x/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java	2006-05-23 01:23:29 UTC (rev 1006)
@@ -106,7 +106,7 @@
 	}
 
 	/**
-	 * Sort the node on the column 
+	 * Sort the node on the column
 	 * @return a PObject
 	 */
 	public PObjectNode sortNodeOnColumn()
@@ -144,10 +144,10 @@
 				Logging.errorPrint("", exc);
 			}
 
-			if (pir == null)
-			{
-				continue;
-			}
+//			if (pir == null)
+//			{
+//				continue;
+//			}
 
 			if (pir instanceof String)
 			{
@@ -161,7 +161,7 @@
 
 		isAscending = ascending == 0;
 		Collections.sort(itemsToSort,
-		    new Comparator()
+			new Comparator()
 			{
 				public int compare(Object obj1, Object obj2)
 				{
@@ -169,6 +169,11 @@
 					final Object o2 = ((ArrayList) obj2).get(1);
 					int iRet = -1;
 
+					if (o1 == null || o2 == null)
+					{
+						return 0;
+					}
+
 					//Globals.debugPrint("obj1:" + o1.getClass().getName() + ":" + o1 + "  obj2:" + o2.getClass().getName() + ":" + o2);
 					if (o1 instanceof Integer)
 					{
@@ -201,7 +206,7 @@
 					return iRet;
 				}
 
-		        private String stripHTML(String string) {
+				private String stripHTML(String string) {
 					int index = string.indexOf('<');
 					int endIndex = string.indexOf('>');
 					while (index != -1 && endIndex != -1) {
@@ -210,7 +215,7 @@
 						endIndex = string.indexOf('>');
 					}
 					return string;
-		        }
+				}
 			});
 
 		for (int i = 0; i < itemsToSort.size(); i++)


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