Skip to content

Commit d3a34db

Browse files
committed
Fixing the trailing whitespace with a proper regex this time
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@639944 13f79535-47bb-0310-9956-ffa450edef68
1 parent ca1e681 commit d3a34db

40 files changed

Lines changed: 425 additions & 425 deletions

src/java/org/apache/commons/cli2/Argument.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public interface Argument extends Option {
2727
/**
2828
* Returns the initial separator character or
2929
* '\0' if no character has been set.
30-
*
30+
*
3131
* @return char the initial separator character
3232
*/
3333
char getInitialSeparator();
34-
34+
3535
/**
3636
* Processes the "README" style element of the argument.
3737
*
@@ -50,10 +50,10 @@ void processValues(
5050
final ListIterator args,
5151
final Option option)
5252
throws OptionException;
53-
53+
5454
/**
5555
* Adds defaults to a CommandLine.
56-
*
56+
*
5757
* @param commandLine
5858
* The CommandLine object to store defaults in.
5959
* @param option
@@ -86,7 +86,7 @@ void validate(final WriteableCommandLine commandLine, final Option option)
8686
*
8787
* @see #getMinimum()
8888
* @see #getMaximum()
89-
* @return true iff the CommandLine will be invalid without at least one
89+
* @return true iff the CommandLine will be invalid without at least one
9090
* value
9191
*/
9292
boolean isRequired();

src/java/org/apache/commons/cli2/CommandLine.java

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -24,191 +24,191 @@
2424
* according to the definition supplied to the parser.
2525
*/
2626
public interface CommandLine {
27-
27+
2828
/**
29-
* Detects the presence of an option with the specified trigger in this
29+
* Detects the presence of an option with the specified trigger in this
3030
* CommandLine.
31-
*
31+
*
3232
* @param trigger the trigger to search for
3333
* @return true iff an option with this trigger is present
3434
*/
3535
boolean hasOption(final String trigger);
36-
36+
3737
/**
3838
* Detects the presence of an option in this CommandLine.
39-
*
39+
*
4040
* @param option the Option to search for
4141
* @return true iff the option is present
4242
*/
4343
boolean hasOption(final Option option);
44-
44+
4545
/**
4646
* Finds the Option with the specified trigger
47-
*
47+
*
4848
* @param trigger the name of the option to retrieve
4949
* @return the Option matching the trigger or null if none exists
5050
*/
5151
Option getOption(final String trigger);
52-
52+
5353
/**
5454
* Retrieves the Argument values associated with the specified Option
55-
*
55+
*
5656
* @param trigger a trigger used to lookup the Option
5757
* @return a list of values or an empty List if none are found
5858
*/
5959
List getValues(final String trigger);
60-
60+
6161
/**
6262
* Retrieves the Argument values associated with the specified Option
63-
*
63+
*
6464
* @param trigger a trigger used to lookup the Option
6565
* @param defaultValues the result to return if no values are found
6666
* @return a list of values or defaultValues if none are found
6767
*/
6868
List getValues(final String trigger, final List defaultValues);
69-
69+
7070
/**
7171
* Retrieves the Argument values associated with the specified Option
72-
*
72+
*
7373
* @param option the Option associated with the values
7474
* @return a list of values or an empty List if none are found
7575
*/
7676
List getValues(final Option option);
77-
77+
7878
/**
7979
* Retrieves the Argument values associated with the specified Option
80-
*
80+
*
8181
* @param option the Option associated with the values
8282
* @param defaultValues the result to return if no values are found
8383
* @return a list of values or defaultValues if none are found
8484
*/
8585
List getValues(final Option option, final List defaultValues);
86-
86+
8787
/**
8888
* Retrieves the single Argument value associated with the specified Option
89-
*
89+
*
9090
* @param trigger a trigger used to lookup the Option
9191
* @return the matching value or null if none exists
9292
* @throws IllegalStateException if more than one values are found
9393
*/
9494
Object getValue(final String trigger) throws IllegalStateException;
95-
95+
9696
/**
9797
* Retrieves the single Argument value associated with the specified Option
98-
*
98+
*
9999
* @param trigger a trigger used to lookup the Option
100100
* @param defaultValue the result to use if no values are found
101101
* @return the matching value or defaultValue if none exists
102102
* @throws IllegalStateException if more than one values are found
103103
*/
104104
Object getValue(final String trigger, final Object defaultValue) throws IllegalStateException;
105-
105+
106106
/**
107107
* Retrieves the single Argument value associated with the specified Option
108-
*
108+
*
109109
* @param option the Option associated with the value
110110
* @return the matching value or null if none exists
111111
* @throws IllegalStateException if more than one values are found
112112
*/
113113
Object getValue(final Option option) throws IllegalStateException;
114-
114+
115115
/**
116116
* Retrieves the single Argument value associated with the specified Option
117-
*
117+
*
118118
* @param option the Option associated with the value
119119
* @param defaultValue the result to use if no values are found
120120
* @return the matching value or defaultValue if none exists
121121
* @throws IllegalStateException if more than one values are found
122122
*/
123123
Object getValue(final Option option, final Object defaultValue) throws IllegalStateException;
124-
124+
125125
/**
126126
* Retrieves the Boolean value associated with the specified Switch
127-
*
127+
*
128128
* @param trigger a trigger used to lookup the Option
129129
* @return the Boolean associated with trigger or null if none exists
130130
*/
131131
Boolean getSwitch(final String trigger);
132-
132+
133133
/**
134134
* Retrieves the Boolean value associated with the specified Switch
135-
*
135+
*
136136
* @param trigger a trigger used to lookup the Option
137137
* @param defaultValue the Boolean to use if none match
138138
* @return the Boolean associated with trigger or defaultValue if none exists
139139
*/
140140
Boolean getSwitch(final String trigger, final Boolean defaultValue);
141-
141+
142142
/**
143143
* Retrieves the Boolean value associated with the specified Switch
144-
*
144+
*
145145
* @param option the Option associated with the value
146146
* @return the Boolean associated with option or null if none exists
147147
*/
148148
Boolean getSwitch(final Option option);
149-
149+
150150
/**
151151
* Retrieves the Boolean value associated with the specified Switch
152-
*
152+
*
153153
* @param option the Option associated with the value
154154
* @param defaultValue the Boolean to use if none match
155155
* @return the Boolean associated with option or defaultValue if none exists
156156
*/
157157
Boolean getSwitch(final Option option, final Boolean defaultValue);
158-
159-
158+
159+
160160
/**
161-
* Retrieves the value associated with the specified property
162-
*
161+
* Retrieves the value associated with the specified property
162+
*
163163
* @param property the property name to lookup
164164
* @return the value of the property or null
165165
*/
166166
String getProperty(final String property);
167-
167+
168168
/**
169-
* Retrieves the value associated with the specified property
170-
*
169+
* Retrieves the value associated with the specified property
170+
*
171171
* @param property the property name to lookup
172172
* @param defaultValue the value to use if no other is found
173173
* @return the value of the property or defaultValue
174174
*/
175175
String getProperty(final String property, final String defaultValue);
176-
176+
177177
/**
178178
* Retrieves the set of all property names associated with this CommandLine
179-
*
180-
* @return a none null set of property names
179+
*
180+
* @return a none null set of property names
181181
*/
182182
Set getProperties();
183-
183+
184184
/**
185-
* Retrieves the number of times the specified Option appeared in this
185+
* Retrieves the number of times the specified Option appeared in this
186186
* CommandLine
187-
*
187+
*
188188
* @param trigger a trigger used to lookup the Option
189189
* @return the number of occurrences of the option
190190
*/
191191
int getOptionCount(final String trigger);
192-
192+
193193
/**
194-
* Retrieves the number of times the specified Option appeared in this
194+
* Retrieves the number of times the specified Option appeared in this
195195
* CommandLine
196-
*
196+
*
197197
* @param option the Option associated to check
198198
* @return the number of occurrences of the option
199199
*/
200200
int getOptionCount(final Option option);
201-
201+
202202
/**
203203
* Retrieves a list of all Options found in this CommandLine
204-
*
204+
*
205205
* @return a none null list of Options
206206
*/
207207
List getOptions();
208-
208+
209209
/**
210210
* Retrieves a list of all Option triggers found in this CommandLine
211-
*
211+
*
212212
* @return a none null list of Option triggers
213213
*/
214214
Set getOptionTriggers();

src/java/org/apache/commons/cli2/DisplaySetting.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,102 +27,102 @@
2727
* will be passed to a method that will lookup the presence of the values.
2828
*/
2929
public class DisplaySetting {
30-
30+
3131
private static final Set all = new HashSet();
3232

3333
/**
3434
* A Set guarenteed to contain all possible DisplaySetting values
3535
*/
3636
public static final Set ALL = Collections.unmodifiableSet(all);
37-
37+
3838
/**
3939
* A Set guarenteed to contain no DisplaySetting values
4040
*/
4141
public static final Set NONE = Collections.EMPTY_SET;
42-
42+
4343
/**
4444
* Indicates that aliases should be included
4545
*/
4646
public static final DisplaySetting DISPLAY_ALIASES =
4747
new DisplaySetting("DISPLAY_ALIASES");
48-
48+
4949
/**
5050
* Indicates that optionality should be included
5151
*/
5252
public static final DisplaySetting DISPLAY_OPTIONAL =
5353
new DisplaySetting("DISPLAY_OPTIONAL");
54-
54+
5555
/**
5656
* Indicates that property options should be included
5757
*/
5858
public static final DisplaySetting DISPLAY_PROPERTY_OPTION =
5959
new DisplaySetting("DISPLAY_PROPERTY_OPTION");
60-
60+
6161
/**
6262
* Indicates that switches should be included enabled
6363
*/
6464
public static final DisplaySetting DISPLAY_SWITCH_ENABLED =
6565
new DisplaySetting("DISPLAY_SWITCH_ENABLED");
66-
66+
6767
/**
6868
* Indicates that switches should be included disabled
6969
*/
7070
public static final DisplaySetting DISPLAY_SWITCH_DISABLED =
7171
new DisplaySetting("DISPLAY_SWITCH_DISABLED");
72-
72+
7373
/**
7474
* Indicates that group names should be included
7575
*/
7676
public static final DisplaySetting DISPLAY_GROUP_NAME =
7777
new DisplaySetting("DISPLAY_GROUP_NAME");
78-
78+
7979
/**
8080
* Indicates that groups should be included expanded
8181
*/
8282
public static final DisplaySetting DISPLAY_GROUP_EXPANDED =
8383
new DisplaySetting("DISPLAY_GROUP_EXPANDED");
84-
84+
8585
/**
8686
* Indicates that group arguments should be included
8787
*/
8888
public static final DisplaySetting DISPLAY_GROUP_ARGUMENT =
8989
new DisplaySetting("DISPLAY_GROUP_ARGUMENT");
90-
90+
9191
/**
9292
* Indicates that group outer brackets should be included
9393
*/
9494
public static final DisplaySetting DISPLAY_GROUP_OUTER =
9595
new DisplaySetting("DISPLAY_GROUP_OUTER");
96-
96+
9797
/**
9898
* Indicates that arguments should be included numbered
9999
*/
100100
public static final DisplaySetting DISPLAY_ARGUMENT_NUMBERED =
101101
new DisplaySetting("DISPLAY_ARGUMENT_NUMBERED");
102-
102+
103103
/**
104104
* Indicates that arguments should be included bracketed
105105
*/
106106
public static final DisplaySetting DISPLAY_ARGUMENT_BRACKETED =
107107
new DisplaySetting("DISPLAY_ARGUMENT_BRACKETED");
108-
108+
109109
/**
110110
* Indicates that arguments of Parents should be included
111111
*/
112112
public static final DisplaySetting DISPLAY_PARENT_ARGUMENT =
113113
new DisplaySetting("DISPLAY_PARENT_ARGUMENT");
114-
114+
115115
/**
116116
* Indicates that children of Parents should be included
117117
*/
118118
public static final DisplaySetting DISPLAY_PARENT_CHILDREN =
119119
new DisplaySetting("DISPLAY_PARENT_CHILDREN");
120-
120+
121121
/**
122122
* The name of the setting
123123
*/
124124
private final String name;
125-
125+
126126
/**
127127
* The hashCode of the setting
128128
*/

0 commit comments

Comments
 (0)