From 04723595458fcf610817d20cff21c637e1e2e77b Mon Sep 17 00:00:00 2001
From: Jacobus Martinus Kruithof <jkf@apache.org>
Date: Thu, 21 Jul 2005 20:25:25 +0000
Subject: [PATCH] PR:35824

Adding removed public methods


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278470 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  2 +
 .../apache/tools/ant/types/ZipFileSet.java    | 50 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index b98224167..5afdd297f 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -59,6 +59,8 @@ Changes that could break older environments:
 
 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
 
diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java
index 6c1bad65e..d346af134 100644
--- a/src/main/org/apache/tools/ant/types/ZipFileSet.java
+++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java
@@ -130,6 +130,7 @@ public class ZipFileSet extends FileSet {
      * 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()) {
@@ -138,6 +139,16 @@ public class ZipFileSet extends FileSet {
         return srcFile;
     }
 
+    /**
+     * 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 @@ public class ZipFileSet extends FileSet {
      * 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()) {
@@ -163,6 +175,14 @@ public class ZipFileSet extends FileSet {
         return prefix;
     }
 
+    /**
+     * 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 @@ public class ZipFileSet extends FileSet {
      * 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 @@ public class ZipFileSet extends FileSet {
         }
         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 @@ public class ZipFileSet extends FileSet {
      * 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 @@ public class ZipFileSet extends FileSet {
         }
         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 @@ public class ZipFileSet extends FileSet {
      * 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 @@ public class ZipFileSet extends FileSet {
         }
         return dirMode;
     }
+    
+    /**
+     * @since Ant 1.5.2
+     * @deprecated
+     */
+    public int getDirMode() {
+        return dirMode;
+    }
 
     /**
      * Whether the user has specified the mode explicitly.