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 09:52:18 UTC
[1/3] ant git commit: we really want those fields to be static ...
Repository: ant
Updated Branches:
refs/heads/master 5db9f3401 -> 0d58df76f
we really want those fields to be static ...
... and manipulated from instance methods
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/720df700
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/720df700
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/720df700
Branch: refs/heads/master
Commit: 720df700d8b98db4a2c03fbdcc00f980e318a67d
Parents: 85ff7bf
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Dec 21 10:50:53 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Dec 21 10:50:53 2016 +0100
----------------------------------------------------------------------
.../ant/taskdefs/optional/junit/AggregateTransformer.java | 4 ++--
.../apache/tools/ant/taskdefs/optional/splash/SplashTask.java | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/720df700/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 51be1b2..bae3b3c 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
@@ -115,7 +115,7 @@ public class AggregateTransformer {
/**
* Used to ensure the uniqueness of a property
*/
- private static int counter = 0;
+ private volatile static int counter = 0;
/** the format to use for the report. Must be <tt>FRAMES</tt> or <tt>NOFRAMES</tt> */
protected String format = FRAMES;
@@ -260,7 +260,7 @@ public class AggregateTransformer {
xsltTask.setIn(((XMLResultAggregator) task).getDestinationFile());
File outputFile = null;
if (format.equals(FRAMES)) {
- String tempFileProperty = getClass().getName() + String.valueOf(counter++);
+ String tempFileProperty = getClass().getName() + String.valueOf(counter++); //NOSONAR
File tmp = FILE_UTILS.resolveFile(project.getBaseDir(), project
.getProperty("java.io.tmpdir"));
tempFileTask.setDestDir(tmp);
http://git-wip-us.apache.org/repos/asf/ant/blob/720df700/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
index 146e0ff..9d995bc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
@@ -53,6 +53,7 @@ public class SplashTask extends Task {
private String progressRegExp = null;
private String displayText = null;
+ // class instance so we'll never show two splash screens at the same time
private static SplashScreen splash = null;
/**
@@ -163,7 +164,7 @@ public class SplashTask extends Task {
splash.setVisible(false);
getProject().removeBuildListener(splash);
splash.dispose();
- splash = null;
+ splash = null; //NOSONAR
}
log("Creating new SplashScreen", Project.MSG_VERBOSE);
@@ -248,7 +249,7 @@ public class SplashTask extends Task {
try {
ImageIcon img = new ImageIcon(bout.toByteArray());
- splash = new SplashScreen(img, progressRegExp, displayText);
+ splash = new SplashScreen(img, progressRegExp, displayText); //NOSONAR
success = true;
} catch (Throwable e) {
logHeadless(e);
@@ -268,7 +269,7 @@ public class SplashTask extends Task {
}
} else {
try {
- splash = new SplashScreen("Image Unavailable.", progressRegExp,
+ splash = new SplashScreen("Image Unavailable.", progressRegExp, //NOSONAR
displayText);
success = true;
} catch (Throwable e) {
[2/3] ant git commit: fields don't need to be static
Posted by bo...@apache.org.
fields don't need to be static
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/bcc245e9
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/bcc245e9
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/bcc245e9
Branch: refs/heads/master
Commit: bcc245e991f041e7592e98d515dd405161cb8f3a
Parents: 720df70
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Dec 21 10:51:38 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Dec 21 10:51:38 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Main.java | 8 ++++----
src/main/org/apache/tools/ant/launch/Launcher.java | 4 +++-
.../tools/ant/taskdefs/optional/clearcase/ClearCase.java | 2 +-
.../tools/ant/taskdefs/optional/junit/FailureRecorder.java | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/bcc245e9/src/main/org/apache/tools/ant/Main.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index 075ec83..647fc9f 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -81,10 +81,10 @@ public class Main implements AntMain {
private File buildFile; /* null */
/** Stream to use for logging. */
- private static PrintStream out = System.out;
+ private PrintStream out = System.out;
/** Stream that we are using for logging error messages. */
- private static PrintStream err = System.err;
+ private PrintStream err = System.err;
/** The build targets. */
private final Vector<String> targets = new Vector<String>();
@@ -143,7 +143,7 @@ public class Main implements AntMain {
* Whether or not a logfile is being used. This is used to
* check if the output streams must be closed.
*/
- private static boolean isLogFileUsed = false;
+ private boolean isLogFileUsed = false;
/**
* optional thread priority
@@ -269,7 +269,7 @@ public class Main implements AntMain {
*
* @since Ant 1.6
*/
- private static void handleLogfile() {
+ private void handleLogfile() {
if (isLogFileUsed) {
FileUtils.close(out);
FileUtils.close(err);
http://git-wip-us.apache.org/repos/asf/ant/blob/bcc245e9/src/main/org/apache/tools/ant/launch/Launcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index bf881db..364bc58 100644
--- a/src/main/org/apache/tools/ant/launch/Launcher.java
+++ b/src/main/org/apache/tools/ant/launch/Launcher.java
@@ -65,7 +65,7 @@ public class Launcher {
/**
* launch diagnostics flag; for debugging trouble at launch time.
*/
- public static boolean launchDiag = false;
+ public boolean launchDiag = false;
/**
* The location of a per-user library directory.
@@ -107,9 +107,11 @@ public class Launcher {
*/
public static void main(final String[] args) {
int exitCode;
+ boolean launchDiag = false;
try {
final Launcher launcher = new Launcher();
exitCode = launcher.run(args);
+ launchDiag = launcher.launchDiag;
} catch (final LaunchException e) {
exitCode = EXIT_CODE_ERROR;
System.err.println(e.getMessage());
http://git-wip-us.apache.org/repos/asf/ant/blob/bcc245e9/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index d81e505..5a537eb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@ -49,7 +49,7 @@ public abstract class ClearCase extends Task {
private String mClearToolDir = "";
private String mviewPath = null;
private String mobjSelect = null;
- private static int pcnt = 0;
+ private int pcnt = 0;
private boolean mFailonerr = true;
/**
* Set the directory where the cleartool executable is located.
http://git-wip-us.apache.org/repos/asf/ant/blob/bcc245e9/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
index 3046b75..4c90631 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
@@ -97,7 +97,7 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm
* Location and name of the generated JUnit class.
* Lazy instantiated via getLocationName().
*/
- private static String locationName;
+ private String locationName;
/**
* Returns the (lazy evaluated) location for the collector class.
[3/3] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0d58df76
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0d58df76
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0d58df76
Branch: refs/heads/master
Commit: 0d58df76f65efd43b907a20e245b84e1129b1b05
Parents: 5db9f34 bcc245e
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Dec 21 10:52:05 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Dec 21 10:52:05 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Main.java | 8 ++++----
src/main/org/apache/tools/ant/launch/Launcher.java | 4 +++-
.../tools/ant/taskdefs/optional/clearcase/ClearCase.java | 2 +-
.../ant/taskdefs/optional/junit/AggregateTransformer.java | 4 ++--
.../tools/ant/taskdefs/optional/junit/FailureRecorder.java | 2 +-
.../tools/ant/taskdefs/optional/splash/SplashTask.java | 7 ++++---
6 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0d58df76/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
----------------------------------------------------------------------