extract assignment statements
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/07ce505d Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/07ce505d Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/07ce505d Branch: refs/heads/1.9.x Commit: 07ce505d5338388a069666e10aa4644b16798056 Parents: 23f3c9d Author: Stefan Bodewig <[email protected]> Authored: Wed Dec 21 11:00:48 2016 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Wed Dec 21 11:03:22 2016 +0100 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/filters/UniqFilter.java | 7 +++++-- src/main/org/apache/tools/ant/taskdefs/Sync.java | 3 ++- .../ant/taskdefs/optional/junit/AggregateTransformer.java | 6 ++++-- src/main/org/apache/tools/bzip2/BlockSort.java | 6 ++++-- 4 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/07ce505d/src/main/org/apache/tools/ant/filters/UniqFilter.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/filters/UniqFilter.java b/src/main/org/apache/tools/ant/filters/UniqFilter.java index e72d5f5..2983b6c 100644 --- a/src/main/org/apache/tools/ant/filters/UniqFilter.java +++ b/src/main/org/apache/tools/ant/filters/UniqFilter.java @@ -31,7 +31,10 @@ public class UniqFilter extends TokenFilter.ChainableReaderFilter { private String lastLine = null; public String filter(String string) { - return lastLine == null || !lastLine.equals(string) - ? (lastLine = string) : null; + if (lastLine == null || !lastLine.equals(string)) { + lastLine = string; + return lastLine; + } + return null; } } http://git-wip-us.apache.org/repos/asf/ant/blob/07ce505d/src/main/org/apache/tools/ant/taskdefs/Sync.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Sync.java b/src/main/org/apache/tools/ant/taskdefs/Sync.java index c1c7552..bcdfd52 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sync.java +++ b/src/main/org/apache/tools/ant/taskdefs/Sync.java @@ -403,7 +403,8 @@ public class Sync extends Task { if (resources == null) { Restrict r = new Restrict(); r.add(new Exists()); - r.add(resources = new Resources()); + resources = new Resources(); + r.add(resources); myCopy.add(r); } resources.add(rc); http://git-wip-us.apache.org/repos/asf/ant/blob/07ce505d/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java index bae3b3c..fd7a321 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java @@ -239,8 +239,10 @@ public class AggregateTransformer { * @since Ant 1.9.5 */ public XSLTProcess.Factory createFactory() { - return xsltFactory != null ? xsltFactory - : (xsltFactory = xsltTask.createFactory()); + if (xsltFactory == null) { + xsltFactory = xsltTask.createFactory(); + } + return xsltFactory; } /** http://git-wip-us.apache.org/repos/asf/ant/blob/07ce505d/src/main/org/apache/tools/bzip2/BlockSort.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java index 78ea15e..b382470 100644 --- a/src/main/org/apache/tools/bzip2/BlockSort.java +++ b/src/main/org/apache/tools/bzip2/BlockSort.java @@ -445,8 +445,10 @@ class BlockSort { private int[] eclass; private int[] getEclass() { - return eclass == null - ? (eclass = new int[quadrant.length / 2]) : eclass; + if (eclass == null) { + eclass = new int[quadrant.length / 2]; + } + return eclass; } /*
