Encapsulate new fields

Javadoc

Author: garydgregory

src/main/java/org/apache/commons/cli/help/AbstractHelpFormatter.java

@@ -63,7 +63,7 @@ public abstract static class Builder<B extends Builder<B, T>, T extends Abstract
         private String optionGroupSeparator = DEFAULT_OPTION_GROUP_SEPARATOR;
 
         /**
-         * Constructs a new instace.
+         * Constructs a new instance.
          * <p>
          * Sets {@code showSince} to {@code true}.
          * </p>
@@ -180,24 +180,24 @@ public B setOptionGroupSeparator(final String optionGroupSeparator) {
     public static final String DEFAULT_SYNTAX_PREFIX = "usage: ";
 
     /** The comparator for sorting {@link Option} collections */
-    protected final Comparator<Option> comparator;
+    private final Comparator<Option> comparator;
     /**
      * The {@link HelpAppendable} that produces the final output.
      */
-    protected final HelpAppendable helpAppendable;
+    private final HelpAppendable helpAppendable;
 
     /**
      * The OptionFormatter.Builder used to display options within the help page
      */
-    protected final OptionFormatter.Builder optionFormatBuilder;
+    private final OptionFormatter.Builder optionFormatBuilder;
 
     /** The separator between {@link OptionGroup} components. */
-    protected final String optionGroupSeparator;
+    private final String optionGroupSeparator;
 
     /**
      * The phrase printed before the syntax line.
      */
-    protected String syntaxPrefix = DEFAULT_SYNTAX_PREFIX;
+    private String syntaxPrefix = DEFAULT_SYNTAX_PREFIX;
 
     /**
      * Constructs the base formatter.
@@ -212,14 +212,32 @@ protected AbstractHelpFormatter(final Builder<?, ?> builder) {
     }
 
     /**
-     * Gets the comparator used by this HelpFormatter.
+     * Gets the comparator for sorting options.
      *
-     * @return The comparator used by this HelpFormatter.
+     * @return The comparator for sorting options.
      */
-    public Comparator<Option> getComparator() {
+    protected Comparator<Option> getComparator() {
         return comparator;
     }
 
+    /**
+     * Gets the help appendable.
+     *
+     * @return The help appendable.
+     */
+    protected HelpAppendable getHelpAppendable() {
+        return helpAppendable;
+    }
+
+    /**
+     * Gets the option formatter builder.
+     *
+     * @return The option formatter builder.
+     */
+    protected OptionFormatter.Builder getOptionFormatBuilder() {
+        return optionFormatBuilder;
+    }
+
     /**
      * Constructs an {@link OptionFormatter} for the specified {@link Option}.
      *
@@ -230,6 +248,15 @@ public final OptionFormatter getOptionFormatter(final Option option) {
         return optionFormatBuilder.build(option);
     }
 
+    /**
+     * Gets the option group separator.
+     *
+     * @return The option group separator.
+     */
+    protected String getOptionGroupSeparator() {
+        return optionGroupSeparator;
+    }
+
     /**
      * Gets the {@link HelpAppendable} associated with this help formatter.
      *

src/main/java/org/apache/commons/cli/help/HelpFormatter.java

@@ -166,7 +166,7 @@ public TableDefinition getTableDefinition(final Iterable<Option> options) {
         for (final Option option : options) {
             final List<String> row = new ArrayList<>();
             // create an option formatter to correctly format the parts of the option
-            final OptionFormatter formatter = optionFormatBuilder.build(option);
+            final OptionFormatter formatter = getOptionFormatBuilder().build(option);
             sb.setLength(0);
             // append the opt values.
             sb.append(formatter.getBothOpt());