@@ -11702,19 +11702,19 @@ private static String extractName(ResourceBundle rb) {
1170211702 } catch (Exception ignored) { return "?"; }
1170311703 }
1170411704 public Messages parent() {
11705- CommandSpec parentSpec = this.spec.parent();
11706- if (parent == null || parent.spec != parentSpec) {
11707- parent = null; // Refresh if parentSpec doesn't match
11708- while (parent == null && parentSpec != null) {
11709- String parentResourceBundleBaseName = parentSpec.resourceBundleBaseName();
11710- if (parentResourceBundleBaseName != null && !parentResourceBundleBaseName.equals(this.bundleBaseName)) {
11711- parent = new Messages(parentSpec, parentResourceBundleBaseName);
11712- } else {
11713- parentSpec = parentSpec.parent();
11714- }
11715- }
11716- }
11717- return parent;
11705+ CommandSpec parentSpec = this.spec.parent();
11706+ if (parent == null || parent.spec != parentSpec) {
11707+ parent = null; // Refresh if parentSpec doesn't match
11708+ while (parent == null && parentSpec != null) {
11709+ String parentResourceBundleBaseName = parentSpec.resourceBundleBaseName();
11710+ if (parentResourceBundleBaseName != null && !parentResourceBundleBaseName.equals(this.bundleBaseName)) {
11711+ parent = new Messages(parentSpec, parentResourceBundleBaseName);
11712+ } else {
11713+ parentSpec = parentSpec.parent();
11714+ }
11715+ }
11716+ }
11717+ return parent;
1171811718 }
1171911719 private static Set<String> keys(ResourceBundle rb) {
1172011720 if (rb == null) { return Collections.emptySet(); }
@@ -11733,7 +11733,7 @@ private static Set<String> keys(ResourceBundle rb) {
1173311733 */
1173411734 public static final void setLoadBundles(boolean loadBundles) {
1173511735 tracer().debug("Messages: loadBundles was set to %s", loadBundles);
11736- Messages.loadBundles = loadBundles;
11736+ Messages.loadBundles = loadBundles;
1173711737 }
1173811738
1173911739 /** Returns a copy of the specified Messages object with the CommandSpec replaced by the specified one.
@@ -11763,9 +11763,9 @@ public String getString(String key, String defaultValue) {
1176311763 }
1176411764
1176511765 private String getStringForExactKey(String key) {
11766- if (keys.contains(key)) { return rb.getString(key); }
11767- else if (parent() != null) { return parent().getStringForExactKey(key); }
11768- else { return null; }
11766+ if (keys.contains(key)) { return rb.getString(key); }
11767+ else if (parent() != null) { return parent().getStringForExactKey(key); }
11768+ else { return null; }
1176911769 }
1177011770
1177111771 boolean isEmpty() { return (rb == null || keys.isEmpty()) && (parent() == null || parent().isEmpty()); }
@@ -11786,9 +11786,9 @@ public String[] getStringArray(String key, String[] defaultValues) {
1178611786 return result != null ? result : defaultValues;
1178711787 }
1178811788 private String[] getStringArrayForExactKey(String key) {
11789- List<String> result = addAllWithPrefix(rb, key, keys, new ArrayList<String>());
11790- if (!result.isEmpty()) { return result.toArray(new String[0]); }
11791- return parent() == null ? null : parent().getStringArrayForExactKey(key);
11789+ List<String> result = addAllWithPrefix(rb, key, keys, new ArrayList<String>());
11790+ if (!result.isEmpty()) { return result.toArray(new String[0]); }
11791+ return parent() == null ? null : parent().getStringArrayForExactKey(key);
1179211792 }
1179311793 private static List<String> addAllWithPrefix(ResourceBundle rb, String key, Set<String> keys, List<String> result) {
1179411794 if (keys.contains(key)) { result.add(rb.getString(key)); }
0 commit comments