bodewig 2005/07/08 07:27:03 Modified: . WHATSNEW src/main/org/apache/tools/ant/taskdefs Javadoc.java Log: -breakiterator has been promoted, PR 34580 Revision Changes Path 1.845 +3 -0 ant/WHATSNEW Index: WHATSNEW =================================================================== RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.844 retrieving revision 1.845 diff -u -r1.844 -r1.845 --- WHATSNEW 6 Jul 2005 12:27:38 -0000 1.844 +++ WHATSNEW 8 Jul 2005 14:27:03 -0000 1.845 @@ -248,6 +248,9 @@ * <ssh> and <scp> support keyboard-interactive authentication now. +* <javadoc> now supports -breakiterator for custom doclets if Ant is + running on JSE 5.0 or higher. Bugzilla Report: 34580. + Changes from Ant 1.6.4 to Ant 1.6.5 =================================== 1.143 +3 -1 ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java Index: Javadoc.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- Javadoc.java 31 May 2005 15:53:33 -0000 1.142 +++ Javadoc.java 8 Jul 2005 14:27:03 -0000 1.143 @@ -1569,6 +1569,8 @@ boolean javadoc4 = !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2) && !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3); + boolean javadoc5 = javadoc4 && + !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_4); Vector packagesToDoc = new Vector(); Path sourceDirs = new Path(getProject()); @@ -1886,7 +1888,7 @@ if (linksource && doclet == null) { toExecute.createArgument().setValue("-linksource"); } - if (breakiterator && doclet == null) { + if (breakiterator && (doclet == null || javadoc5)) { toExecute.createArgument().setValue("-breakiterator"); } if (noqualifier != null && doclet == null) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]