From: <jde...@us...> - 2007-08-04 23:56:18
|
Revision: 3634 http://pcgen.svn.sourceforge.net/pcgen/?rev=3634&view=rev Author: jdempsey Date: 2007-08-04 16:56:19 -0700 (Sat, 04 Aug 2007) Log Message: ----------- Fix bug: .pcc with PCC:http target crashes Issue#: 1767771 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/io/PCGFile.java Trunk/pcgen/code/src/java/pcgen/persistence/lst/CampaignLoader.java Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGFile.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/PCGFile.java 2007-08-04 21:27:08 UTC (rev 3633) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGFile.java 2007-08-04 23:56:19 UTC (rev 3634) @@ -3,6 +3,7 @@ import pcgen.core.Constants; import java.io.File; +import java.net.URI; /** * Common I/O methods specific to files. @@ -73,6 +74,27 @@ } /** + * Checks if the given <var>uri</var> is a PCGen campaign file based on the + * file extension. + * + * @param uri the uri to test + * @return {<code>true</code>} if a PCGen campaign file + * + * @see Constants#s_PCGEN_CAMPAIGN_EXTENSION + */ + public static boolean isPCGenCampaignFile(final URI uri) + { + if ("file".equals(uri.getScheme())) + { + return isPCGenCampaignFile(new File(uri)); + } + + return uri.getPath() != null + && uri.getPath().toLowerCase().endsWith( + Constants.s_PCGEN_CAMPAIGN_EXTENSION); + } + + /** * Checks if the given <var>file</var> is a PCGen list file based on the file * extension. * Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/CampaignLoader.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/persistence/lst/CampaignLoader.java 2007-08-04 21:27:08 UTC (rev 3633) +++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/CampaignLoader.java 2007-08-04 23:56:19 UTC (rev 3634) @@ -215,7 +215,7 @@ // Add all sub-files to the main campaign, regardless of exclusions for (URI fName : baseCampaign.getPccFiles()) { - if (PCGFile.isPCGenCampaignFile(new File(fName))) + if (PCGFile.isPCGenCampaignFile(fName)) { Campaign globalSubCampaign = Globals.getCampaignByURI(fName, false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |