From 44564adf2b66dc37a61204f206d8374813fa7888 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 8 Jul 2005 14:27:03 +0000 Subject: [PATCH] -breakiterator has been promoted, PR 34580 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278458 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index ef29020d7..b98224167 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -248,6 +248,9 @@ Other changes: * and support keyboard-interactive authentication now. +* 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 =================================== diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index aa4b04a1e..3df2e9c67 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1569,6 +1569,8 @@ public class Javadoc extends Task { 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 @@ public class Javadoc extends Task { 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) {