Internal refactoring

Author: garydgregory

src/main/java/org/apache/commons/cli/DefaultParser.java

@@ -602,7 +602,7 @@ private boolean isLongOption(final String token) {
         if (token == null || !token.startsWith("-") || token.length() == 1) {
             return false;
         }
-        final int pos = token.indexOf("=");
+        final int pos = token.indexOf(Char.EQUAL);
         final String t = pos == -1 ? token : token.substring(0, pos);
         if (!getMatchingLongOptions(t).isEmpty()) {
             // long or partial long options (--L, -L, --L=V, -L=V, --l, --l=V)
@@ -649,7 +649,7 @@ private boolean isShortOption(final String token) {
             return false;
         }
         // remove leading "-" and "=value"
-        final int pos = token.indexOf("=");
+        final int pos = token.indexOf(Char.EQUAL);
         final String optName = pos == -1 ? token.substring(1) : token.substring(1, pos);
         if (options.hasShortOption(optName)) {
             return true;

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

@@ -657,7 +657,7 @@ public void printUsage(final PrintWriter pw, final int width, final String cmdLi
      */
     public void printUsage(final PrintWriter pw, final int width, final String app, final Options options) {
         // initialize the string buffer
-        final StringBuffer buff = new StringBuffer(getSyntaxPrefix()).append(app).append(" ");
+        final StringBuffer buff = new StringBuffer(getSyntaxPrefix()).append(app).append(Char.SP);
         // create a list for processed option groups
         final Collection<OptionGroup> processedGroups = new ArrayList<>();
         final List<Option> optList = new ArrayList<>(options.getOptions());
@@ -687,7 +687,7 @@ public void printUsage(final PrintWriter pw, final int width, final String app,
                 appendOption(buff, option, option.isRequired());
             }
             if (it.hasNext()) {
-                buff.append(" ");
+                buff.append(Char.SP);
             }
         }
 

src/main/java/org/apache/commons/cli/OptionGroup.java

@@ -134,7 +134,7 @@ public String toString() {
             }
 
             if (option.getDescription() != null) {
-                buff.append(" ");
+                buff.append(Char.SP);
                 buff.append(option.getDescription());
             }