Internal refactoring

Author: garydgregory

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

@@ -18,7 +18,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.commons.cli.help;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.cli.Option;
@@ -62,6 +61,21 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class HelpFormatter extends AbstractHelpFormatter {
 
+    /**
+     * The default "Since" column label.
+     */
+    private static final String LABEL_SINCE = "Since";
+
+    /**
+     * The default "Description" column label.
+     */
+    private static final String LABEL_DESCRIPTION = "Description";
+
+    /**
+     * The default "Options" column label.
+     */
+    private static final String LABEL_OPTIONS = "Options";
+
     /**
      * A builder for the HelpFormatter. Intended to make more complex uses of the HelpFormatter class easier. Default values are:
      * <ul>
@@ -184,6 +198,12 @@ public TableDefinition getTableDefinition(final Iterable<Option> options) {
             rows.add(row);
         });
         // return the TableDefinition with the proper column headers.
-        return TableDefinition.from("", styles, showSince ? Arrays.asList("Options", "Since", "Description") : Arrays.asList("Options", "Description"), rows);
+        List<String> headers = new ArrayList<>(3);
+        headers.add(LABEL_OPTIONS);
+        if (showSince) {
+            headers.add(LABEL_SINCE);
+        }
+        headers.add(LABEL_DESCRIPTION);
+        return TableDefinition.from("", styles, headers, rows);
     }
 }