QPID-2503 : Updated CommandLineParser to output '-' in front of options.

Merged from trunk r934005



git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@934364 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java b/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
index baa68f87f9..0281506037 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
@@ -208,7 +208,7 @@ public class CommandLineParser
         for (CommandLineOption optionInfo : optionMap.values())
         {
             result +=
-                optionInfo.option + " " + ((optionInfo.argument != null) ? (optionInfo.argument + " ") : "")
+                "-" + optionInfo.option + " " + ((optionInfo.argument != null) ? (optionInfo.argument + " ") : "")
                 + optionInfo.comment + "\n";
         }
 
@@ -463,7 +463,7 @@ public class CommandLineParser
             else if (optionInfo.mandatory && !options.containsKey(optionInfo.option))
             {
                 // Create an error for the missing option.
-                parsingErrors.add("Option " + optionInfo.option + " is mandatory but not was not specified.\n");
+                parsingErrors.add("Option -" + optionInfo.option + " is mandatory but not was not specified.\n");
             }
         }
 
@@ -597,7 +597,7 @@ public class CommandLineParser
             if (!argumentMatcher.matches())
             {
                 // Create an error for this badly formed argument.
-                parsingErrors.add("The argument to option " + optionInfo.option + " does not meet its required format.\n");
+                parsingErrors.add("The argument to option -" + optionInfo.option + " does not meet its required format.\n");
             }
         }
     }