ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Javadoc.java
Date Thu, 21 Jun 2001 11:49:28 GMT
bodewig     01/06/21 04:49:28

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Javadoc.java
  Log:
  Make the packagelistloc attribute of javadoc's link child a File so it
  will be resolved properly.
  
  Reported by:	abethegn@canal-plus.fr
  
  Revision  Changes    Path
  1.114     +4 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- WHATSNEW	2001/06/21 10:15:30	1.113
  +++ WHATSNEW	2001/06/21 11:49:23	1.114
  @@ -375,3 +375,7 @@
   * Corrupt Zip- and Jar-files ar now deleted if the task fails.
   
   * many more fixes we've forgotten to document here ...
  +
  +* The packagelistloc attribute of <javadoc>'s <link> child will be
  +  resolved as a file (i.e. it is either absolute or relative to 
  +  basedir).
  
  
  
  1.52      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Javadoc.java	2001/06/07 10:02:07	1.51
  +++ Javadoc.java	2001/06/21 11:49:26	1.52
  @@ -546,7 +546,7 @@
               if (!tok.hasMoreTokens()) {
                   throw new BuildException(linkOfflineError);
               }                                        
  -            le.setPackagelistLoc(tok.nextToken());
  +            le.setPackagelistLoc(project.resolveFile(tok.nextToken()));
           }
       }
       public void setGroup(String src) {
  @@ -607,7 +607,7 @@
       public class LinkArgument {
           private String href;
           private boolean offline = false;
  -        private String packagelistLoc;
  +        private File packagelistLoc;
           
           public LinkArgument() {
           }
  @@ -620,12 +620,12 @@
               return href;
           }
           
  -        public void setPackagelistLoc(String src) {
  +        public void setPackagelistLoc(File src) {
               packagelistLoc = src;
           }
           
           public String getPackagelistLoc() {
  -            return packagelistLoc;
  +            return packagelistLoc.getAbsolutePath();
           }
           
           public void setOffline(boolean offline) {
  
  
  

Mime
View raw message