You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/03/05 01:39:22 UTC
[commons-cli] branch master updated: No need to nest in else.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
The following commit(s) were added to refs/heads/master by this push:
new 98d06d3 No need to nest in else.
98d06d3 is described below
commit 98d06d37bc7058bbfb2704c9620669c66e279f4a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Mar 4 20:39:19 2021 -0500
No need to nest in else.
---
.../java/org/apache/commons/cli/DefaultParser.java | 22 +++++++++-------------
.../java/org/apache/commons/cli/OptionGroup.java | 8 ++------
.../java/org/apache/commons/cli/TypeHandler.java | 21 +++++++++------------
src/main/java/org/apache/commons/cli/Util.java | 2 +-
.../org/apache/commons/cli/ParserTestCase.java | 6 +++---
5 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/src/main/java/org/apache/commons/cli/DefaultParser.java b/src/main/java/org/apache/commons/cli/DefaultParser.java
index 2116288..c2a97e2 100644
--- a/src/main/java/org/apache/commons/cli/DefaultParser.java
+++ b/src/main/java/org/apache/commons/cli/DefaultParser.java
@@ -383,7 +383,7 @@ public class DefaultParser implements CommandLineParser
// long or partial long options (--L, -L, --L=V, -L=V, --l, --l=V)
return true;
}
- else if (getLongPrefix(token) != null && !token.startsWith("--"))
+ if (getLongPrefix(token) != null && !token.startsWith("--"))
{
// -LV
return true;
@@ -759,20 +759,16 @@ public class DefaultParser implements CommandLineParser
{
final String ch = String.valueOf(token.charAt(i));
- if (options.hasOption(ch))
- {
- handleOption(options.getOption(ch));
-
- if (currentOption != null && token.length() != i + 1)
- {
- // add the trail as an argument of the option
- currentOption.addValueForProcessing(token.substring(i + 1));
- break;
- }
+ if (!options.hasOption(ch)) {
+ handleUnknownToken(stopAtNonOption && i > 1 ? token.substring(i) : token);
+ break;
}
- else
+ handleOption(options.getOption(ch));
+
+ if (currentOption != null && token.length() != i + 1)
{
- handleUnknownToken(stopAtNonOption && i > 1 ? token.substring(i) : token);
+ // add the trail as an argument of the option
+ currentOption.addValueForProcessing(token.substring(i + 1));
break;
}
}
diff --git a/src/main/java/org/apache/commons/cli/OptionGroup.java b/src/main/java/org/apache/commons/cli/OptionGroup.java
index fc00b9d..ce390ee 100644
--- a/src/main/java/org/apache/commons/cli/OptionGroup.java
+++ b/src/main/java/org/apache/commons/cli/OptionGroup.java
@@ -93,14 +93,10 @@ public class OptionGroup implements Serializable
// if no option has already been selected or the
// same option is being reselected then set the
// selected member variable
- if (selected == null || selected.equals(option.getKey()))
- {
- selected = option.getKey();
- }
- else
- {
+ if ((selected != null) && !selected.equals(option.getKey())) {
throw new AlreadySelectedException(this, option);
}
+ selected = option.getKey();
}
/**
diff --git a/src/main/java/org/apache/commons/cli/TypeHandler.java b/src/main/java/org/apache/commons/cli/TypeHandler.java
index 5c67da4..768536a 100644
--- a/src/main/java/org/apache/commons/cli/TypeHandler.java
+++ b/src/main/java/org/apache/commons/cli/TypeHandler.java
@@ -67,42 +67,39 @@ public class TypeHandler
{
return (T) str;
}
- else if (PatternOptionBuilder.OBJECT_VALUE == clazz)
+ if (PatternOptionBuilder.OBJECT_VALUE == clazz)
{
return (T) createObject(str);
}
- else if (PatternOptionBuilder.NUMBER_VALUE == clazz)
+ if (PatternOptionBuilder.NUMBER_VALUE == clazz)
{
return (T) createNumber(str);
}
- else if (PatternOptionBuilder.DATE_VALUE == clazz)
+ if (PatternOptionBuilder.DATE_VALUE == clazz)
{
return (T) createDate(str);
}
- else if (PatternOptionBuilder.CLASS_VALUE == clazz)
+ if (PatternOptionBuilder.CLASS_VALUE == clazz)
{
return (T) createClass(str);
}
- else if (PatternOptionBuilder.FILE_VALUE == clazz)
+ if (PatternOptionBuilder.FILE_VALUE == clazz)
{
return (T) createFile(str);
}
- else if (PatternOptionBuilder.EXISTING_FILE_VALUE == clazz)
+ if (PatternOptionBuilder.EXISTING_FILE_VALUE == clazz)
{
return (T) openFile(str);
}
- else if (PatternOptionBuilder.FILES_VALUE == clazz)
+ if (PatternOptionBuilder.FILES_VALUE == clazz)
{
return (T) createFiles(str);
}
- else if (PatternOptionBuilder.URL_VALUE == clazz)
+ if (PatternOptionBuilder.URL_VALUE == clazz)
{
return (T) createURL(str);
}
- else
- {
- throw new ParseException("Unable to handle the class: " + clazz);
- }
+ throw new ParseException("Unable to handle the class: " + clazz);
}
/**
diff --git a/src/main/java/org/apache/commons/cli/Util.java b/src/main/java/org/apache/commons/cli/Util.java
index 4e3ef50..cfcdd58 100644
--- a/src/main/java/org/apache/commons/cli/Util.java
+++ b/src/main/java/org/apache/commons/cli/Util.java
@@ -40,7 +40,7 @@ final class Util
{
return str.substring(2);
}
- else if (str.startsWith("-"))
+ if (str.startsWith("-"))
{
return str.substring(1);
}
diff --git a/src/test/java/org/apache/commons/cli/ParserTestCase.java b/src/test/java/org/apache/commons/cli/ParserTestCase.java
index a32e254..307c94b 100644
--- a/src/test/java/org/apache/commons/cli/ParserTestCase.java
+++ b/src/test/java/org/apache/commons/cli/ParserTestCase.java
@@ -930,11 +930,11 @@ public abstract class ParserTestCase
private CommandLine parse(final CommandLineParser parser, final Options opts, final String[] args, final Properties properties) throws ParseException {
if (parser instanceof Parser) {
return ((Parser) parser).parse(opts, args, properties);
- } else if (parser instanceof DefaultParser) {
+ }
+ if (parser instanceof DefaultParser) {
return ((DefaultParser) parser).parse(opts, args, properties);
- } else {
- throw new UnsupportedOperationException("Default options not supported by this parser");
}
+ throw new UnsupportedOperationException("Default options not supported by this parser");
}
@Test