From 8bf76a6d5476dfc5dcaea89528973e324bbdcf6f Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 10 Oct 2008 15:04:46 +0000 Subject: [PATCH] space is not the only whitespace that could show up. bottom/head are free-form HTML with line breaks, tabs and all that. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@703493 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/Javadoc.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index c1d8d4f08..dae34ac13 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -2220,8 +2220,8 @@ public class Javadoc extends Task { * @return the quoted string, if there is no need to quote the string, * return the original string. */ - private String quoteString(String str) { - if (str.indexOf(' ') == -1 + private String quoteString(final String str) { + if (!containsWhitespace(str) && str.indexOf('\'') == -1 && str.indexOf('"') == -1) { return str; @@ -2233,7 +2233,17 @@ public class Javadoc extends Task { } } - private String quoteString(String str, char delim) { + private boolean containsWhitespace(final String s) { + final int len = s.length(); + for (int i = 0; i < len; i++) { + if (Character.isWhitespace(s.charAt(i))) { + return true; + } + } + return false; + } + + private String quoteString(String str, final char delim) { StringBuffer buf = new StringBuffer(str.length() * 2); buf.append(delim); if (str.indexOf('\\') != -1) {