emmanuel/gclc-core
emmanuel/gclc-core
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity

Removed declaration of runtime exception

Browse Source 
Signed-off-by: Emmanuel Bigeon <emmanuel@bigeon.fr>
This commit is contained in:
Emmanuel Bigeon 2018-12-01 12:01:44 -05:00
parent 8b52ba5d49
commit 583f3146fd
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gclc/src/main/java/net/bigeon/gclc/command/ParametrizedCommand.java
View File

@ -116,8 +116,7 @@ public abstract class ParametrizedCommand extends Command {
* @param flag the boolean flag * @param flag the boolean flag
* @throws InvalidParameterException if the parameter is already defined as a * @throws InvalidParameterException if the parameter is already defined as a
* string parameter */ * string parameter */
protected final void addBooleanParameter(final String flag) protected final void addBooleanParameter(final String flag) {
throws InvalidParameterException {
data.addBooleanParameter(flag); data.addBooleanParameter(flag);
} }
@ -127,8 +126,7 @@ public abstract class ParametrizedCommand extends Command {
* @param needed if the parameter's absence should cause an exception * @param needed if the parameter's absence should cause an exception
* @throws InvalidParameterException if the parameter is already defined as a * @throws InvalidParameterException if the parameter is already defined as a
* boolean parameter */ * boolean parameter */
protected final void addStringParameter(final String flag, final boolean needed) protected final void addStringParameter(final String flag, final boolean needed) {
throws InvalidParameterException {
data.addStringParameter(flag, needed); data.addStringParameter(flag, needed);
} }

12
gclc/src/main/java/net/bigeon/gclc/command/ParametrizedCommandData.java
View File

@ -120,7 +120,7 @@ public final class ParametrizedCommandData {
* @param flag the boolean flag * @param flag the boolean flag
* @throws InvalidParameterException if the parameter is already defined as a * @throws InvalidParameterException if the parameter is already defined as a
* string parameter */ * string parameter */
public void addBooleanParameter(final String flag) throws InvalidParameterException { public void addBooleanParameter(final String flag) {
if (params.containsKey(flag) && stringParams.containsKey(flag)) { if (params.containsKey(flag) && stringParams.containsKey(flag)) {
throw new InvalidParameterException("Parameter is already defined as string"); //$NON-NLS-1$ throw new InvalidParameterException("Parameter is already defined as string"); //$NON-NLS-1$
} }
@ -134,8 +134,7 @@ public final class ParametrizedCommandData {
* @param needed if the parameter's absence should cause an exception * @param needed if the parameter's absence should cause an exception
* @throws InvalidParameterException if the parameter is already defined as a * @throws InvalidParameterException if the parameter is already defined as a
* boolean parameter */ * boolean parameter */
public void addStringParameter(final String flag, final boolean needed) public void addStringParameter(final String flag, final boolean needed) {
throws InvalidParameterException {
if (params.containsKey(flag)) { if (params.containsKey(flag)) {
checkParam(flag, needed); checkParam(flag, needed);
return; return;
@ -149,9 +148,8 @@ public final class ParametrizedCommandData {
* @param param the string parameter * @param param the string parameter
* @param needed if the parameter is needed * @param needed if the parameter is needed
* @throws InvalidParameterException if the new definition is invalid */ * @throws InvalidParameterException if the new definition is invalid */
private void checkParam(final String param, final boolean needed) private void checkParam(final String param, final boolean needed) {
throws InvalidParameterException { final Boolean val = stringParams.get(param);
Boolean val = stringParams.get(param);
if (val != null) { if (val != null) {
final Boolean need = Boolean.valueOf(needed || val.booleanValue()); final Boolean need = Boolean.valueOf(needed || val.booleanValue());
stringParams.put(param, need); stringParams.put(param, need);
@ -217,7 +215,7 @@ public final class ParametrizedCommandData {
* @param param the parameter name * @param param the parameter name
* @return if the parameter is needed */ * @return if the parameter is needed */
public boolean isNeeded(final String param) { public boolean isNeeded(final String param) {
Boolean val = params.get(param); final Boolean val = params.get(param);
return val != null && val.booleanValue(); return val != null && val.booleanValue();
} }