Author: mbenson
Date: Tue Jul 17 10:33:37 2007
New Revision: 556986
URL: http://svn.apache.org/viewvc?view=rev&rev=556986
Log:
fmt/refac
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java?view=diff&rev=556986&r1=556985&r2=556986
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
Tue Jul 17 10:33:37 2007
@@ -238,8 +238,8 @@
File outputFile = null;
if (format.equals(FRAMES)) {
String tempFileProperty = getClass().getName() +
String.valueOf(counter++);
- File tmp = FILE_UTILS.resolveFile(project.getBaseDir(),
- project.getProperty("java.io.tmpdir"));
+ File tmp = FILE_UTILS.resolveFile(project.getBaseDir(), project
+ .getProperty("java.io.tmpdir"));
tempFileTask.setDestDir(tmp);
tempFileTask.setProperty(tempFileProperty);
tempFileTask.execute();
@@ -263,8 +263,7 @@
try {
xsltTask.execute();
} catch (Exception e) {
- throw new BuildException("Errors while applying transformations: "
- + e.getMessage(), e);
+ throw new BuildException("Errors while applying transformations: "
+ e.getMessage(), e);
}
final long dt = System.currentTimeMillis() - t0;
task.log("Transform time: " + dt + "ms");
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java?view=diff&rev=556986&r1=556985&r2=556986
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
Tue Jul 17 10:33:37 2007
@@ -199,11 +199,10 @@
public boolean shouldUse(Task t) {
if (ifProperty != null && t.getProject().getProperty(ifProperty) ==
null) {
return false;
- } else if (unlessProperty != null
- && t.getProject().getProperty(unlessProperty) != null) {
+ }
+ if (unlessProperty != null &&
t.getProject().getProperty(unlessProperty) != null) {
return false;
}
-
return true;
}
@@ -218,7 +217,7 @@
* @since Ant 1.6
*/
JUnitTaskMirror.JUnitResultFormatterMirror createFormatter(ClassLoader
loader)
- throws BuildException {
+ throws BuildException {
if (classname == null) {
throw new BuildException("you must specify type or classname");
@@ -253,8 +252,7 @@
}
if (!(o instanceof JUnitTaskMirror.JUnitResultFormatterMirror)) {
- throw new BuildException(classname
- + " is not a JUnitResultFormatter");
+ throw new BuildException(classname + " is not a
JUnitResultFormatter");
}
JUnitTaskMirror.JUnitResultFormatterMirror r =
(JUnitTaskMirror.JUnitResultFormatterMirror) o;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
