Author: peterreilly
Date: Fri Aug 17 02:54:23 2007
New Revision: 566991
URL:
http://svn.apache.org/viewvc?view=rev&rev=566991
Log:
sync: reduce method length
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/an
t/taskdefs/compilers/Jikes.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/an
t/taskdefs/optional/junit/JUnitTask.java
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/an
t/taskdefs/compilers/Jikes.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANC
H/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.jav
a?view=diff&rev=566991&r1=566990&r2=566991
============================================================
==================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/an
t/taskdefs/compilers/Jikes.java (original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/an
t/taskdefs/compilers/Jikes.java Fri Aug 17 02:54:23 2007
 -132,6
+132,36
cmd.createArgument().setValue(target);
}
+ addPropertyParams(cmd);
+
+ if (attributes.getSource() != null) {
+
cmd.createArgument().setValue("-source");
+ String source = attributes.getSource();
+ if (source.equals("1.1") ||
source.equals("1.2")) {
+ // support for -source 1.1 and -source 1.2
has been
+ // added with JDK 1.4.2, Jikes doesn't like
it
+ attributes.log("Jikes doesn't support
'-source " + source
+ + "', will use '-source 1.3'
instead");
+
cmd.createArgument().setValue("1.3");
+ } else {
+ cmd.createArgument().setValue(source);
+ }
+ }
+ addCurrentCompilerArgs(cmd);
+
+ int firstFileName = cmd.size();
+
+ Path boot = getBootClassPath();
+ if (boot.size() > 0) {
+
cmd.createArgument().setValue("-bootclasspath");
+ cmd.createArgument().setPath(boot);
+ }
+ logAndAddFilesToCompile(cmd);
+
+ return executeExternalCompile(cmd.getCommandline(),
firstFileName) == 0;
+ }
+
+ private void addPropertyParams(Commandline cmd) {
/**
* XXX
* Perhaps we shouldn't use properties for these
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/an
t/taskdefs/optional/junit/JUnitTask.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT
_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/j
unit/JUnitTask.java?view=diff&rev=566991&r1=566990&a
mp;r2=566991
============================================================
==================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/an
t/taskdefs/optional/junit/JUnitTask.java (original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/an
t/taskdefs/optional/junit/JUnitTask.java Fri Aug 17 02:54:23
2007
-926,34
+926,9
cmd.createArgument().setValue(Constants.HALT_ON_ERROR +
test.getHaltonerror());
cmd.createArgument().setValue(Constants.HALT_ON_FAILURE
+
test.getHaltonfailure());
- if (includeAntRuntime) {
- Vector v = Execute.getProcEnvironment();
- Enumeration e = v.elements();
- while (e.hasMoreElements()) {
- String s = (String) e.nextElement();
- if (s.startsWith(CLASSPATH)) {
-
cmd.createClasspath(getProject()).createPath()
- .append(new Path(getProject(),
-
s.substring(CLASSPATH.length()
- )));
- }
- }
- log("Implicitly adding " +
antRuntimeClasses + " to CLASSPATH",
- Project.MSG_VERBOSE);
- cmd.createClasspath(getProject()).createPath()
- .append(antRuntimeClasses);
- }
+ checkIncludeAntRuntime(cmd);
- if (summary) {
- String prefix = "";
- if
("withoutanderr".equalsIgnoreCase(summaryValue))
{
- prefix = "OutErr";
- }
- cmd.createArgument()
- .setValue(Constants.FORMATTER
- +
"org.apache.tools.ant.taskdefs.optional.junit."
- + prefix +
"SummaryJUnitResultFormatter");
- }
+ checkIncludeSummary(cmd);
cmd.createArgument().setValue(Constants.SHOWOUTPUT
+
String.valueOf(showOutput));
-1070,6
+1045,42
}
return result;
+ }
+
+ /**
+ * Adding ant runtime.
+ */
+ private void checkIncludeAntRuntime(CommandlineJava
cmd) {
+ if (includeAntRuntime) {
+ Vector v = Execute.getProcEnvironment();
+ Enumeration e = v.elements();
+ while (e.hasMoreElements()) {
+ String s = (String) e.nextElement();
+ if (s.startsWith(CLASSPATH)) {
+
cmd.createClasspath(getProject()).createPath()
+ .append(new Path(getProject(),
+
s.substring(CLASSPATH.length()
+ )));
+ }
+ }
+ log("Implicitly adding " +
antRuntimeClasses + " to CLASSPATH",
+ Project.MSG_VERBOSE);
+ cmd.createClasspath(getProject()).createPath()
+ .append(antRuntimeClasses);
+ }
+ }
+
+ private void checkIncludeSummary(CommandlineJava cmd)
{
+ if (summary) {
+ String prefix = "";
+ if
("withoutanderr".equalsIgnoreCase(summaryValue))
{
+ prefix = "OutErr";
+ }
+ cmd.createArgument()
+ .setValue(Constants.FORMATTER
+ +
"org.apache.tools.ant.taskdefs.optional.junit."
+ + prefix +
"SummaryJUnitResultFormatter");
+ }
}
/**
------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribeant.apache.org
For additional commands, e-mail: dev-helpant.apache.org
|
