From: <jde...@us...> - 2011-03-06 11:37:55
|
Revision: 14678 http://pcgen.svn.sourceforge.net/pcgen/?rev=14678&view=rev Author: jdempsey Date: 2011-03-06 11:37:48 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Correct sources missing from available list in Pathfinder game mode Modified Paths: -------------- sandbox/uisync/code/src/java/pcgen/core/Campaign.java sandbox/uisync/code/src/java/pcgen/system/FacadeFactory.java Modified: sandbox/uisync/code/src/java/pcgen/core/Campaign.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/core/Campaign.java 2011-03-06 05:37:58 UTC (rev 14677) +++ sandbox/uisync/code/src/java/pcgen/core/Campaign.java 2011-03-06 11:37:48 UTC (rev 14678) @@ -107,10 +107,12 @@ List<String> modes = getSafeListFor(ListKey.GAME_MODE); for (String string : modes) { - GameMode mode = SystemCollections.getGameModeNamed(string); - if (mode != null) + for (GameMode game : SystemCollections.getUnmodifiableGameModeList()) { - gameModes.addElement(mode); + if (game.getAllowedModes().contains(string)) + { + gameModes.addElement(game); + } } } } Modified: sandbox/uisync/code/src/java/pcgen/system/FacadeFactory.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/system/FacadeFactory.java 2011-03-06 05:37:58 UTC (rev 14677) +++ sandbox/uisync/code/src/java/pcgen/system/FacadeFactory.java 2011-03-06 11:37:48 UTC (rev 14678) @@ -26,21 +26,23 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.apache.commons.lang.ArrayUtils; + import pcgen.core.Campaign; import pcgen.core.GameMode; import pcgen.core.Globals; import pcgen.core.SettingsHandler; import pcgen.core.SystemCollections; import pcgen.core.facade.CampaignFacade; -import pcgen.core.facade.util.DefaultListFacade; import pcgen.core.facade.DefaultReferenceFacade; import pcgen.core.facade.GameModeFacade; +import pcgen.core.facade.ReferenceFacade; +import pcgen.core.facade.SourceSelectionFacade; +import pcgen.core.facade.LoadableFacade.LoadingState; +import pcgen.core.facade.util.DefaultListFacade; import pcgen.core.facade.util.ListFacade; import pcgen.core.facade.util.ListFacades; -import pcgen.core.facade.LoadableFacade.LoadingState; -import pcgen.core.facade.ReferenceFacade; -import pcgen.core.facade.SourceSelectionFacade; import pcgen.util.Logging; /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |