Author: desruisseaux
Date: Sun Nov 25 09:16:46 2012
New Revision: 1413306
URL: http://svn.apache.org/viewvc?rev=1413306&view=rev
Log:
Merge from the JDK6 branch the fix for javadoc crash (a JDK6-only problem).
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/trunk:r1411579-1413304
Merged /sis/branches/JDK6:r1411580-1413305
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java?rev=1413306&r1=1413305&r2=1413306&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java
(original)
+++
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/io/LineFormatter.java
Sun Nov 25 09:16:46 2012
@@ -540,10 +540,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
