Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AD981D5B7 for ; Mon, 17 Sep 2012 08:34:15 +0000 (UTC) Received: (qmail 20828 invoked by uid 500); 17 Sep 2012 08:34:15 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 19992 invoked by uid 500); 17 Sep 2012 08:34:08 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 19853 invoked by uid 500); 17 Sep 2012 08:34:03 -0000 Received: (qmail 19845 invoked by uid 99); 17 Sep 2012 08:34:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Sep 2012 08:34:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Sep 2012 08:34:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 41BE323889D7; Mon, 17 Sep 2012 08:33:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1386508 - /db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java Date: Mon, 17 Sep 2012 08:33:19 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120917083319.41BE323889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Mon Sep 17 08:33:18 2012 New Revision: 1386508 URL: http://svn.apache.org/viewvc?rev=1386508&view=rev Log: beautify code Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java?rev=1386508&r1=1386507&r2=1386508&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java Mon Sep 17 08:33:18 2012 @@ -146,7 +146,7 @@ public class JavadocOutlet extends Outle // last char is space so it can be removed boolean lastCharRemovable = true; String token = null; - String currentIndent = indent + " * "; + String currentIndent = indent + MID_LINE_START; String lastJavadocAttribute = null; while (tokenizer.hasMoreTokens() || token != null) { @@ -182,10 +182,11 @@ public class JavadocOutlet extends Outle { token = tokenizer.nextToken(); - // 5 because of " * @" + space after attribute + // + 2 because of "@" + space after attribute currentIndent = StringUtils.rightPad( indent + MID_LINE_START, - indent.length() + 5 + token.length()); + indent.length() + MID_LINE_START.length() + + 2 + token.length()); if (result.length() > indent.length() + MID_LINE_START.length()) { @@ -202,13 +203,11 @@ public class JavadocOutlet extends Outle { doubleLineBreak = true; } - if (!alreadyIndented) + if (!alreadyIndented || doubleLineBreak) { - result.append(lineBreak).append(indent).append(" *"); - } - if (doubleLineBreak) - { - result.append(lineBreak).append(indent).append(" *"); + result.append(lineBreak) + .append(indent) + .append(" *"); } result.append(" "); } @@ -368,6 +367,14 @@ public class JavadocOutlet extends Outle this.wrapAfterCharacters = wrapAfterCharacters; } + /** + * Removes the trailing characters from a string builder. + * The characters to be removed are passed in as parameter. + * + * @param stringBuilder the string builder to remove the end from, not null. + * @param removeChars The characters to remove if they appear at the end, + * not null. + */ static void removeEnd(StringBuilder stringBuilder, String removeChars) { Set removeCharSet = new HashSet(); --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org