Mailing-List: contact commits-help@sis.apache.org; run by ezmlm
Precedence: bulk
Reply-To: sis-dev@sis.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1413305 - in /sis/branches/JDK6: ./
 sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java
Date: Sun, 25 Nov 2012 09:14:40 -0000
To: commits@sis.apache.org
From: desruisseaux@apache.org
Message-Id: <20121125091440.8D7052388906@eris.apache.org>

Author: desruisseaux
Date: Sun Nov 25 09:14:39 2012
New Revision: 1413305

URL: http://svn.apache.org/viewvc?rev=1413305&view=rev
Log:
Merge from trunk the fix for javadoc crash.

Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/trunk:r1411579-1413304

Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java?rev=1413305&r1=1413304&r2=1413305&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java Sun Nov 25 09:14:39 2012
@@ -543,10 +543,10 @@ searchHyp:  for (int i=buffer.length(); 
     }
 
     /**
-     * Sends all pending characters to the {@linkplain #out underlying appendable}, including
-     * trailing whitespaces. Note that this method should preferably be invoked at the end of
-     * a word, sentence or line, since invoking this method may prevent {@code LineFormatter}
-     * to properly wrap the current line if the current position is in the middle of a word.
+     * Sends all pending characters to the underlying appendable, including trailing whitespaces.
+     * Note that this method should preferably be invoked at the end of a word, sentence or line,
+     * since invoking this method may prevent {@code LineFormatter} to properly wrap the current
+     * line if the current position is in the middle of a word.
      *
      * <p>Invoking this method also flushes the underlying stream, if {@linkplain Flushable flushable}.
      * A cheaper way to send pending characters is to make sure that the last character is a