From: <jde...@us...> - 2013-10-30 08:02:27
|
Revision: 21993 http://sourceforge.net/p/pcgen/code/21993 Author: jdempsey Date: 2013-10-30 08:02:24 +0000 (Wed, 30 Oct 2013) Log Message: ----------- Fix bug: Failed to find output sheet template directory Issue#: CODE-2327 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2013-10-30 03:50:41 UTC (rev 21992) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2013-10-30 08:02:24 UTC (rev 21993) @@ -654,7 +654,18 @@ else { dir = new File(ConfigurationSettings.getOutputSheetsDir(), outputSheetDirectory); + if (!dir.isDirectory()) + { + Logging.errorPrint("Unable to find game mode outputsheets at " + dir.getCanonicalPath() + ". Trying base."); + dir = new File(ConfigurationSettings.getOutputSheetsDir()); + outputSheetDirectory = ""; + } } + if (!dir.isDirectory()) + { + Logging.errorPrint("Unable to find outputsheets folder at " + dir.getCanonicalPath() + "."); + return Collections.emptyList(); + } IOFileFilter fileFilter = FileFilterUtils.notFileFilter(new SuffixFileFilter(".fo")); IOFileFilter dirFilter = FileFilterUtils.makeSVNAware(TrueFileFilter.INSTANCE); return FileUtils.listFiles(dir, fileFilter, dirFilter); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |