peterreilly 2004/05/18 01:15:09
Modified: src/main/org/apache/tools/zip Tag: ANT_16_BRANCH
ZipOutputStream.java ZipFile.java
src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
DataType.java
src/main/org/apache/tools/ant/filters Tag: ANT_16_BRANCH
TokenFilter.java
src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
DemuxInputStream.java
Log:
sync
Revision Changes Path
No revision
No revision
1.17.2.7 +3 -3 ant/src/main/org/apache/tools/zip/ZipOutputStream.java
Index: ZipOutputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipOutputStream.java,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -u -r1.17.2.6 -r1.17.2.7
--- ZipOutputStream.java 14 Apr 2004 15:42:41 -0000 1.17.2.6
+++ ZipOutputStream.java 18 May 2004 08:15:08 -0000 1.17.2.7
@@ -256,8 +256,8 @@
* access file).
*
* <p>For seekable streams, you don't need to calculate the CRC or
- * uncompressed size for [EMAIL PROTECTED] #STORED STORED} entries before
- * invoking [EMAIL PROTECTED] #putEntry putEntry}.
+ * uncompressed size for [EMAIL PROTECTED] #STORED} entries before
+ * invoking [EMAIL PROTECTED] #putNextEntry}.
*
* @since 1.17
*/
1.8.2.5 +3 -4 ant/src/main/org/apache/tools/zip/ZipFile.java
Index: ZipFile.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipFile.java,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- ZipFile.java 9 Mar 2004 17:02:00 -0000 1.8.2.4
+++ ZipFile.java 18 May 2004 08:15:08 -0000 1.8.2.5
@@ -161,9 +161,8 @@
}
/**
- * Returns all entries as [EMAIL PROTECTED] org.apache.tools.ant.ZipEntry
- * ZipEntry} instances.
- * @return all entries as ZipEntry instances.
+ * Returns all entries.
+ * @return all entries as [EMAIL PROTECTED] ZipEntry} instances
*/
public Enumeration getEntries() {
return entries.keys();
No revision
No revision
1.16.2.5 +2 -2 ant/src/main/org/apache/tools/ant/types/DataType.java
Index: DataType.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/DataType.java,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -r1.16.2.4 -r1.16.2.5
--- DataType.java 9 Mar 2004 17:01:54 -0000 1.16.2.4
+++ DataType.java 18 May 2004 08:15:08 -0000 1.16.2.5
@@ -205,7 +205,7 @@
/**
* check that it is ok to set attributes, i.e that no reference is
defined
* @since Ant 1.6
- * @throw BuildException if not allowed
+ * @throws BuildException if not allowed
*/
protected void checkAttributesAllowed() {
if (isReference()) {
@@ -216,7 +216,7 @@
/**
* check that it is ok to add children, i.e that no reference is defined
* @since Ant 1.6
- * @throw BuildException if not allowed
+ * @throws BuildException if not allowed
*/
protected void checkChildrenAllowed() {
if (isReference()) {
No revision
No revision
1.12.2.6 +1 -1
ant/src/main/org/apache/tools/ant/filters/TokenFilter.java
Index: TokenFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/TokenFilter.java,v
retrieving revision 1.12.2.5
retrieving revision 1.12.2.6
diff -u -r1.12.2.5 -r1.12.2.6
--- TokenFilter.java 20 Apr 2004 22:09:04 -0000 1.12.2.5
+++ TokenFilter.java 18 May 2004 08:15:08 -0000 1.12.2.6
@@ -37,7 +37,7 @@
* @since Ant 1.6
* @see BaseFilterReader
* @see ChainableReader
- * @see DynamicConfigurator
+ * @see org.apache.tools.ant.DynamicConfigurator
*/
public class TokenFilter extends BaseFilterReader
implements ChainableReader {
No revision
No revision
1.5.2.5 +1 -6 ant/src/main/org/apache/tools/ant/DemuxInputStream.java
Index: DemuxInputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DemuxInputStream.java,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -r1.5.2.4 -r1.5.2.5
--- DemuxInputStream.java 9 Mar 2004 17:01:29 -0000 1.5.2.4
+++ DemuxInputStream.java 18 May 2004 08:15:08 -0000 1.5.2.5
@@ -43,9 +43,6 @@
this.project = project;
}
- /**
- * @see InputStream.read()
- */
public int read() throws IOException {
byte[] buffer = new byte[1];
if (project.demuxInput(buffer, 0, 1) == -1) {
@@ -55,10 +52,8 @@
}
- /**
- * @see InputStream.read(byte[], int, int)
- */
public int read(byte[] buffer, int offset, int length) throws
IOException {
return project.demuxInput(buffer, offset, length);
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
