From: <th...@us...> - 2013-01-13 16:50:24
|
Revision: 19146 http://sourceforge.net/p/pcgen/code/19146 Author: thpr Date: 2013-01-13 16:50:21 +0000 (Sun, 13 Jan 2013) Log Message: ----------- Fix previous checkin: Be more permissive on languages on the PC Issue#: CODE-2009 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2013-01-13 16:19:18 UTC (rev 19145) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2013-01-13 16:50:21 UTC (rev 19146) @@ -6373,14 +6373,17 @@ { List<PersistentTransitionChoice<?>> addList = a.getListFor(ListKey.ADD); - for (PersistentTransitionChoice<?> ptc : addList) + if (addList != null) { - SelectableSet<?> ss = ptc.getChoices(); - if (ss.getName().equals("LANGUAGE") - && LANGUAGE_CLASS.equals(ss.getChoiceClass())) + for (PersistentTransitionChoice<?> ptc : addList) { - Collection<?> selected = ss.getSet(thePC); - foundlist.addAll((Collection<Language>) selected); + SelectableSet<?> ss = ptc.getChoices(); + if (ss.getName().equals("LANGUAGE") + && LANGUAGE_CLASS.equals(ss.getChoiceClass())) + { + Collection<?> selected = ss.getSet(thePC); + foundlist.addAll((Collection<Language>) selected); + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |