[pcgen-commit-svn] SF.net SVN: pcgen:[15101] sandbox/uisync/code/src/java/pcgen

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

Revision: 15101
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15101&view=rev
Author:   jdempsey
Date:     2011-06-12 00:05:51 +0000 (Sun, 12 Jun 2011)

Log Message:
-----------
Add support for SORTKEY to new UI

Modified Paths:
--------------
    sandbox/uisync/code/src/java/pcgen/core/DataSet.java
    sandbox/uisync/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java

Modified: sandbox/uisync/code/src/java/pcgen/core/DataSet.java
===================================================================
--- sandbox/uisync/code/src/java/pcgen/core/DataSet.java	2011-06-11 18:11:43 UTC (rev 15100)
+++ sandbox/uisync/code/src/java/pcgen/core/DataSet.java	2011-06-12 00:05:51 UTC (rev 15101)
@@ -20,6 +20,7 @@
  */
 package pcgen.core;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -372,7 +373,19 @@
 				return AFTER;
 			}
 			
-			return r1.compareTo(r2);
+			// Check sort keys 
+			String key1 = r1.get(StringKey.SORT_KEY);
+			if (key1 == null)
+			{
+				key1 = r1.getDisplayName();
+			}
+			String key2 = r2.get(StringKey.SORT_KEY);
+			if (key2 == null)
+			{
+				key2 = r2.getDisplayName();
+			}
+			final Collator collator = Collator.getInstance();
+			return collator.compare(key1, key2);
 		}
 		
 	}
@@ -408,7 +421,20 @@
 				return AFTER;
 			}
 			
-			return c1.compareTo(c2);
+			
+			// Check sort keys 
+			String key1 = c1.get(StringKey.SORT_KEY);
+			if (key1 == null)
+			{
+				key1 = c1.getDisplayName();
+			}
+			String key2 = c2.get(StringKey.SORT_KEY);
+			if (key2 == null)
+			{
+				key2 = c2.getDisplayName();
+			}
+			final Collator collator = Collator.getInstance();
+			return collator.compare(key1, key2);
 		}
 		
 	}

Modified: sandbox/uisync/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java
===================================================================
--- sandbox/uisync/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java	2011-06-11 18:11:43 UTC (rev 15100)
+++ sandbox/uisync/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java	2011-06-12 00:05:51 UTC (rev 15101)
@@ -34,6 +34,7 @@
 import java.util.Set;
 
 import pcgen.cdom.base.Constants;
+import pcgen.cdom.enumeration.StringKey;
 import pcgen.core.BodyStructure;
 import pcgen.core.Equipment;
 import pcgen.core.Globals;
@@ -1087,8 +1088,12 @@
 				case EQUIPMENT:
 				default:
 					sortKey.append("|");
-					//TODO: Change to use sortkey when we merge
-					sortKey.append(equipment.getKeyName());
+					String objKey = equipment.get(StringKey.SORT_KEY);
+					if (objKey == null)
+					{
+						objKey = equipment.getKeyName();
+					}
+					sortKey.append(objKey);
 					break;
 			}
 			return sortKey.toString();


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