some fixes to avoid 'null' appearing in the help output

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@129844 13f79535-47bb-0310-9956-ffa450edef68

Author: John Keyes

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

@@ -277,13 +277,9 @@ public void printUsage( PrintWriter pw, int width, String app, Options options )
                    buff.append( "--" ).append( option.getLongOpt() );
                }
 
-               if( option.hasArg() ){
-                   buff.append( " " );
-               }
-
                // if the Option has a value
-               if( option.hasArg() ) {
-                   buff.append( option.getArgName() );
+               if( option.hasArg() && option.getArgName() != null ) {
+                   buff.append( " " ).append( option.getArgName() );
                }
 
                // if the Option is not a required option
@@ -389,8 +385,12 @@ protected StringBuffer renderOptions( StringBuffer sb,
          optBuf.append( dpad );
 
          int nextLineTabStop = max + descPad;
+
+         if( option.getDescription() != null ) {
+             optBuf.append( option.getDescription() );
+         }
          renderWrappedText(sb, width, nextLineTabStop,
-                           optBuf.append(option.getDescription()).toString());
+                           optBuf.toString());
          if ( i.hasNext() )
          {
              sb.append(defaultNewLine);