You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/12/21 10:01:22 UTC
[1/2] ant git commit: I disagree with Sonar - moving the assignment
make the code worse
Repository: ant
Updated Branches:
refs/heads/master 0d58df76f -> 7b9ca06ea
I disagree with Sonar - moving the assignment make the code worse
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/ef80b111
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/ef80b111
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/ef80b111
Branch: refs/heads/master
Commit: ef80b111c43f8eab075475a2a60031d45b24754a
Parents: 0d58df7
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Dec 21 10:59:48 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Dec 21 10:59:48 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/Expand.java | 2 +-
.../org/apache/tools/ant/taskdefs/optional/NetRexxC.java | 2 +-
src/main/org/apache/tools/bzip2/BlockSort.java | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/ef80b111/src/main/org/apache/tools/ant/taskdefs/Expand.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index cb0c958..0ec2333 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -191,7 +191,7 @@ public class Expand extends Task {
log("extracting " + ze.getName(), Project.MSG_DEBUG);
try {
extractFile(fileUtils, srcF, dir,
- is = zf.getInputStream(ze),
+ is = zf.getInputStream(ze), //NOSONAR
ze.getName(), new Date(ze.getTime()),
ze.isDirectory(), mapper);
} finally {
http://git-wip-us.apache.org/repos/asf/ant/blob/ef80b111/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
index 5ba2a76..21440f1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -868,7 +868,7 @@ public class NetRexxC extends MatchingTask {
PrintWriter w = null;
int rc =
COM.ibm.netrexx.process.NetRexxC.main(new Rexx(compileArgs),
- w = new PrintWriter(out));
+ w = new PrintWriter(out)); //NOSONAR
String sdir = srcDir.getAbsolutePath();
String ddir = destDir.getAbsolutePath();
boolean doReplace = !(sdir.equals(ddir));
http://git-wip-us.apache.org/repos/asf/ant/blob/ef80b111/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 eb9066e..78ea15e 100644
--- a/src/main/org/apache/tools/bzip2/BlockSort.java
+++ b/src/main/org/apache/tools/bzip2/BlockSort.java
@@ -642,7 +642,7 @@ class BlockSort {
HAMMER: while (true) {
if (onceRunned) {
fmap[j] = a;
- if ((j -= h) <= mj) {
+ if ((j -= h) <= mj) { //NOSONAR
break HAMMER;
}
} else {
@@ -660,7 +660,7 @@ class BlockSort {
if (block[i1 + 3] == block[i2 + 3]) {
if (block[i1 + 4] == block[i2 + 4]) {
if (block[i1 + 5] == block[i2 + 5]) {
- if (block[(i1 += 6)] == block[(i2 += 6)]) {
+ if (block[(i1 += 6)] == block[(i2 += 6)]) { //NOSONAR
int x = lastShadow;
X: while (x > 0) {
x -= 4;
@@ -673,10 +673,10 @@ class BlockSort {
if (quadrant[i1 + 2] == quadrant[i2 + 2]) {
if (block[i1 + 4] == block[i2 + 4]) {
if (quadrant[i1 + 3] == quadrant[i2 + 3]) {
- if ((i1 += 4) >= lastPlus1) {
+ if ((i1 += 4) >= lastPlus1) { //NOSONAR
i1 -= lastPlus1;
}
- if ((i2 += 4) >= lastPlus1) {
+ if ((i2 += 4) >= lastPlus1) { //NOSONAR
i2 -= lastPlus1;
}
workDoneShadow++;
[2/2] ant git commit: extract assignment statements
Posted by bo...@apache.org.
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/7b9ca06e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/7b9ca06e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/7b9ca06e
Branch: refs/heads/master
Commit: 7b9ca06ea2e80232546c804639b93f896a3bd7f6
Parents: ef80b11
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Dec 21 11:00:48 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Dec 21 11:00:48 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/7b9ca06e/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/7b9ca06e/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/7b9ca06e/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 32dd704..ca47074 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
@@ -236,8 +236,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/7b9ca06e/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;
}
/*