roxspring    2004/03/30 11:15:22

  Modified:    cli/src/java/org/apache/commons/cli2/impl Tag:
                        RESEARCH_CLI_2_ROXSPRING GroupImpl.java
                        ParentImpl.java ArgumentImpl.java
                        PropertyOption.java Switch.java DefaultOption.java
                        Command.java OptionImpl.java
               cli/src/java/org/apache/commons/cli2 Tag:
                        RESEARCH_CLI_2_ROXSPRING HelpFormatter.java
                        OptionException.java
               cli/src/test/org/apache/commons/cli2/impl Tag:
                        RESEARCH_CLI_2_ROXSPRING PropertyOptionTest.java
                        GroupTest.java ArgumentTest.java ParentTest.java
                        CommandTest.java SwitchTest.java
                        DefaultOptionTest.java
               cli/src/test/org/apache/commons/cli2 Tag:
                        RESEARCH_CLI_2_ROXSPRING DocumentationTest.java
  Added:       cli/src/java/org/apache/commons/cli2 Tag:
                        RESEARCH_CLI_2_ROXSPRING DisplaySetting.java
  Removed:     cli/src/java/org/apache/commons/cli2 Tag:
                        RESEARCH_CLI_2_ROXSPRING HelpSetting.java
  Log:
  Renamed HelpSetting to DisplaySetting so that the name better matches the use
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.17  +13 -13    
jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/GroupImpl.java
  
  Index: GroupImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/GroupImpl.java,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- GroupImpl.java    30 Mar 2004 01:43:09 -0000      1.1.2.16
  +++ GroupImpl.java    30 Mar 2004 19:15:21 -0000      1.1.2.17
  @@ -31,7 +31,7 @@
   import org.apache.commons.cli2.Argument;
   import org.apache.commons.cli2.Group;
   import org.apache.commons.cli2.HelpLine;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
  @@ -301,24 +301,24 @@
   
           final boolean optional =
               minimum == 0
  -                && helpSettingsCopy.contains(HelpSetting.DISPLAY_OPTIONAL);
  +                && helpSettingsCopy.contains(DisplaySetting.DISPLAY_OPTIONAL);
   
           final boolean expanded =
               name == null
  -                || helpSettingsCopy.contains(HelpSetting.DISPLAY_GROUP_EXPANDED);
  +                || helpSettingsCopy.contains(DisplaySetting.DISPLAY_GROUP_EXPANDED);
   
           final boolean named =
               !expanded
                   || (name != null
  -                    && helpSettingsCopy.contains(HelpSetting.DISPLAY_GROUP_NAME));
  +                    && 
helpSettingsCopy.contains(DisplaySetting.DISPLAY_GROUP_NAME));
   
           final boolean arguments =
  -            helpSettingsCopy.contains(HelpSetting.DISPLAY_GROUP_ARGUMENT);
  +            helpSettingsCopy.contains(DisplaySetting.DISPLAY_GROUP_ARGUMENT);
   
           final boolean outer =
  -            helpSettingsCopy.contains(HelpSetting.DISPLAY_GROUP_OUTER);
  +            helpSettingsCopy.contains(DisplaySetting.DISPLAY_GROUP_OUTER);
   
  -        helpSettingsCopy.remove(HelpSetting.DISPLAY_GROUP_OUTER);
  +        helpSettingsCopy.remove(DisplaySetting.DISPLAY_GROUP_OUTER);
   
           final boolean both = named && expanded;
   
  @@ -335,12 +335,12 @@
           if (expanded) {
               final Set childSettings;
               if (!helpSettingsCopy
  -                .contains(HelpSetting.DISPLAY_GROUP_EXPANDED)) {
  -                childSettings = HelpSetting.NONE;
  +                .contains(DisplaySetting.DISPLAY_GROUP_EXPANDED)) {
  +                childSettings = DisplaySetting.NONE;
               }
               else {
                   childSettings = new HashSet(helpSettingsCopy);
  -                childSettings.remove(HelpSetting.DISPLAY_OPTIONAL);
  +                childSettings.remove(DisplaySetting.DISPLAY_OPTIONAL);
               }
   
               // grab a list of the group's options.
  @@ -398,11 +398,11 @@
           final Set helpSettings,
           final Comparator comp) {
           final List helpLines = new ArrayList();
  -        if (helpSettings.contains(HelpSetting.DISPLAY_GROUP_NAME)) {
  +        if (helpSettings.contains(DisplaySetting.DISPLAY_GROUP_NAME)) {
               final HelpLine helpLine = new HelpLineImpl(this, depth);
               helpLines.add(helpLine);
           }
  -        if (helpSettings.contains(HelpSetting.DISPLAY_GROUP_EXPANDED)) {
  +        if (helpSettings.contains(DisplaySetting.DISPLAY_GROUP_EXPANDED)) {
   
               // grab a list of the group's options.
               final List list;
  @@ -423,7 +423,7 @@
                       option.helpLines(depth + 1, helpSettings, comp));
               }
           }
  -        if (helpSettings.contains(HelpSetting.DISPLAY_GROUP_ARGUMENT)) {
  +        if (helpSettings.contains(DisplaySetting.DISPLAY_GROUP_ARGUMENT)) {
               for (final Iterator i = anonymous.iterator(); i.hasNext();) {
                   final Option option = (Option)i.next();
                   helpLines.addAll(
  
  
  
  1.1.2.8   +5 -5      
jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/ParentImpl.java
  
  Index: ParentImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/ParentImpl.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- ParentImpl.java   27 Mar 2004 00:15:42 -0000      1.1.2.7
  +++ ParentImpl.java   30 Mar 2004 19:15:21 -0000      1.1.2.8
  @@ -24,7 +24,7 @@
   
   import org.apache.commons.cli2.Argument;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.Parent;
  @@ -151,10 +151,10 @@
   
           final boolean displayArgument =
               this.argument != null
  -                && helpSettings.contains(HelpSetting.DISPLAY_PARENT_ARGUMENT);
  +                && helpSettings.contains(DisplaySetting.DISPLAY_PARENT_ARGUMENT);
           final boolean displayChildren =
               this.children != null
  -                && helpSettings.contains(HelpSetting.DISPLAY_PARENT_CHILDREN);
  +                && helpSettings.contains(DisplaySetting.DISPLAY_PARENT_CHILDREN);
   
           if (displayArgument) {
               buffer.append(' ');
  @@ -187,12 +187,12 @@
           final List helpLines = new ArrayList();
           helpLines.add(new HelpLineImpl(this, depth));
   
  -        if (helpSettings.contains(HelpSetting.DISPLAY_PARENT_ARGUMENT)
  +        if (helpSettings.contains(DisplaySetting.DISPLAY_PARENT_ARGUMENT)
               && argument != null) {
               helpLines.addAll(argument.helpLines(depth + 1, helpSettings, comp));
           }
   
  -        if (helpSettings.contains(HelpSetting.DISPLAY_PARENT_CHILDREN)
  +        if (helpSettings.contains(DisplaySetting.DISPLAY_PARENT_CHILDREN)
               && children != null) {
               helpLines.addAll(children.helpLines(depth + 1, helpSettings, comp));
           }
  
  
  
  1.1.2.11  +4 -4      
jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/ArgumentImpl.java
  
  Index: ArgumentImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/ArgumentImpl.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- ArgumentImpl.java 6 Mar 2004 22:21:24 -0000       1.1.2.10
  +++ ArgumentImpl.java 30 Mar 2004 19:15:21 -0000      1.1.2.11
  @@ -24,7 +24,7 @@
   
   import org.apache.commons.cli2.Argument;
   import org.apache.commons.cli2.HelpLine;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
  @@ -321,15 +321,15 @@
   
           // do we display the outer optionality
           final boolean optional =
  -            helpSettings.contains(HelpSetting.DISPLAY_OPTIONAL);
  +            helpSettings.contains(DisplaySetting.DISPLAY_OPTIONAL);
   
           // allow numbering if multiple args
           final boolean numbered =
               maximum > 1
  -                && helpSettings.contains(HelpSetting.DISPLAY_ARGUMENT_NUMBERED);
  +                && helpSettings.contains(DisplaySetting.DISPLAY_ARGUMENT_NUMBERED);
   
           final boolean bracketed =
  -            helpSettings.contains(HelpSetting.DISPLAY_ARGUMENT_BRACKETED);
  +            helpSettings.contains(DisplaySetting.DISPLAY_ARGUMENT_BRACKETED);
   
           // if infinite args are allowed then crop the list
           final int max = maximum == Integer.MAX_VALUE ? 2 : maximum;
  
  
  
  1.1.2.7   +4 -4      
jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/PropertyOption.java
  
  Index: PropertyOption.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/PropertyOption.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- PropertyOption.java       24 Feb 2004 02:01:40 -0000      1.1.2.6
  +++ PropertyOption.java       30 Mar 2004 19:15:21 -0000      1.1.2.7
  @@ -22,7 +22,7 @@
   import java.util.Set;
   
   import org.apache.commons.cli2.HelpLine;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
   
  @@ -136,10 +136,10 @@
           final Comparator comp) {
   
           final boolean display =
  -            helpSettings.contains(HelpSetting.DISPLAY_PROPERTY_OPTION);
  +            helpSettings.contains(DisplaySetting.DISPLAY_PROPERTY_OPTION);
   
           final boolean bracketed =
  -            helpSettings.contains(HelpSetting.DISPLAY_ARGUMENT_BRACKETED);
  +            helpSettings.contains(DisplaySetting.DISPLAY_ARGUMENT_BRACKETED);
   
           if (display) {
               buffer.append(optionString);
  @@ -184,7 +184,7 @@
           final int depth,
           final Set helpSettings,
           final Comparator comp) {
  -        if (helpSettings.contains(HelpSetting.DISPLAY_PROPERTY_OPTION)) {
  +        if (helpSettings.contains(DisplaySetting.DISPLAY_PROPERTY_OPTION)) {
               final HelpLine helpLine = new HelpLineImpl(this, depth);
               return Collections.singletonList(helpLine);
           }
  
  
  
  1.1.2.6   +5 -5      
jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/Switch.java
  
  Index: Switch.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/Switch.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- Switch.java       24 Feb 2004 02:01:40 -0000      1.1.2.5
  +++ Switch.java       30 Mar 2004 19:15:21 -0000      1.1.2.6
  @@ -26,7 +26,7 @@
   
   import org.apache.commons.cli2.Argument;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
   
  @@ -178,14 +178,14 @@
   
           // do we display optionality
           final boolean optional =
  -            !required && helpSettings.contains(HelpSetting.DISPLAY_OPTIONAL);
  +            !required && helpSettings.contains(DisplaySetting.DISPLAY_OPTIONAL);
           final boolean displayAliases =
  -            helpSettings.contains(HelpSetting.DISPLAY_ALIASES);
  +            helpSettings.contains(DisplaySetting.DISPLAY_ALIASES);
           final boolean disabled =
  -            helpSettings.contains(HelpSetting.DISPLAY_SWITCH_DISABLED);
  +            helpSettings.contains(DisplaySetting.DISPLAY_SWITCH_DISABLED);
           final boolean enabled =
               !disabled
  -                || helpSettings.contains(HelpSetting.DISPLAY_SWITCH_ENABLED);
  +                || helpSettings.contains(DisplaySetting.DISPLAY_SWITCH_ENABLED);
           final boolean both = disabled && enabled;
   
           if (optional) {
  
  
  
  1.1.2.7   +3 -3      
jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/DefaultOption.java
  
  Index: DefaultOption.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/DefaultOption.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- DefaultOption.java        10 Mar 2004 23:58:35 -0000      1.1.2.6
  +++ DefaultOption.java        30 Mar 2004 19:15:21 -0000      1.1.2.7
  @@ -26,7 +26,7 @@
   
   import org.apache.commons.cli2.Argument;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
   
  @@ -197,9 +197,9 @@
   
           // do we display optionality
           final boolean optional =
  -            !required && helpSettings.contains(HelpSetting.DISPLAY_OPTIONAL);
  +            !required && helpSettings.contains(DisplaySetting.DISPLAY_OPTIONAL);
           final boolean displayAliases =
  -            helpSettings.contains(HelpSetting.DISPLAY_ALIASES);
  +            helpSettings.contains(DisplaySetting.DISPLAY_ALIASES);
   
           if (optional) {
               buffer.append('[');
  
  
  
  1.1.2.6   +3 -3      
jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/Command.java
  
  Index: Command.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/Command.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- Command.java      24 Feb 2004 02:01:40 -0000      1.1.2.5
  +++ Command.java      30 Mar 2004 19:15:21 -0000      1.1.2.6
  @@ -26,7 +26,7 @@
   
   import org.apache.commons.cli2.Argument;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
   
  @@ -170,9 +170,9 @@
   
           // do we display optionality
           final boolean optional =
  -            !required && helpSettings.contains(HelpSetting.DISPLAY_OPTIONAL);
  +            !required && helpSettings.contains(DisplaySetting.DISPLAY_OPTIONAL);
           final boolean displayAliases =
  -            helpSettings.contains(HelpSetting.DISPLAY_ALIASES);
  +            helpSettings.contains(DisplaySetting.DISPLAY_ALIASES);
   
           if (optional) {
               buffer.append('[');
  
  
  
  1.1.2.5   +2 -2      
jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/OptionImpl.java
  
  Index: OptionImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/OptionImpl.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- OptionImpl.java   27 Mar 2004 00:15:42 -0000      1.1.2.4
  +++ OptionImpl.java   30 Mar 2004 19:15:21 -0000      1.1.2.5
  @@ -17,7 +17,7 @@
   
   import java.util.ListIterator;
   
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   
   /**
  @@ -52,7 +52,7 @@
   
       public String toString() {
           final StringBuffer buffer = new StringBuffer();
  -        appendUsage(buffer, HelpSetting.ALL, null);
  +        appendUsage(buffer, DisplaySetting.ALL, null);
           return buffer.toString();
       }
   
  
  
  
  No                   revision
  No                   revision
  1.1.2.7   +7 -7      
jakarta-commons/cli/src/java/org/apache/commons/cli2/Attic/HelpFormatter.java
  
  Index: HelpFormatter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/Attic/HelpFormatter.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- HelpFormatter.java        8 Feb 2004 14:01:46 -0000       1.1.2.6
  +++ HelpFormatter.java        30 Mar 2004 19:15:21 -0000      1.1.2.7
  @@ -39,18 +39,18 @@
       public static final Set DEFAULT_DISPLAY_USAGE_SETTINGS;
   
       static {
  -        final Set fullUsage = new HashSet(HelpSetting.ALL);
  -        fullUsage.remove(HelpSetting.DISPLAY_ALIASES);
  -        fullUsage.remove(HelpSetting.DISPLAY_GROUP_NAME);
  +        final Set fullUsage = new HashSet(DisplaySetting.ALL);
  +        fullUsage.remove(DisplaySetting.DISPLAY_ALIASES);
  +        fullUsage.remove(DisplaySetting.DISPLAY_GROUP_NAME);
           DEFAULT_FULL_USAGE_SETTINGS = Collections.unmodifiableSet(fullUsage);
   
           final Set lineUsage = new HashSet();
  -        lineUsage.add(HelpSetting.DISPLAY_ALIASES);
  -        lineUsage.add(HelpSetting.DISPLAY_GROUP_NAME);
  +        lineUsage.add(DisplaySetting.DISPLAY_ALIASES);
  +        lineUsage.add(DisplaySetting.DISPLAY_GROUP_NAME);
           DEFAULT_LINE_USAGE_SETTINGS = Collections.unmodifiableSet(lineUsage);
   
  -        final Set displayUsage = new HashSet(HelpSetting.ALL);
  -        displayUsage.remove(HelpSetting.DISPLAY_PARENT_ARGUMENT);
  +        final Set displayUsage = new HashSet(DisplaySetting.ALL);
  +        displayUsage.remove(DisplaySetting.DISPLAY_PARENT_ARGUMENT);
           DEFAULT_DISPLAY_USAGE_SETTINGS =
               Collections.unmodifiableSet(displayUsage);
       }
  
  
  
  1.1.2.6   +2 -2      
jakarta-commons/cli/src/java/org/apache/commons/cli2/Attic/OptionException.java
  
  Index: OptionException.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/Attic/OptionException.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- OptionException.java      24 Feb 2004 02:01:40 -0000      1.1.2.5
  +++ OptionException.java      30 Mar 2004 19:15:21 -0000      1.1.2.6
  @@ -30,8 +30,8 @@
   
       static {
           final Set settings = new HashSet();
  -        settings.add(HelpSetting.DISPLAY_CONSUME_REMAINING_OPTION);
  -        settings.add(HelpSetting.DISPLAY_PROPERTY_OPTION);
  +        settings.add(DisplaySetting.DISPLAY_CONSUME_REMAINING_OPTION);
  +        settings.add(DisplaySetting.DISPLAY_PROPERTY_OPTION);
           HELP_SETTINGS = Collections.unmodifiableSet(settings);
       }
   
  
  
  
  No                   revision
  
  Index: OptionException.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/Attic/OptionException.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- OptionException.java      24 Feb 2004 02:01:40 -0000      1.1.2.5
  +++ OptionException.java      30 Mar 2004 19:15:21 -0000      1.1.2.6
  @@ -30,8 +30,8 @@
   
       static {
           final Set settings = new HashSet();
  -        settings.add(HelpSetting.DISPLAY_CONSUME_REMAINING_OPTION);
  -        settings.add(HelpSetting.DISPLAY_PROPERTY_OPTION);
  +        settings.add(DisplaySetting.DISPLAY_CONSUME_REMAINING_OPTION);
  +        settings.add(DisplaySetting.DISPLAY_PROPERTY_OPTION);
           HELP_SETTINGS = Collections.unmodifiableSet(settings);
       }
   
  
  
  
  No                   revision
  
  Index: OptionException.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/Attic/OptionException.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- OptionException.java      24 Feb 2004 02:01:40 -0000      1.1.2.5
  +++ OptionException.java      30 Mar 2004 19:15:21 -0000      1.1.2.6
  @@ -30,8 +30,8 @@
   
       static {
           final Set settings = new HashSet();
  -        settings.add(HelpSetting.DISPLAY_CONSUME_REMAINING_OPTION);
  -        settings.add(HelpSetting.DISPLAY_PROPERTY_OPTION);
  +        settings.add(DisplaySetting.DISPLAY_CONSUME_REMAINING_OPTION);
  +        settings.add(DisplaySetting.DISPLAY_PROPERTY_OPTION);
           HELP_SETTINGS = Collections.unmodifiableSet(settings);
       }
   
  
  
  
  1.1.2.1   +82 -0     
jakarta-commons/cli/src/java/org/apache/commons/cli2/Attic/DisplaySetting.java
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.6   +7 -7      
jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/PropertyOptionTest.java
  
  Index: PropertyOptionTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/PropertyOptionTest.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- PropertyOptionTest.java   24 Feb 2004 02:01:40 -0000      1.1.2.5
  +++ PropertyOptionTest.java   30 Mar 2004 19:15:21 -0000      1.1.2.6
  @@ -22,7 +22,7 @@
   import java.util.Set;
   
   import org.apache.commons.cli2.HelpLine;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
  @@ -161,7 +161,7 @@
       public void testAppendUsage() {
           final Option option = new PropertyOption();
           final StringBuffer buffer = new StringBuffer();
  -        option.appendUsage(buffer, HelpSetting.ALL, null);
  +        option.appendUsage(buffer, DisplaySetting.ALL, null);
   
           assertEquals("-D<property>=<value>", buffer.toString());
       }
  @@ -169,8 +169,8 @@
       public void testAppendUsage_Hidden() {
           final Option option = new PropertyOption();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_PROPERTY_OPTION);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_PROPERTY_OPTION);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("", buffer.toString());
  @@ -205,7 +205,7 @@
        */
       public void testHelpLines() {
           final Option option = new PropertyOption();
  -        final List lines = option.helpLines(0, HelpSetting.ALL, null);
  +        final List lines = option.helpLines(0, DisplaySetting.ALL, null);
           final Iterator i = lines.iterator();
   
           final HelpLine line1 = (HelpLine)i.next();
  @@ -222,8 +222,8 @@
        */
       public void testHelpLines_NoDisplay() {
           final Option option = new PropertyOption();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_PROPERTY_OPTION);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_PROPERTY_OPTION);
           final List lines = option.helpLines(0, settings, null);
           final Iterator i = lines.iterator();
   
  
  
  
  1.1.2.8   +19 -19    
jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/GroupTest.java
  
  Index: GroupTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/GroupTest.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- GroupTest.java    5 Mar 2004 23:52:36 -0000       1.1.2.7
  +++ GroupTest.java    30 Mar 2004 19:15:21 -0000      1.1.2.8
  @@ -24,7 +24,7 @@
   
   import org.apache.commons.cli2.Group;
   import org.apache.commons.cli2.HelpLine;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
  @@ -255,8 +255,8 @@
       public void testAppendUsage() {
           final Option option = buildApacheCommandGroup();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        //settings.remove(HelpSetting.DISPLAY_ARGUMENT_NUMBERED);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        //settings.remove(DisplaySetting.DISPLAY_ARGUMENT_NUMBERED);
           option.appendUsage(buffer, settings, null);
   
           assertEquals(
  @@ -267,8 +267,8 @@
       public void testAppendUsage_NoOptional() {
           final Option option = buildApacheCommandGroup();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_OPTIONAL);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_OPTIONAL);
           option.appendUsage(buffer, settings, null);
   
           assertEquals(
  @@ -279,8 +279,8 @@
       public void testAppendUsage_NoExpand() {
           final Option option = buildApacheCommandGroup();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_GROUP_EXPANDED);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_GROUP_EXPANDED);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("httpd-cmds", buffer.toString());
  @@ -289,9 +289,9 @@
       public void testAppendUsage_NoExpandOrName() {
           final Option option = buildApacheCommandGroup();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_GROUP_EXPANDED);
  -        settings.remove(HelpSetting.DISPLAY_GROUP_NAME);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_GROUP_EXPANDED);
  +        settings.remove(DisplaySetting.DISPLAY_GROUP_NAME);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("httpd-cmds", buffer.toString());
  @@ -300,8 +300,8 @@
       public void testAppendUsage_NoName() {
           final Option option = buildApacheCommandGroup();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_GROUP_NAME);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_GROUP_NAME);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("graceful|restart|start|stop", buffer.toString());
  @@ -310,8 +310,8 @@
       public void testAppendUsage_WithArgs() {
           final Option option = buildAntGroup();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_GROUP_OUTER);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_GROUP_OUTER);
           option.appendUsage(buffer, settings, null);
   
           assertEquals(
  @@ -348,7 +348,7 @@
        */
       public void testHelpLines() {
           final Option option = buildApacheCommandGroup();
  -        final List lines = option.helpLines(0, HelpSetting.ALL, null);
  +        final List lines = option.helpLines(0, DisplaySetting.ALL, null);
           final Iterator i = lines.iterator();
   
           final HelpLine line1 = (HelpLine)i.next();
  @@ -381,8 +381,8 @@
        */
       public void testHelpLines_NoExpanded() {
           final Option option = buildApacheCommandGroup();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_GROUP_EXPANDED);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_GROUP_EXPANDED);
           final List lines = option.helpLines(0, settings, null);
           final Iterator i = lines.iterator();
   
  @@ -400,8 +400,8 @@
        */
       public void testHelpLines_NoName() {
           final Option option = buildApacheCommandGroup();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_GROUP_NAME);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_GROUP_NAME);
           final List lines = option.helpLines(0, settings, null);
           final Iterator i = lines.iterator();
   
  
  
  
  1.1.2.12  +9 -9      
jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ArgumentTest.java
  
  Index: ArgumentTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ArgumentTest.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- ArgumentTest.java 11 Mar 2004 00:26:57 -0000      1.1.2.11
  +++ ArgumentTest.java 30 Mar 2004 19:15:21 -0000      1.1.2.12
  @@ -26,7 +26,7 @@
   
   import org.apache.commons.cli2.Argument;
   import org.apache.commons.cli2.HelpLine;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.WriteableCommandLine;
  @@ -442,7 +442,7 @@
       public void testAppendUsage() {
           final Option option = buildUsernameArgument();
           final StringBuffer buffer = new StringBuffer();
  -        option.appendUsage(buffer, HelpSetting.ALL, null);
  +        option.appendUsage(buffer, DisplaySetting.ALL, null);
   
           assertEquals("<username>", buffer.toString());
       }
  @@ -450,7 +450,7 @@
       public void testAppendUsage_Infinite() {
           final Option option = buildTargetsArgument();
           final StringBuffer buffer = new StringBuffer();
  -        option.appendUsage(buffer, HelpSetting.ALL, null);
  +        option.appendUsage(buffer, DisplaySetting.ALL, null);
   
           assertEquals("[<target1> [<target2> ...]]", buffer.toString());
       }
  @@ -458,8 +458,8 @@
       public void testAppendUsage_InfiniteNoOptional() {
           final Option option = buildTargetsArgument();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_OPTIONAL);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_OPTIONAL);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("<target1> [<target2> ...]", buffer.toString());
  @@ -468,8 +468,8 @@
       public void testAppendUsage_InfiniteNoNumbering() {
           final Option option = buildTargetsArgument();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_ARGUMENT_NUMBERED);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_ARGUMENT_NUMBERED);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("[<target> [<target> ...]]", buffer.toString());
  @@ -478,7 +478,7 @@
       public void testAppendUsage_Minimum() {
           final Option option = buildHostArgument();
           final StringBuffer buffer = new StringBuffer();
  -        option.appendUsage(buffer, HelpSetting.ALL, null);
  +        option.appendUsage(buffer, DisplaySetting.ALL, null);
   
           assertEquals("<host1> <host2> [<host3>]", buffer.toString());
       }
  @@ -510,7 +510,7 @@
        */
       public void testHelpLines() {
           final Option option = buildHostArgument();
  -        final List lines = option.helpLines(0, HelpSetting.ALL, null);
  +        final List lines = option.helpLines(0, DisplaySetting.ALL, null);
           final Iterator i = lines.iterator();
   
           final HelpLine line1 = (HelpLine)i.next();
  
  
  
  1.1.2.6   +16 -16    
jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ParentTest.java
  
  Index: ParentTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ParentTest.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- ParentTest.java   24 Feb 2004 02:01:40 -0000      1.1.2.5
  +++ ParentTest.java   30 Mar 2004 19:15:21 -0000      1.1.2.6
  @@ -24,7 +24,7 @@
   import org.apache.commons.cli2.Argument;
   import org.apache.commons.cli2.Group;
   import org.apache.commons.cli2.HelpLine;
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.Parent;
  @@ -263,8 +263,8 @@
        public void testAppendUsage() {
                final Option option = buildComplexParent();
                final StringBuffer buffer = new StringBuffer();
  -             final Set settings = new HashSet(HelpSetting.ALL);
  -             settings.remove(HelpSetting.DISPLAY_GROUP_OUTER);
  +             final Set settings = new HashSet(DisplaySetting.ALL);
  +             settings.remove(DisplaySetting.DISPLAY_GROUP_OUTER);
                option.appendUsage(buffer, settings, null);
   
                assertEquals(
  @@ -275,9 +275,9 @@
        public void testAppendUsage_NoArguments() {
                final Option option = buildComplexParent();
                final StringBuffer buffer = new StringBuffer();
  -             final Set settings = new HashSet(HelpSetting.ALL);
  -             settings.remove(HelpSetting.DISPLAY_PARENT_ARGUMENT);
  -             settings.remove(HelpSetting.DISPLAY_GROUP_OUTER);
  +             final Set settings = new HashSet(DisplaySetting.ALL);
  +             settings.remove(DisplaySetting.DISPLAY_PARENT_ARGUMENT);
  +             settings.remove(DisplaySetting.DISPLAY_GROUP_OUTER);
                option.appendUsage(buffer, settings, null);
   
                assertEquals(
  @@ -288,8 +288,8 @@
        public void testAppendUsage_NoChildren() {
                final Option option = buildComplexParent();
                final StringBuffer buffer = new StringBuffer();
  -             final Set settings = new HashSet(HelpSetting.ALL);
  -             settings.remove(HelpSetting.DISPLAY_PARENT_CHILDREN);
  +             final Set settings = new HashSet(DisplaySetting.ALL);
  +             settings.remove(DisplaySetting.DISPLAY_PARENT_CHILDREN);
                option.appendUsage(buffer, settings, null);
   
                assertEquals("[login (lo) <username>]", buffer.toString());
  @@ -298,9 +298,9 @@
        public void testAppendUsage_NoArgumentsOrChildren() {
                final Option option = buildComplexParent();
                final StringBuffer buffer = new StringBuffer();
  -             final Set settings = new HashSet(HelpSetting.ALL);
  -             settings.remove(HelpSetting.DISPLAY_PARENT_CHILDREN);
  -             settings.remove(HelpSetting.DISPLAY_PARENT_ARGUMENT);
  +             final Set settings = new HashSet(DisplaySetting.ALL);
  +             settings.remove(DisplaySetting.DISPLAY_PARENT_CHILDREN);
  +             settings.remove(DisplaySetting.DISPLAY_PARENT_ARGUMENT);
                option.appendUsage(buffer, settings, null);
   
                assertEquals("[login (lo)]", buffer.toString());
  @@ -328,7 +328,7 @@
        public void testHelpLines() {
                final Option option = buildComplexParent();
                final List lines =
  -                     option.helpLines(0, HelpSetting.ALL, null);
  +                     option.helpLines(0, DisplaySetting.ALL, null);
                final Iterator i = lines.iterator();
   
                final HelpLine line1 = (HelpLine) i.next();
  @@ -360,8 +360,8 @@
   
        public void testHelpLines_NoArgument() {
                final Option option = buildComplexParent();
  -             final Set settings = new HashSet(HelpSetting.ALL);
  -             settings.remove(HelpSetting.DISPLAY_PARENT_ARGUMENT);
  +             final Set settings = new HashSet(DisplaySetting.ALL);
  +             settings.remove(DisplaySetting.DISPLAY_PARENT_ARGUMENT);
                final List lines = option.helpLines(0, settings, null);
                final Iterator i = lines.iterator();
   
  @@ -390,8 +390,8 @@
   
        public void testHelpLines_NoChildren() {
                final Option option = buildComplexParent();
  -             final Set settings = new HashSet(HelpSetting.ALL);
  -             settings.remove(HelpSetting.DISPLAY_PARENT_CHILDREN);
  +             final Set settings = new HashSet(DisplaySetting.ALL);
  +             settings.remove(DisplaySetting.DISPLAY_PARENT_CHILDREN);
                final List lines = option.helpLines(0, settings, null);
                final Iterator i = lines.iterator();
   
  
  
  
  1.1.2.7   +6 -6      
jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/CommandTest.java
  
  Index: CommandTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/CommandTest.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- CommandTest.java  24 Feb 2004 02:01:40 -0000      1.1.2.6
  +++ CommandTest.java  30 Mar 2004 19:15:21 -0000      1.1.2.7
  @@ -21,7 +21,7 @@
   import java.util.ListIterator;
   import java.util.Set;
   
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.Parent;
  @@ -183,7 +183,7 @@
       public void testAppendUsage() {
           final Option option = buildStartCommand();
           final StringBuffer buffer = new StringBuffer();
  -        option.appendUsage(buffer, HelpSetting.ALL, null);
  +        option.appendUsage(buffer, DisplaySetting.ALL, null);
   
           assertEquals("[start (go)]", buffer.toString());
       }
  @@ -191,8 +191,8 @@
       public void testAppendUsage_NoOptional() {
           final Option option = buildStartCommand();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_OPTIONAL);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_OPTIONAL);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("start (go)", buffer.toString());
  @@ -201,8 +201,8 @@
       public void testAppendUsage_NoAlias() {
           final Option option = buildStartCommand();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_ALIASES);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_ALIASES);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("[start]", buffer.toString());
  
  
  
  1.1.2.7   +11 -11    
jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/SwitchTest.java
  
  Index: SwitchTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/SwitchTest.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- SwitchTest.java   24 Feb 2004 02:01:40 -0000      1.1.2.6
  +++ SwitchTest.java   30 Mar 2004 19:15:21 -0000      1.1.2.7
  @@ -20,7 +20,7 @@
   import java.util.ListIterator;
   import java.util.Set;
   
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.Parent;
  @@ -158,7 +158,7 @@
       public void testAppendUsage() {
           final Option option = buildDisplaySwitch();
           final StringBuffer buffer = new StringBuffer();
  -        option.appendUsage(buffer, HelpSetting.ALL, null);
  +        option.appendUsage(buffer, DisplaySetting.ALL, null);
   
           assertEquals(
               "+display|-display (+d|-d,+disp|-disp)",
  @@ -168,8 +168,8 @@
       public void testAppendUsage_NoAlias() {
           final Option option = buildDisplaySwitch();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_ALIASES);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_ALIASES);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("+display|-display", buffer.toString());
  @@ -178,8 +178,8 @@
       public void testAppendUsage_NoDisabled() {
           final Option option = buildDisplaySwitch();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_SWITCH_DISABLED);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_SWITCH_DISABLED);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("+display (+d,+disp)", buffer.toString());
  @@ -188,8 +188,8 @@
       public void testAppendUsage_NoEnabled() {
           final Option option = buildDisplaySwitch();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_SWITCH_ENABLED);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_SWITCH_ENABLED);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("-display (-d,-disp)", buffer.toString());
  @@ -198,9 +198,9 @@
       public void testAppendUsage_NoDisabledOrEnabled() {
           final Option option = buildDisplaySwitch();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_SWITCH_DISABLED);
  -        settings.remove(HelpSetting.DISPLAY_SWITCH_ENABLED);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_SWITCH_DISABLED);
  +        settings.remove(DisplaySetting.DISPLAY_SWITCH_ENABLED);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("+display (+d,+disp)", buffer.toString());
  
  
  
  1.1.2.7   +6 -6      
jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/DefaultOptionTest.java
  
  Index: DefaultOptionTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/DefaultOptionTest.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- DefaultOptionTest.java    24 Feb 2004 02:01:40 -0000      1.1.2.6
  +++ DefaultOptionTest.java    30 Mar 2004 19:15:21 -0000      1.1.2.7
  @@ -20,7 +20,7 @@
   import java.util.ListIterator;
   import java.util.Set;
   
  -import org.apache.commons.cli2.HelpSetting;
  +import org.apache.commons.cli2.DisplaySetting;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
   import org.apache.commons.cli2.Parent;
  @@ -170,7 +170,7 @@
       public void testAppendUsage() {
           final Option option = buildHelpOption();
           final StringBuffer buffer = new StringBuffer();
  -        option.appendUsage(buffer, HelpSetting.ALL, null);
  +        option.appendUsage(buffer, DisplaySetting.ALL, null);
   
           assertEquals("[--help (-?,-h)]", buffer.toString());
       }
  @@ -178,8 +178,8 @@
       public void testAppendUsage_NoOptional() {
           final Option option = buildHelpOption();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_OPTIONAL);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_OPTIONAL);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("--help (-?,-h)", buffer.toString());
  @@ -188,8 +188,8 @@
       public void testAppendUsage_NoAlias() {
           final Option option = buildHelpOption();
           final StringBuffer buffer = new StringBuffer();
  -        final Set settings = new HashSet(HelpSetting.ALL);
  -        settings.remove(HelpSetting.DISPLAY_ALIASES);
  +        final Set settings = new HashSet(DisplaySetting.ALL);
  +        settings.remove(DisplaySetting.DISPLAY_ALIASES);
           option.appendUsage(buffer, settings, null);
   
           assertEquals("[--help]", buffer.toString());
  
  
  
  No                   revision
  No                   revision
  1.1.2.7   +6 -6      
jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/DocumentationTest.java
  
  Index: DocumentationTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/DocumentationTest.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- DocumentationTest.java    24 Feb 2004 02:01:40 -0000      1.1.2.6
  +++ DocumentationTest.java    30 Mar 2004 19:15:22 -0000      1.1.2.7
  @@ -302,14 +302,14 @@
   
           HelpFormatter hf = new HelpFormatter();
           hf.setShellCommand("ant");
  -        hf.getFullUsageSettings().add(HelpSetting.DISPLAY_GROUP_NAME);
  -        hf.getFullUsageSettings().add(HelpSetting.DISPLAY_GROUP_ARGUMENT);
  -        hf.getFullUsageSettings().remove(HelpSetting.DISPLAY_GROUP_EXPANDED);
  +        hf.getFullUsageSettings().add(DisplaySetting.DISPLAY_GROUP_NAME);
  +        hf.getFullUsageSettings().add(DisplaySetting.DISPLAY_GROUP_ARGUMENT);
  +        hf.getFullUsageSettings().remove(DisplaySetting.DISPLAY_GROUP_EXPANDED);
   
  -        hf.getLineUsageSettings().add(HelpSetting.DISPLAY_PROPERTY_OPTION);
  -        hf.getLineUsageSettings().add(HelpSetting.DISPLAY_PARENT_ARGUMENT);
  +        hf.getLineUsageSettings().add(DisplaySetting.DISPLAY_PROPERTY_OPTION);
  +        hf.getLineUsageSettings().add(DisplaySetting.DISPLAY_PARENT_ARGUMENT);
   
  -        hf.getDisplaySettings().remove(HelpSetting.DISPLAY_GROUP_ARGUMENT);
  +        hf.getDisplaySettings().remove(DisplaySetting.DISPLAY_GROUP_ARGUMENT);
   
           hf.setGroup(options);
           // redirect printed stuff to a string
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to