From: <th...@us...> - 2008-06-22 19:28:13
|
Revision: 6831 http://pcgen.svn.sourceforge.net/pcgen/?rev=6831&view=rev Author: thpr Date: 2008-06-22 12:28:22 -0700 (Sun, 22 Jun 2008) Log Message: ----------- increase tolerance :) Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Globals.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2008-06-22 18:50:54 UTC (rev 6830) +++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2008-06-22 19:28:22 UTC (rev 6831) @@ -51,6 +51,7 @@ import javax.swing.JFrame; import pcgen.base.util.MapToList; +import pcgen.cdom.base.CDOMObject; import pcgen.cdom.base.Constants; import pcgen.cdom.base.MasterListInterface; import pcgen.cdom.enumeration.ObjectKey; @@ -186,9 +187,9 @@ } }; - private static final Comparator<PObject> pObjectNameComp = new Comparator<PObject>() + private static final Comparator<CDOMObject> pObjectNameComp = new Comparator<CDOMObject>() { - public int compare(final PObject o1, final PObject o2) + public int compare(final CDOMObject o1, final CDOMObject o2) { final Collator collator = Collator.getInstance(); return collator.compare(o1.getDisplayName(), o2.getDisplayName()); @@ -2329,7 +2330,7 @@ * @param aList * @return Sorted list of Pcgen Objects */ - public static <T extends PObject> List<T> sortPObjectListByName(final List<T> aList) + public static <T extends CDOMObject> List<T> sortPObjectListByName(final List<T> aList) { Collections.sort(aList, pObjectNameComp); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |