jlengrand/picocli
1
0
Fork 0
mirror of https://github.com/jlengrand/picocli.git synced 2026-03-10 08:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[#500] do not load ResourceBundles during model creation in annotation processor

Browse Source
This commit is contained in:
Remko Popma
2019-05-21 13:17:30 +09:00
parent 49e9406399
commit 2933b946eb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/picocli/CommandLine.java
View File

@@ -5297,7 +5297,7 @@ public class CommandLine {
updateVersion(cmd.version());
updateHelpCommand(cmd.helpCommand());
updateAddMethodSubcommands(cmd.addMethodSubcommands());
usageMessage().updateFromCommand(cmd, this);
usageMessage().updateFromCommand(cmd, this, factory != null);
if (factory != null) {
updateVersionProvider(cmd.versionProvider(), factory);
@@ -5981,9 +5981,13 @@ public class CommandLine {
* @since 4.0 */
public UsageMessageSpec adjustLineBreaksForWideCJKCharacters(boolean adjustForWideChars) { adjustLineBreaksForWideCJKCharacters = adjustForWideChars; return this; }
void updateFromCommand(Command cmd, CommandSpec commandSpec) {
void updateFromCommand(Command cmd, CommandSpec commandSpec, boolean loadResourceBundle) {
if (!empty(cmd.resourceBundle())) { // else preserve superclass bundle
messages(new Messages(commandSpec, cmd.resourceBundle()));
if (loadResourceBundle) {
messages(new Messages(commandSpec, cmd.resourceBundle()));
} else {
messages(new Messages(commandSpec, cmd.resourceBundle(), null));
}
}
if (isNonDefault(cmd.synopsisHeading(), DEFAULT_SYNOPSIS_HEADING)) {synopsisHeading = cmd.synopsisHeading();}
if (isNonDefault(cmd.commandListHeading(), DEFAULT_COMMAND_LIST_HEADING)) {commandListHeading = cmd.commandListHeading();}