From ccdebfcc2cfd8dbde8f959e085f2278d8c1bc685 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 6 Aug 2019 16:24:44 +0200 Subject: [PATCH] Do not lose newlines/tabs from javadoc When we are formatting javadoc for a accessor method, we must treat any newlines/tabs as whitespace and not lose them, otherwise we would end up with concatenated words. JIRA: MDSAL-416 Change-Id: I3c0fc296692a141d6787a5cba8b17738a108274e Signed-off-by: Robert Varga --- .../mdsal/binding/java/api/generator/BaseTemplate.xtend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend index a3aca129c5..0ebe404e0f 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend @@ -363,8 +363,8 @@ abstract class BaseTemplate extends JavaFileTemplate { var boolean isFirstElementOnNewLineEmptyChar = false; formattedText = encodeJavadocSymbols(formattedText) - formattedText = NL_MATCHER.removeFrom(formattedText) - formattedText = TAB_MATCHER.removeFrom(formattedText) + formattedText = NL_MATCHER.replaceFrom(formattedText, ' ') + formattedText = TAB_MATCHER.replaceFrom(formattedText, ' ') formattedText = SPACES_PATTERN.matcher(formattedText).replaceAll(" ") val StringTokenizer tokenizer = new StringTokenizer(formattedText, " ", true); -- 2.36.6