bodewig 2004/04/23 00:33:52
Modified: docs/manual/CoreTypes redirector.html
src/main/org/apache/tools/ant/taskdefs ExecTask.java
Java.java Redirector.java
src/main/org/apache/tools/ant/types RedirectorElement.java
src/main/org/apache/tools/ant/util ReaderInputStream.java
Log:
The small things you find when reviewing code
Revision Changes Path
1.2 +1 -1 ant/docs/manual/CoreTypes/redirector.html
Index: redirector.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTypes/redirector.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redirector.html 31 Mar 2004 21:47:42 -0000 1.1
+++ redirector.html 23 Apr 2004 07:33:51 -0000 1.2
@@ -139,7 +139,7 @@
</ul>
<p>The expected behavior of a <redirector> is to a great degree
dependent on the supporting task. Any possible points of confusion
-should be noted at the task level.
+should be noted at the task level.</p>
<hr />
<p align="center">Copyright © 2004 The Apache Software Foundation. All
rights
Reserved.</p>
1.70 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ExecTask.java 14 Apr 2004 15:42:06 -0000 1.69
+++ ExecTask.java 23 Apr 2004 07:33:51 -0000 1.70
@@ -190,7 +190,7 @@
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= logError;
}
/**
@@ -236,7 +236,7 @@
*/
public void setFailonerror(boolean fail) {
failOnError = fail;
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= fail;
}
/**
@@ -308,8 +308,8 @@
* @param result value desired for the result property value
*/
protected void maybeSetResultPropertyValue(int result) {
- String res = Integer.toString(result);
if (resultProperty != null) {
+ String res = Integer.toString(result);
getProject().setNewProperty(resultProperty, res);
}
}
1.92 +2 -1 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Java.java 20 Apr 2004 06:52:48 -0000 1.91
+++ Java.java 23 Apr 2004 07:33:51 -0000 1.92
@@ -332,6 +332,7 @@
*/
public void setResultProperty(String resultProperty) {
this.resultProperty = resultProperty;
+ incompatibleWithSpawn = true;
}
/**
@@ -474,7 +475,7 @@
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= logError;
}
/**
1.19 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java
Index: Redirector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Redirector.java 14 Apr 2004 15:42:06 -0000 1.18
+++ Redirector.java 23 Apr 2004 07:33:51 -0000 1.19
@@ -78,7 +78,7 @@
/**
* The file(s) from which standard input is being taken.
- * If > 1, files' content will be concatenated in the order received.
+ * If > 1, files' content will be concatenated in the order received.
*/
private File[] input;
@@ -137,7 +137,7 @@
/** The stream for input */
private InputStream inputStream = null;
- /** Stream which are used for line oriented output */
+ /** Stream which is used for line oriented output */
private PrintStream outPrintStream = null;
/** Stream which is used for line oriented error output */
1.2 +8 -4
ant/src/main/org/apache/tools/ant/types/RedirectorElement.java
Index: RedirectorElement.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/RedirectorElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RedirectorElement.java 27 Mar 2004 21:22:58 -0000 1.1
+++ RedirectorElement.java 23 Apr 2004 07:33:51 -0000 1.2
@@ -47,10 +47,10 @@
private boolean usingError = false;
/**
- * Indicates if standard error should be logged to Ant's log system
- * rather than the output. This has no effect if standard error is
- * redirected to a file or property.
- */
+ * Indicates if standard error should be logged to Ant's log system
+ * rather than the output. This has no effect if standard error is
+ * redirected to a file or property.
+ */
private Boolean logError;
/** The name of the property into which output is to be stored */
@@ -165,6 +165,10 @@
|| inputString != null
|| logError != null
|| append != null
+ || createEmptyFiles != null
+ || inputEncoding != null
+ || outputEncoding != null
+ || errorEncoding != null
|| outputProperty != null
|| errorProperty != null) {
throw tooManyAttributes();
1.2 +1 -1
ant/src/main/org/apache/tools/ant/util/ReaderInputStream.java
Index: ReaderInputStream.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ReaderInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReaderInputStream.java 27 Mar 2004 21:22:58 -0000 1.1
+++ ReaderInputStream.java 23 Apr 2004 07:33:51 -0000 1.2
@@ -130,7 +130,7 @@
System.arraycopy(slack, begin, b, off, len);
- if ((begin+= len) >= slack.length) {
+ if ((begin += len) >= slack.length) {
slack = null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
