From: <boo...@us...> - 2006-08-23 01:58:16
|
Revision: 1342 Author: boomer70 Date: 2006-08-22 18:58:10 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=1342&view=rev Log Message: ----------- Fix for campaign problem I created earlier. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Campaign.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Campaign.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Campaign.java 2006-08-22 08:06:54 UTC (rev 1341) +++ Trunk/pcgen/code/src/java/pcgen/core/Campaign.java 2006-08-23 01:58:10 UTC (rev 1342) @@ -1108,13 +1108,6 @@ */ public void setIsLoaded(final boolean isLoaded) { - // Make sure that any included campaigns are marked as loaded as well - final List<String> pccFiles = getPccFiles(); - for ( final String fileName : pccFiles ) - { - final Campaign campaign = Globals.getCampaignByFilename(fileName, true); - campaign.setIsLoaded(isLoaded); - } this.isLoaded = isLoaded; } @@ -1259,6 +1252,25 @@ return showInMenu; } + /** + * Returns a list of the Campaign objects that were loaded by this Campaign. + * + * @return A list of <tt>Campaign</tt>s loaded by this Campaign. + */ + public List<Campaign> getSubCampaigns() + { + final List<String> pccFiles = getPccFiles(); + + final List<Campaign> ret = new ArrayList<Campaign>(pccFiles.size()); + + for ( final String fileName : pccFiles ) + { + final Campaign campaign = Globals.getCampaignByFilename(fileName, true); + ret.add(campaign); + } + return ret; + } + public Object clone() { Campaign newCampaign = null; Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2006-08-22 08:06:54 UTC (rev 1341) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2006-08-23 01:58:10 UTC (rev 1342) @@ -11947,6 +11947,7 @@ private ArrayList<? extends PObject> getPObjectList() { // Possible object types include: + // Campaigns // Alignment (PCAlignment) // ArmorProf // BioSet (ageSet) @@ -11975,6 +11976,7 @@ if ( campaign != null && campaign.isLoaded() ) { results.add( campaign ); + results.addAll( campaign.getSubCampaigns() ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |