From: <th...@us...> - 2009-01-10 03:02:00
|
Revision: 8956 http://pcgen.svn.sourceforge.net/pcgen/?rev=8956&view=rev Author: thpr Date: 2009-01-10 03:01:50 +0000 (Sat, 10 Jan 2009) Log Message: ----------- [ 2203608 ] [5.15.5] Support for using exotic weapons 1-handed broken Issue#: 2203608 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2009-01-10 02:45:38 UTC (rev 8955) +++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2009-01-10 03:01:50 UTC (rev 8956) @@ -5895,12 +5895,24 @@ public boolean containsAssociated(CDOMObject obj, String o) { - return assocSupt.containsAssoc(obj, AssociationListKey.CHOICES, new FixedStringList(o)); + return containsAssociated(obj, new FixedStringList(o)); } public boolean containsAssociated(CDOMObject obj, FixedStringList o) { - return assocSupt.containsAssoc(obj, AssociationListKey.CHOICES, o); + List<FixedStringList> list = assocSupt.getAssocList(obj, + AssociationListKey.CHOICES); + if (list != null) + { + for (FixedStringList fsl : list) + { + if (FixedStringList.CASE_INSENSITIVE_ORDER.compare(fsl, o) == 0) + { + return true; + } + } + } + return false; } public int getSelectCorrectedAssociationCount(CDOMObject obj) Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2009-01-10 02:45:38 UTC (rev 8955) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2009-01-10 03:01:50 UTC (rev 8956) @@ -17437,13 +17437,24 @@ public boolean containsAssociated(CDOMObject obj, String o) { - return assocSupt.containsAssoc(obj, AssociationListKey.CHOICES, - new FixedStringList(o)); + return containsAssociated(obj, new FixedStringList(o)); } public boolean containsAssociated(CDOMObject obj, FixedStringList o) { - return assocSupt.containsAssoc(obj, AssociationListKey.CHOICES, o); + List<FixedStringList> list = assocSupt.getAssocList(obj, + AssociationListKey.CHOICES); + if (list != null) + { + for (FixedStringList fsl : list) + { + if (FixedStringList.CASE_INSENSITIVE_ORDER.compare(fsl, o) == 0) + { + return true; + } + } + } + return false; } public int getSelectCorrectedAssociationCount(CDOMObject obj) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |