Author: tchemit Date: 2013-03-08 23:43:38 +0100 (Fri, 08 Mar 2013) New Revision: 2601 Url: http://nuiton.org/projects/jaxx/repository/revisions/2601 Log: refs #2566: Can merge helper ids into inpute files in generate-help-ids mojo (improve inptu file generation) Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 19:07:19 UTC (rev 2600) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 22:43:38 UTC (rev 2601) @@ -28,6 +28,7 @@ import com.google.common.io.Closeables; import com.google.common.io.Files; import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -54,8 +55,10 @@ defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { - public static final String INPUT_FILENAME_FORMAT = "%s-%s_%s.properties"; + public static final String INPUT_FILENAME_FULL_FORMAT = "%s-%s_%s.properties"; + public static final String INPUT_FILENAME_FORMAT = "%s-%s.properties"; + /** * Flag to merge ids into input directory. * @@ -197,12 +200,21 @@ if (mergeIdsToInput) { - String filename = String.format( - INPUT_FILENAME_FORMAT, - inputHelpFilenamePrefix, - locale.getLanguage(), - locale.getCountry()); + String filename; + if (StringUtils.isEmpty(locale.getCountry())) { + filename = String.format( + INPUT_FILENAME_FULL_FORMAT, + inputHelpFilenamePrefix, + locale.getLanguage(), + locale.getCountry()); + } else { + filename = String.format( + INPUT_FILENAME_FORMAT, + inputHelpFilenamePrefix, + locale.getLanguage()); + } + File inputFile = new File(inputHelpDirectory, filename); getLog().info("Use input file: " + inputFile);