Index: src/java/org/apache/commons/cli/OptionGroup.java
===================================================================
RCS file: /home/cvspublic/jakarta-commons/cli/src/java/org/apache/commons/cli/OptionGroup.java,v
retrieving revision 1.6
diff -u -r1.6 OptionGroup.java
--- src/java/org/apache/commons/cli/OptionGroup.java	24 Oct 2002 23:17:49 -0000	1.6
+++ src/java/org/apache/commons/cli/OptionGroup.java	16 Nov 2002 15:10:22 -0000
@@ -88,9 +88,17 @@
      * @return this option group with opt added
      */
     public OptionGroup addOption(Option opt) {
-        // key   - option name
+        // key   - option name (or long name if no short name available)
         // value - the option
-        optionMap.put( "-" + opt.getOpt(), opt );
+        
+        final String key = opt.getOpt();
+        if( " ".equals( key ) ) {
+            optionMap.put( "--" + opt.getLongOpt(), opt );
+        }
+        else {
+            optionMap.put( "-" + key, opt );
+        }
+        
         return this;
     }
 
@@ -167,9 +175,17 @@
         buff.append( "[" );
         while( iter.hasNext() ) {
             Option option = (Option)iter.next();
-
-            buff.append( "-" );
-            buff.append( option.getOpt() );
+            
+            if( !" ".equals( option.getOpt() ) ) {
+                buff.append( "-" );
+                buff.append( option.getOpt() );
+            }
+            else {
+                buff.append( "--" );
+                buff.append( option.getLongOpt() );
+            }
+            
+            
             buff.append( " " );
             buff.append( option.getDescription( ) );
 
Index: src/test/org/apache/commons/cli/OptionGroupTest.java
===================================================================
RCS file: /home/cvspublic/jakarta-commons/cli/src/test/org/apache/commons/cli/OptionGroupTest.java,v
retrieving revision 1.4
diff -u -r1.4 OptionGroupTest.java
--- src/test/org/apache/commons/cli/OptionGroupTest.java	19 Sep 2002 22:59:44 -0000	1.4
+++ src/test/org/apache/commons/cli/OptionGroupTest.java	16 Nov 2002 15:10:23 -0000
@@ -49,8 +49,15 @@
         OptionGroup group2 = new OptionGroup();
         group2.addOption( section );
         group2.addOption( chapter );
-
         _options.addOptionGroup( group2 );
+
+        Option importOpt = new Option( " ", "import", false, "section to process" );
+        Option exportOpt = new Option( " ", "export", false, "chapter to process" );
+        OptionGroup group3 = new OptionGroup();
+        group3.addOption( importOpt );
+        group3.addOption( exportOpt );
+        _options.addOptionGroup( group3 );
+
         _options.addOption( "r", "revision", false, "revision number" );
     }
 
@@ -156,6 +163,29 @@
             assertTrue( "Confirm -s is NOT set", !cl.hasOption("s") );
             assertTrue( "Confirm -c is NOT set", !cl.hasOption("c") );
             assertTrue( "Confirm no extra args", cl.getArgList().size() == 0);
+        }
+        catch (ParseException e)
+        {
+            fail( e.toString() );
+        }
+    }
+
+    public void testValidLongOnlyOptions()
+    {
+        try
+        {
+            CommandLine cl = parser.parse( _options, new String[]{"--export"});
+            assertTrue( "Confirm --export is set", cl.hasOption("export") );
+        }
+        catch (ParseException e)
+        {
+            fail( e.toString() );
+        }
+        
+        try
+        {
+            CommandLine cl = parser.parse( _options, new String[]{"--import"});
+            assertTrue( "Confirm --import is set", cl.hasOption("import") );
         }
         catch (ParseException e)
         {