commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roxspr...@apache.org
Subject cvs commit: jakarta-commons/cli/src/java/org/apache/commons/cli2/validation ClassValidator.java
Date Thu, 22 Apr 2004 20:26:05 GMT
roxspring    2004/04/22 13:26:05

  Modified:    cli/src/java/org/apache/commons/cli2/option Tag:
                        RESEARCH_CLI_2_ROXSPRING GroupImpl.java Switch.java
                        Command.java OptionImpl.java DefaultOption.java
                        ParentImpl.java ArgumentImpl.java
               cli/src/java/org/apache/commons/cli2/builder Tag:
                        RESEARCH_CLI_2_ROXSPRING GroupBuilder.java
                        ArgumentBuilder.java DefaultOptionBuilder.java
                        CommandBuilder.java SwitchBuilder.java
               cli/src/java/org/apache/commons/cli2/validation Tag:
                        RESEARCH_CLI_2_ROXSPRING ClassValidator.java
  Log:
  Fixed up javadoc warnings
  Fixed up eclipse 'local variable hiding field' warnings
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.5   +9 -9      jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/GroupImpl.java
  
  Index: GroupImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/GroupImpl.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- GroupImpl.java	20 Apr 2004 20:59:19 -0000	1.1.2.4
  +++ GroupImpl.java	22 Apr 2004 20:26:05 -0000	1.1.2.5
  @@ -78,14 +78,14 @@
           this.options = Collections.unmodifiableList(options);
   
           // anonymous Argument temporary storage
  -        final List anonymous = new ArrayList();
  +        final List newAnonymous = new ArrayList();
           
           // map (key=trigger & value=Option) temporary storage
  -        final SortedMap optionMap =
  +        final SortedMap newOptionMap =
               new TreeMap(ReverseStringComparator.getInstance());
   
           // prefixes temporary storage
  -        final Set prefixes = new HashSet();
  +        final Set newPrefixes = new HashSet();
           
           // process the options
           for (final Iterator i = options.iterator(); i.hasNext();) {
  @@ -94,23 +94,23 @@
   
               if (option instanceof Argument) {
                   i.remove();
  -                anonymous.add(option);
  +                newAnonymous.add(option);
               } 
               else {
                   final Set triggers = option.getTriggers();
                   
                   for (Iterator j = triggers.iterator(); j.hasNext();) {
  -                    optionMap.put(j.next(), option);
  +                    newOptionMap.put(j.next(), option);
                   }
   
                   // store the prefixes
  -                prefixes.addAll(option.getPrefixes());
  +                newPrefixes.addAll(option.getPrefixes());
               }
           }
           
  -        this.anonymous = Collections.unmodifiableList(anonymous);
  -        this.optionMap = Collections.unmodifiableSortedMap(optionMap);
  -        this.prefixes = Collections.unmodifiableSet(prefixes);
  +        this.anonymous = Collections.unmodifiableList(newAnonymous);
  +        this.optionMap = Collections.unmodifiableSortedMap(newOptionMap);
  +        this.prefixes = Collections.unmodifiableSet(newPrefixes);
       }
   
       public boolean canProcess(String arg) {
  
  
  
  1.1.2.4   +10 -10    jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/Switch.java
  
  Index: Switch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/Switch.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Switch.java	20 Apr 2004 20:59:19 -0000	1.1.2.3
  +++ Switch.java	22 Apr 2004 20:26:05 -0000	1.1.2.4
  @@ -101,10 +101,10 @@
               throw new IllegalArgumentException("preferredName must be at least 1 character");
           }
   
  -        final Set triggers = new HashSet();
  -        triggers.add(enabledPrefix + preferredName);
  -        triggers.add(disabledPrefix + preferredName);
  -        this.triggers = Collections.unmodifiableSet(triggers);
  +        final Set newTriggers = new HashSet();
  +        newTriggers.add(enabledPrefix + preferredName);
  +        newTriggers.add(disabledPrefix + preferredName);
  +        this.triggers = Collections.unmodifiableSet(newTriggers);
   
           if (aliases == null) {
               this.aliases = Collections.EMPTY_SET;
  @@ -113,15 +113,15 @@
               this.aliases = Collections.unmodifiableSet(new HashSet(aliases));
               for (final Iterator i = aliases.iterator(); i.hasNext();) {
                   final String alias = (String)i.next();
  -                triggers.add(enabledPrefix + alias);
  -                triggers.add(disabledPrefix + alias);
  +                newTriggers.add(enabledPrefix + alias);
  +                newTriggers.add(disabledPrefix + alias);
               }
           }
   
  -        final Set prefixes = new HashSet(super.getPrefixes());
  -        prefixes.add(enabledPrefix);
  -        prefixes.add(disabledPrefix);
  -        this.prefixes = Collections.unmodifiableSet(prefixes);
  +        final Set newPrefixes = new HashSet(super.getPrefixes());
  +        newPrefixes.add(enabledPrefix);
  +        newPrefixes.add(disabledPrefix);
  +        this.prefixes = Collections.unmodifiableSet(newPrefixes);
   
       }
   
  
  
  
  1.1.2.4   +5 -5      jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/Command.java
  
  Index: Command.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/Command.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Command.java	20 Apr 2004 20:59:19 -0000	1.1.2.3
  +++ Command.java	22 Apr 2004 20:26:05 -0000	1.1.2.4
  @@ -65,7 +65,7 @@
        * @param id
        *            A unique id for the Command
        * 
  -     * @see ParentImpl#ParentImpl(Argument, Group, String, int)
  +     * @see ParentImpl#ParentImpl(Argument, Group, String, int, boolean)
        */
       public Command(
           final String preferredName,
  @@ -94,10 +94,10 @@
           }
   
           // populate the triggers Set
  -        final Set triggers = new HashSet();
  -        triggers.add(preferredName);
  -        triggers.addAll(this.aliases);
  -        this.triggers = Collections.unmodifiableSet(triggers);
  +        final Set newTriggers = new HashSet();
  +        newTriggers.add(preferredName);
  +        newTriggers.addAll(this.aliases);
  +        this.triggers = Collections.unmodifiableSet(newTriggers);
       }
   
       public void processParent(
  
  
  
  1.1.2.4   +1 -0      jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/OptionImpl.java
  
  Index: OptionImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/OptionImpl.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- OptionImpl.java	20 Apr 2004 20:59:19 -0000	1.1.2.3
  +++ OptionImpl.java	22 Apr 2004 20:26:05 -0000	1.1.2.4
  @@ -32,6 +32,7 @@
       /**
        * Creates an OptionImpl with the specified id
        * @param id the unique id of this Option
  +     * @param required true iff this Option must be present
        */
       public OptionImpl(final int id, final boolean required) {
           this.id = id;
  
  
  
  1.1.2.4   +9 -9      jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/DefaultOption.java
  
  Index: DefaultOption.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/DefaultOption.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- DefaultOption.java	20 Apr 2004 20:59:19 -0000	1.1.2.3
  +++ DefaultOption.java	22 Apr 2004 20:26:05 -0000	1.1.2.4
  @@ -111,16 +111,16 @@
                   Collections.unmodifiableSet(new HashSet(burstAliases));
           }
   
  -        final Set triggers = new HashSet();
  -        triggers.add(preferredName);
  -        triggers.addAll(this.aliases);
  -        triggers.addAll(this.burstAliases);
  -        this.triggers = Collections.unmodifiableSet(triggers);
  +        final Set newTriggers = new HashSet();
  +        newTriggers.add(preferredName);
  +        newTriggers.addAll(this.aliases);
  +        newTriggers.addAll(this.burstAliases);
  +        this.triggers = Collections.unmodifiableSet(newTriggers);
   
  -        final Set prefixes = new HashSet(super.getPrefixes());
  -        prefixes.add(shortPrefix);
  -        prefixes.add(longPrefix);
  -        this.prefixes = Collections.unmodifiableSet(prefixes);
  +        final Set newPrefixes = new HashSet(super.getPrefixes());
  +        newPrefixes.add(shortPrefix);
  +        newPrefixes.add(longPrefix);
  +        this.prefixes = Collections.unmodifiableSet(newPrefixes);
       }
   
       public boolean canProcess(final String argument) {
  
  
  
  1.1.2.4   +4 -4      jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/ParentImpl.java
  
  Index: ParentImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/ParentImpl.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- ParentImpl.java	20 Apr 2004 20:59:19 -0000	1.1.2.3
  +++ ParentImpl.java	22 Apr 2004 20:26:05 -0000	1.1.2.4
  @@ -226,15 +226,15 @@
           final char separator) {
           
           // next token
  -        final String argument = (String)arguments.next();
  +        final String newArgument = (String)arguments.next();
           
           // split the token
  -        final int initialIndex = argument.indexOf(separator);
  +        final int initialIndex = newArgument.indexOf(separator);
           
           if (initialIndex > 0) {
               arguments.remove();
  -            arguments.add(argument.substring(0, initialIndex));
  -            arguments.add(argument.substring(initialIndex + 1));
  +            arguments.add(newArgument.substring(0, initialIndex));
  +            arguments.add(newArgument.substring(initialIndex + 1));
               arguments.previous();
           }
           arguments.previous();        
  
  
  
  1.1.2.4   +1 -1      jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/ArgumentImpl.java
  
  Index: ArgumentImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/option/Attic/ArgumentImpl.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- ArgumentImpl.java	20 Apr 2004 20:59:19 -0000	1.1.2.3
  +++ ArgumentImpl.java	22 Apr 2004 20:26:05 -0000	1.1.2.4
  @@ -92,7 +92,7 @@
        * @param id
        *            The id of the option, 0 implies automatic assignment.
        * 
  -     * @see OptionImpl#OptionImpl(int)
  +     * @see OptionImpl#OptionImpl(int,boolean)
        */
       public ArgumentImpl(
           final String name,
  
  
  
  No                   revision
  No                   revision
  1.1.2.3   +12 -12    jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/GroupBuilder.java
  
  Index: GroupBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/GroupBuilder.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- GroupBuilder.java	14 Apr 2004 18:31:16 -0000	1.1.2.2
  +++ GroupBuilder.java	22 Apr 2004 20:26:05 -0000	1.1.2.3
  @@ -66,41 +66,41 @@
   
       /**
        * Use this option description
  -     * @param description the description to use
  +     * @param newDescription the description to use
        * @return this builder
        */
  -    public GroupBuilder withDescription(final String description) {
  -        this.description = description;
  +    public GroupBuilder withDescription(final String newDescription) {
  +        this.description = newDescription;
           return this;
       }
   
       /**
        * Use this option name
  -     * @param name the name to use
  +     * @param newName the name to use
        * @return this builder
        */
  -    public GroupBuilder withName(final String name) {
  -        this.name = name;
  +    public GroupBuilder withName(final String newName) {
  +        this.name = newName;
           return this;
       }
   
       /**
        * A valid group requires at least this many options present
  -     * @param minimum the minimum Options required
  +     * @param newMinimum the minimum Options required
        * @return this builder
        */
  -    public GroupBuilder withMinimum(final int minimum) {
  -        this.minimum = minimum;
  +    public GroupBuilder withMinimum(final int newMinimum) {
  +        this.minimum = newMinimum;
           return this;
       }
   
       /**
        * A valid group requires at most this many options present
  -     * @param maximum the maximum Options allowed
  +     * @param newMaximum the maximum Options allowed
        * @return this builder
        */
  -    public GroupBuilder withMaximum(final int maximum) {
  -        this.maximum = maximum;
  +    public GroupBuilder withMaximum(final int newMaximum) {
  +        this.maximum = newMaximum;
           return this;
       }
   
  
  
  
  1.1.2.3   +30 -30    jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/ArgumentBuilder.java
  
  Index: ArgumentBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/ArgumentBuilder.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- ArgumentBuilder.java	14 Apr 2004 18:31:16 -0000	1.1.2.2
  +++ ArgumentBuilder.java	22 Apr 2004 20:26:05 -0000	1.1.2.3
  @@ -111,12 +111,12 @@
        * 
        * @see org.apache.commons.cli2.CommandLine#getValue(String)
        * 
  -     * @param name
  +     * @param newName
        *            the name of the argument
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withName(final String name) {
  -        this.name = name;
  +    public final ArgumentBuilder withName(final String newName) {
  +        this.name = newName;
           return this;
       }
   
  @@ -125,36 +125,36 @@
        * 
        * The description is used when displaying online help.
        * 
  -     * @param description
  +     * @param newDescription
        *            a description of the argument
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withDescription(final String description) {
  -        this.description = description;
  +    public final ArgumentBuilder withDescription(final String newDescription) {
  +        this.description = newDescription;
           return this;
       }
   
       /**
        * Sets the minimum number of values needed for the argument to be valid.
        * 
  -     * @param minimum
  +     * @param newMinimum
        *            the number of values needed
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withMinimum(final int minimum) {
  -        this.minimum = minimum;
  +    public final ArgumentBuilder withMinimum(final int newMinimum) {
  +        this.minimum = newMinimum;
           return this;
       }
   
       /**
        * Sets the maximum number of values allowed for the argument to be valid.
        * 
  -     * @param maximum
  +     * @param newMaximum
        *            the number of values allowed
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withMaximum(final int maximum) {
  -        this.maximum = maximum;
  +    public final ArgumentBuilder withMaximum(final int newMaximum) {
  +        this.maximum = newMaximum;
           return this;
       }
   
  @@ -163,13 +163,13 @@
        * argument is of the form -libs:dir1,dir2,dir3 the initialSeparator would
        * be ':'.
        * 
  -     * @param initialSeparator
  +     * @param newInitialSeparator
        *            the character used to separate the values from the option
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withInitialSeparator(final char initialSeparator) {
  +    public final ArgumentBuilder withInitialSeparator(final char newInitialSeparator) {
   
  -        this.initialSeparator = initialSeparator;
  +        this.initialSeparator = newInitialSeparator;
           return this;
       }
   
  @@ -178,13 +178,13 @@
        * argument is of the form -libs:dir1,dir2,dir3 the subsequentSeparator
        * would be ','.
        * 
  -     * @param subsequentSeparator
  +     * @param newSubsequentSeparator
        *            the character used to separate the values from each other
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withSubsequentSeparator(final char subsequentSeparator)
{
  +    public final ArgumentBuilder withSubsequentSeparator(final char newSubsequentSeparator)
{
   
  -        this.subsequentSeparator = subsequentSeparator;
  +        this.subsequentSeparator = newSubsequentSeparator;
           return this;
       }
   
  @@ -192,12 +192,12 @@
        * Sets the validator instance used to perform validation on the Argument
        * values.
        * 
  -     * @param validator
  +     * @param newValidator
        *            a Validator instance
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withValidator(final Validator validator) {
  -        this.validator = validator;
  +    public final ArgumentBuilder withValidator(final Validator newValidator) {
  +        this.validator = newValidator;
           return this;
       }
   
  @@ -205,13 +205,13 @@
        * Sets the "consume remaining" option, defaults to "--". Use this if you
        * want to allow values that might be confused with option strings.
        * 
  -     * @param consumeRemaining
  +     * @param newConsumeRemaining
        *            the string to use for the consume remaining option
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withConsumeRemaining(final String consumeRemaining) {
  +    public final ArgumentBuilder withConsumeRemaining(final String newConsumeRemaining)
{
   
  -        this.consumeRemaining = consumeRemaining;
  +        this.consumeRemaining = newConsumeRemaining;
           return this;
       }
   
  @@ -234,26 +234,26 @@
       /**
        * Sets the default values.
        * 
  -     * @param defaultValues
  +     * @param newDefaultValues
        *            the default values for the Argument
        * 
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withDefaults(final List defaultValues) {
  -        this.defaultValues = defaultValues;
  +    public final ArgumentBuilder withDefaults(final List newDefaultValues) {
  +        this.defaultValues = newDefaultValues;
           return this;
       }
   
       /**
        * Sets the id
        * 
  -     * @param id
  +     * @param newId
        *            the id of the Argument
        * 
        * @return this ArgumentBuilder
        */
  -    public final ArgumentBuilder withId(final int id) {
  -        this.id = id;
  +    public final ArgumentBuilder withId(final int newId) {
  +        this.id = newId;
           return this;
       }
   }
  
  
  
  1.1.2.3   +15 -15    jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/DefaultOptionBuilder.java
  
  Index: DefaultOptionBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/DefaultOptionBuilder.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- DefaultOptionBuilder.java	14 Apr 2004 18:31:16 -0000	1.1.2.2
  +++ DefaultOptionBuilder.java	22 Apr 2004 20:26:05 -0000	1.1.2.3
  @@ -167,53 +167,53 @@
   
       /**
        * Use this option description
  -     * @param description the description to use
  +     * @param newDescription the description to use
        * @return this builder
        */
  -    public DefaultOptionBuilder withDescription(final String description) {
  -        this.description = description;
  +    public DefaultOptionBuilder withDescription(final String newDescription) {
  +        this.description = newDescription;
           return this;
       }
   
       /**
        * Use this optionality
  -     * @param required true iff the Option is required
  +     * @param newRequired true iff the Option is required
        * @return this builder
        */
  -    public DefaultOptionBuilder withRequired(final boolean required) {
  -        this.required = required;
  +    public DefaultOptionBuilder withRequired(final boolean newRequired) {
  +        this.required = newRequired;
           return this;
       }
   
       /**
        * Use this child Group
  -     * @param children the child Group to use
  +     * @param newChildren the child Group to use
        * @return this builder
        */
  -    public DefaultOptionBuilder withChildren(final Group children) {
  -        this.children = children;
  +    public DefaultOptionBuilder withChildren(final Group newChildren) {
  +        this.children = newChildren;
           return this;
       }
   
       /**
        * Use this Argument
  -     * @param argument the argument to use
  +     * @param newArgument the argument to use
        * @return this builder
        */
  -    public DefaultOptionBuilder withArgument(final Argument argument) {
  -        this.argument = argument;
  +    public DefaultOptionBuilder withArgument(final Argument newArgument) {
  +        this.argument = newArgument;
           return this;
       }
   
       /**
        * Sets the id
        * 
  -     * @param id
  +     * @param newId
        *            the id of the DefaultOption
        * @return this DefaultOptionBuilder
        */
  -    public final DefaultOptionBuilder withId(final int id) {
  -        this.id = id;
  +    public final DefaultOptionBuilder withId(final int newId) {
  +        this.id = newId;
           return this;
       }
   }
  
  
  
  1.1.2.3   +15 -15    jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/CommandBuilder.java
  
  Index: CommandBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/CommandBuilder.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- CommandBuilder.java	14 Apr 2004 18:31:16 -0000	1.1.2.2
  +++ CommandBuilder.java	22 Apr 2004 20:26:05 -0000	1.1.2.3
  @@ -109,58 +109,58 @@
        * Sets the description of the command. The description is used to produce
        * online help for the command.
        * 
  -     * @param description
  +     * @param newDescription
        *            The description of the command
        * @return this CommandBuilder
        */
  -    public CommandBuilder withDescription(final String description) {
  -        this.description = description;
  +    public CommandBuilder withDescription(final String newDescription) {
  +        this.description = newDescription;
           return this;
       }
   
       /**
        * Use this optionality
  -     * @param required true iff the Option is required
  +     * @param newRequired true iff the Option is required
        * @return this builder
        */
  -    public CommandBuilder withRequired(final boolean required) {
  -        this.required = required;
  +    public CommandBuilder withRequired(final boolean newRequired) {
  +        this.required = newRequired;
           return this;
       }
   
       /**
        * Sets the children of the Command.
        * 
  -     * @param children
  +     * @param newChildren
        *            the child options for the Command
        * @return this CommandBuilder
        */
  -    public CommandBuilder withChildren(final Group children) {
  -        this.children = children;
  +    public CommandBuilder withChildren(final Group newChildren) {
  +        this.children = newChildren;
           return this;
       }
   
       /**
        * Sets the argument of the Command.
        * 
  -     * @param argument
  +     * @param newArgument
        *            the argument for the Command
        * @return this CommandBuilder
        */
  -    public CommandBuilder withArgument(final Argument argument) {
  -        this.argument = argument;
  +    public CommandBuilder withArgument(final Argument newArgument) {
  +        this.argument = newArgument;
           return this;
       }
   
       /**
        * Sets the id
        * 
  -     * @param id
  +     * @param newId
        *            the id of the Command
        * @return this CommandBuilder
        */
  -    public final CommandBuilder withId(final int id) {
  -        this.id = id;
  +    public final CommandBuilder withId(final int newId) {
  +        this.id = newId;
           return this;
       }
   }
  
  
  
  1.1.2.3   +15 -15    jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/SwitchBuilder.java
  
  Index: SwitchBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/builder/Attic/SwitchBuilder.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- SwitchBuilder.java	14 Apr 2004 18:31:16 -0000	1.1.2.2
  +++ SwitchBuilder.java	22 Apr 2004 20:26:05 -0000	1.1.2.3
  @@ -108,11 +108,11 @@
   
       /**
        * Use this option description
  -     * @param description the description to use
  +     * @param newDescription the description to use
        * @return this builder
        */
  -    public SwitchBuilder withDescription(final String description) {
  -        this.description = description;
  +    public SwitchBuilder withDescription(final String newDescription) {
  +        this.description = newDescription;
           return this;
       }
   
  @@ -134,43 +134,43 @@
   
       /**
        * Use this optionality
  -     * @param required true iff the Option is required
  +     * @param newRequired true iff the Option is required
        * @return this builder
        */
  -    public SwitchBuilder withRequired(final boolean required) {
  -        this.required = required;
  +    public SwitchBuilder withRequired(final boolean newRequired) {
  +        this.required = newRequired;
           return this;
       }
   
       /**
        * Use this Argument
  -     * @param argument the argument to use
  +     * @param newArgument the argument to use
        * @return this builder
        */
  -    public SwitchBuilder withArgument(final Argument argument) {
  -        this.argument = argument;
  +    public SwitchBuilder withArgument(final Argument newArgument) {
  +        this.argument = newArgument;
           return this;
       }
   
       /**
        * Use this child Group
  -     * @param children the child Group to use
  +     * @param newChildren the child Group to use
        * @return this builder
        */
  -    public SwitchBuilder withChildren(final Group children) {
  -        this.children = children;
  +    public SwitchBuilder withChildren(final Group newChildren) {
  +        this.children = newChildren;
           return this;
       }
   
       /**
        * Sets the id
        * 
  -     * @param id
  +     * @param newId
        *            the id of the Switch
        * @return this SwitchBuilder
        */
  -    public final SwitchBuilder withId(final int id) {
  -        this.id = id;
  +    public final SwitchBuilder withId(final int newId) {
  +        this.id = newId;
           return this;
       }
   }
  
  
  
  No                   revision
  No                   revision
  1.1.2.8   +2 -2      jakarta-commons/cli/src/java/org/apache/commons/cli2/validation/Attic/ClassValidator.java
  
  Index: ClassValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/validation/Attic/ClassValidator.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- ClassValidator.java	14 Apr 2004 18:31:15 -0000	1.1.2.7
  +++ ClassValidator.java	22 Apr 2004 20:26:05 -0000	1.1.2.8
  @@ -47,9 +47,9 @@
               }
   
               if (loadable || instance) {
  -                final ClassLoader loader = getClassLoader();
  +                final ClassLoader theLoader = getClassLoader();
                   try {
  -                    final Class clazz = loader.loadClass(name);
  +                    final Class clazz = theLoader.loadClass(name);
                       if (instance) {
                           i.set(clazz.newInstance());
                       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message