Re: ant git commit: Tidy up the code

[Gintautas Grigelionis]

2018-04-05 15:01 GMT+00:00 Matt Benson :

By and large I approve of these changes, but I felt compelled to express
> the opinion that I do not believe adding else after if/continue does
> anything to simplify the code. IMO it does the opposite.
>
> Matt
>

The reasoning goes like this: the last continue is redundant (looks like a
copy and paste of an if-block).
So, changing an "if" to an "if else" makes all continue statements
redundant.
If/when more if-blocks are needed, switch is more readable anyway.

Gintas

Re: ant git commit: Tidy up the code

[Matt Benson]

By and large I approve of these changes, but I felt compelled to express
the opinion that I do not believe adding else after if/continue does
anything to simplify the code. IMO it does the opposite.

Matt

On Thu, Apr 5, 2018, 1:15 AM  wrote:

> Repository: ant
> Updated Branches:
>   refs/heads/master 845c2c5b3 -> 66d7986c3
>
>
> Tidy up the code
>
> Project: http://git-wip-us.apache.org/repos/asf/ant/repo
> Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/66d7986c
> Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/66d7986c
> Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/66d7986c
>
> Branch: refs/heads/master
> Commit: 66d7986c3ad41040528a118052c4ef5b2e65ef89
> Parents: 845c2c5
> Author: Gintas Grigelionis 
> Authored: Thu Apr 5 08:15:07 2018 +0200
> Committer: Gintas Grigelionis 
> Committed: Thu Apr 5 08:15:07 2018 +0200
>
> --
>  src/main/org/apache/tools/ant/DirectoryScanner.java   |  1 +
>  src/main/org/apache/tools/ant/filters/ConcatFilter.java   |  8 +++-
>  src/main/org/apache/tools/ant/filters/HeadFilter.java |  8 +++-
>  src/main/org/apache/tools/ant/filters/SortFilter.java |  5 +
>  src/main/org/apache/tools/ant/filters/TailFilter.java |  8 +++-
>  .../apache/tools/ant/filters/util/JavaClassHelper.java|  1 -
>  src/main/org/apache/tools/ant/launch/Locator.java |  9 ++---
>  src/main/org/apache/tools/ant/taskdefs/Expand.java|  1 -
>  src/main/org/apache/tools/ant/taskdefs/Get.java   | 10 +++---
>  src/main/org/apache/tools/ant/taskdefs/UpToDate.java  |  1 -
>  .../tools/ant/taskdefs/optional/RenameExtensions.java |  1 +
>  .../tools/ant/taskdefs/optional/jdepend/JDependTask.java  |  2 ++
>  .../junitlauncher/AbstractJUnitResultFormatter.java   |  2 --
>  .../optional/junitlauncher/JUnitLauncherTask.java |  2 --
>  .../junitlauncher/LegacyPlainResultFormatter.java |  1 -
>  .../optional/junitlauncher/LegacyXmlResultFormatter.java  |  1 -
>  src/main/org/apache/tools/ant/types/Commandline.java  |  1 -
>  src/main/org/apache/tools/ant/types/CommandlineJava.java  |  1 -
>  src/main/org/apache/tools/ant/util/JavaEnvUtils.java  |  1 +
>  .../junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java |  2 ++
>  20 files changed, 26 insertions(+), 40 deletions(-)
> --
>
>
>
> http://git-wip-us.apache.org/repos/asf/ant/blob/66d7986c/src/main/org/apache/tools/ant/DirectoryScanner.java
> --
> diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java
> b/src/main/org/apache/tools/ant/DirectoryScanner.java
> index 1a7a7e0..967c9ca 100644
> --- a/src/main/org/apache/tools/ant/DirectoryScanner.java
> +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
> @@ -613,6 +613,7 @@ public class DirectoryScanner
>   *
>   * @since Ant 1.6
>   */
> +@SuppressWarnings("deprecated")
>  public static void resetDefaultExcludes() {
>  synchronized (defaultExcludes) {
>  defaultExcludes.clear();
>
>
> http://git-wip-us.apache.org/repos/asf/ant/blob/66d7986c/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> --
> diff --git a/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> index 817572f..72b68f8 100644
> --- a/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> +++ b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> @@ -192,13 +192,11 @@ public final class ConcatFilter extends
> BaseParamFilterReader
>  final Parameter[] params = getParameters();
>  if (params != null) {
>  for (Parameter param : params) {
> -if ("prepend".equals(param.getName())) {
> +final String paramName = param.getName();
> +if ("prepend".equals(paramName)) {
>  setPrepend(new File(param.getValue()));
> -continue;
> -}
> -if ("append".equals(param.getName())) {
> +} else if ("append".equals(paramName)) {
>  setAppend(new File(param.getValue()));
> -continue;
>  }
>  }
>  }
>
>
> http://git-wip-us.apache.org/repos/asf/ant/blob/66d7986c/src/main/org/apache/tools/ant/filters/HeadFilter.java
> --
> diff --git a/src/main/org/apache/tools/ant/filters/HeadFilter.java
> b/src/main/org/apache/tools/ant/filters/HeadFilter.java
> index 29806b3..24e2403 100644
> --- a/src/main/org/apache/tools/ant/filters/HeadFilter.java
> +++ b/src/main/org/apache/tools/ant/filters/HeadFilter.java