From torque-dev-return-10589-apmail-db-torque-dev-archive=db.apache.org@db.apache.org Mon Oct 31 01:57:45 2011 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 25CED7B1B for ; Mon, 31 Oct 2011 01:57:45 +0000 (UTC) Received: (qmail 94139 invoked by uid 500); 31 Oct 2011 01:57:45 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 94121 invoked by uid 500); 31 Oct 2011 01:57:45 -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 94113 invoked by uid 500); 31 Oct 2011 01:57:45 -0000 Received: (qmail 94110 invoked by uid 99); 31 Oct 2011 01:57:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Oct 2011 01:57:45 +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, 31 Oct 2011 01:57:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AFCAF23888E4; Mon, 31 Oct 2011 01:57:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1195301 - in /db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator: merge/ThreeWayMerger.java merge/package.html outlet/java/JavadocOutlet.java Date: Mon, 31 Oct 2011 01:57:23 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111031015723.AFCAF23888E4@eris.apache.org> Author: tfischer Date: Mon Oct 31 01:57:23 2011 New Revision: 1195301 URL: http://svn.apache.org/viewvc?rev=1195301&view=rev Log: fix checkstyle errors: - use constants for numbers, - add package.html - remove trailing spaces Added: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/package.html Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java 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/merge/ThreeWayMerger.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java?rev=1195301&r1=1195300&r2=1195301&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java Mon Oct 31 01:57:23 2011 @@ -32,21 +32,21 @@ import org.eclipse.jgit.merge.MergeResul /** * Can execute a three-way merge. This class is thread safe. - * + * * @version $Id: $ */ public class ThreeWayMerger { /** * Performs a three-way merge. - * + * * @param base the base from which the other two versions are derived, * not null. * @param generated the newly generated text, not null. * @param edited the possibly edited text, not null. * @param charsetName the name of the character set, not null. * @return the merge result, not null. - * + * * @throws GeneratorException if merging fails. */ public String merge( @@ -62,8 +62,8 @@ public class ThreeWayMerger { mergeResult = mergeAlgorithm.merge( RawTextComparator.DEFAULT, - new RawText(base.getBytes(charsetName)), - new RawText(generated.getBytes(charsetName)), + new RawText(base.getBytes(charsetName)), + new RawText(generated.getBytes(charsetName)), new RawText(edited.getBytes(charsetName))); } catch (UnsupportedEncodingException e) @@ -89,7 +89,7 @@ public class ThreeWayMerger } try { - String result + String result = new String(outputStream.toByteArray(), charsetName); return result; } Added: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/package.html URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/package.html?rev=1195301&view=auto ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/package.html (added) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/package.html Mon Oct 31 01:57:23 2011 @@ -0,0 +1,25 @@ + + + + Torque generator merge helpers + + +

+ This package provides access to text file merge implementations. +

+ + 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=1195301&r1=1195300&r2=1195301&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 Oct 31 01:57:23 2011 @@ -54,11 +54,14 @@ public class JavadocOutlet extends Outle /** The character which starts a javadoc attribute. */ private static final String JAVADOC_ATTRIBUTE_START = "@"; + /** The default maximum line width. */ + private static final int DEFAULT_MAX_LINEWIDTH = 80; + /** The line break string. */ private String lineBreak = "\n"; /** How long a line can be before it will be wrapped, -1 for no wrapping */ - private int maxLineLength = 80; + private int maxLineLength = DEFAULT_MAX_LINEWIDTH; /** The indent to use in front of each line. */ private String indent = " "; --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org