sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1425613 - in /sis/trunk: ./ sis-utility/src/main/java/org/apache/sis/io/LineAppender.java sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
Date Mon, 24 Dec 2012 09:49:52 GMT
Author: desruisseaux
Date: Mon Dec 24 09:49:52 2012
New Revision: 1425613

URL: http://svn.apache.org/viewvc?rev=1425613&view=rev
Log:
Merge from the JDK6 branch, in order to fix the build failure (javadoc crash).

Modified:
    sis/trunk/   (props changed)
    sis/trunk/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java
    sis/trunk/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1425591-1425610
  Merged /sis/branches/JDK6:r1425592-1425611

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java?rev=1425613&r1=1425612&r2=1425613&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java Mon Dec 24 09:49:52
2012
@@ -246,7 +246,7 @@ public class LineAppender extends Append
     /**
      * Returns {@code true} if this formatter expands tabulations into spaces.
      * The default value is {@code false}, which means that {@code '\t'} characters
-     * are sent to the {@linkplain #out underlying appendable} <i>as-is</i>.
+     * are sent to the underlying appendable <i>as-is</i>.
      *
      * @return {@code true} if this formatter expands tabulations into spaces,
      *         or {@code false} if {@code '\t'} characters are forwarded <i>as-is</i>.
@@ -266,7 +266,7 @@ public class LineAppender extends Append
     }
 
     /**
-     * Returns the line separator to be sent to the {@linkplain #out underlying appendable},
+     * Returns the line separator to be sent to the underlying appendable,
      * or {@code null} if EOL sequences are forwarded unchanged.
      *
      * @return The current line separator, or {@code null} if EOL are forwarded <i>as-is</i>.
@@ -276,7 +276,7 @@ public class LineAppender extends Append
     }
 
     /**
-     * Changes the line separator to be sent to the {@linkplain #out underlying appendable}.
+     * Changes the line separator to be sent to the underlying appendable.
      * This is the string to insert in place of every occurrences of {@code "\r"}, {@code
"\n"},
      * {@code "\r\n"} or other {@linkplain Characters#isLineOrParagraphSeparator(int) line
separators}.
      * If {@code null} (the default), then the line separators given to the {@code append}

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java?rev=1425613&r1=1425612&r2=1425613&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java Mon Dec
24 09:49:52 2012
@@ -24,17 +24,17 @@ import java.util.TimeZone;
 import java.text.Format;
 import java.text.NumberFormat;
 import java.text.DecimalFormat;
+import java.text.FieldPosition;
 import java.text.ParsePosition;
 import java.text.ParseException;
 import org.opengis.util.InternationalString;
 import org.apache.sis.io.TableAppender;
 import org.apache.sis.io.TabularFormat;
+import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Vocabulary;
+import org.apache.sis.util.collection.BackingStoreException;
 
 import static java.lang.Math.*;
-import java.text.FieldPosition;
-import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.collection.BackingStoreException;
 
 
 /**



Mime
View raw message