You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by jk...@apache.org on 2005/07/21 22:25:25 UTC
cvs commit: ant/src/main/org/apache/tools/ant/types ZipFileSet.java
jkf 2005/07/21 13:25:25
Modified: . WHATSNEW
src/main/org/apache/tools/ant/types ZipFileSet.java
Log:
PR:35824
Adding removed public methods
Revision Changes Path
1.846 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -r1.845 -r1.846
--- WHATSNEW 8 Jul 2005 14:27:03 -0000 1.845
+++ WHATSNEW 21 Jul 2005 20:25:25 -0000 1.846
@@ -59,6 +59,8 @@
Fixed bugs:
-----------
+* Backward incompatible change in ZipFileSet, Bugzilla Report 35824.
+
* Wrong replacement of file separator chars prevens junitbatchtest
from running correctly on files from a zipfileset. Bugzilla Report 35499
1.31 +48 -2 ant/src/main/org/apache/tools/ant/types/ZipFileSet.java
Index: ZipFileSet.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/ZipFileSet.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ZipFileSet.java 12 Jun 2005 15:54:15 -0000 1.30
+++ ZipFileSet.java 21 Jul 2005 20:25:25 -0000 1.31
@@ -130,6 +130,7 @@
* to have a reference to a ZipFileSet, only to a FileSet.
* @param p the project to use
* @return the source file
+ * @since Ant 1.6
*/
public File getSrc(Project p) {
if (isReference()) {
@@ -139,6 +140,16 @@
}
/**
+ * Get the zip file from which entries will be extracted.
+ * References are not followed, since it is not possible
+ * to have a reference to a ZipFileSet, only to a FileSet.
+ * @deprecated
+ */
+ public File getSrc() {
+ return srcFile;
+ }
+
+ /**
* Prepend this prefix to the path for each zip entry.
* Prevents both prefix and fullpath from being specified
*
@@ -155,6 +166,7 @@
* Return the prefix prepended to entries in the zip file.
* @param p the project to use
* @return the prefix
+ * @since Ant 1.6
*/
public String getPrefix(Project p) {
if (isReference()) {
@@ -164,6 +176,14 @@
}
/**
+ * Return the prefix prepended to entries in the zip file.
+ * @deprecated
+ */
+ public String getPrefix() {
+ return prefix;
+ }
+
+ /**
* Set the full pathname of the single entry in this fileset.
* Prevents both prefix and fullpath from being specified
*
@@ -180,6 +200,7 @@
* Return the full pathname of the single entry in this fileset.
* @param p the project to use
* @return the full path
+ * @since Ant 1.6
*/
public String getFullpath(Project p) {
if (isReference()) {
@@ -187,6 +208,14 @@
}
return fullpath;
}
+
+ /**
+ * Return the full pathname of the single entry in this fileset.
+ * @deprecated
+ */
+ public String getFullpath() {
+ return fullpath;
+ }
/**
* Set the encoding used for this ZipFileSet.
@@ -290,7 +319,7 @@
* Get the mode of the zip fileset
* @param p the project to use
* @return the mode
- * @since Ant 1.5.2
+ * @since Ant 1.6
*/
public int getFileMode(Project p) {
if (isReference()) {
@@ -298,6 +327,15 @@
}
return fileMode;
}
+
+ /**
+ * @since Ant 1.5.2
+ * @deprecated
+ */
+ public int getFileMode() {
+ return fileMode;
+ }
+
/**
* Whether the user has specified the mode explicitly.
@@ -329,7 +367,7 @@
* Get the dir mode of the zip fileset
* @param p the project to use
* @return the mode
- * @since Ant 1.5.2
+ * @since Ant 1.6
*/
public int getDirMode(Project p) {
if (isReference()) {
@@ -337,6 +375,14 @@
}
return dirMode;
}
+
+ /**
+ * @since Ant 1.5.2
+ * @deprecated
+ */
+ public int getDirMode() {
+ return dirMode;
+ }
/**
* Whether the user has specified the mode explicitly.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org