sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1566633 - in /sis/branches/JDK7/core: sis-referencing/src/main/java/org/apache/sis/geometry/ sis-referencing/src/main/java/org/apache/sis/referencing/ sis-utility/src/main/java/org/apache/sis/util/
Date Mon, 10 Feb 2014 14:26:14 GMT
Author: desruisseaux
Date: Mon Feb 10 14:26:14 2014
New Revision: 1566633

URL: http://svn.apache.org/r1566633
Log:
Minor javadoc formatting problems.

Modified:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1566633&r1=1566632&r2=1566633&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] Mon Feb 10 14:26:14 2014
@@ -76,8 +76,8 @@ import java.util.Objects;
  * The default implementation of methods listed in the right column can handle such cases.
  *
  * <table class="compact" align="center"><tr><td>
- *   <img src="doc-files/AntiMeridian.png">
- * </td><td>
+ *   <img style="vertical-align: middle" src="doc-files/AntiMeridian.png">
+ * </td><td style="vertical-align: middle">
  * Supported methods:
  * <ul>
  *   <li>{@link #getMinimum(int)}</li>

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1566633&r1=1566632&r2=1566633&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
[UTF-8] Mon Feb 10 14:26:14 2014
@@ -72,8 +72,8 @@ import static org.apache.sis.math.MathFu
  * The default implementation of methods listed in the right column can handle such cases.
  *
  * <table class="compact" align="center"><tr><td>
- *   <img src="doc-files/AntiMeridian.png">
- * </td><td>
+ *   <img style="vertical-align: middle" src="doc-files/AntiMeridian.png">
+ * </td><td style="vertical-align: middle">
  * Supported methods:
  * <ul>
  *   <li>{@link #getMinimum(int)}</li>

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1566633&r1=1566632&r2=1566633&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] Mon Feb 10 14:26:14 2014
@@ -753,7 +753,7 @@ public class AbstractIdentifiedObject ex
      * The strictness level is controlled by the second argument,
      * from stricter to more permissive values:
      *
-     * <blockquote><table class="compact">
+     * <table class="compact">
      *   <tr><td>{@link ComparisonMode#STRICT STRICT}:</td>
      *        <td>Verifies if the two objects are of the same {@linkplain #getClass()
class}
      *            and compares all public properties, including SIS-specific (non standard)
properties.</td></tr>
@@ -770,7 +770,7 @@ public class AbstractIdentifiedObject ex
      *       <td>Same as {@code IGNORE_METADATA}, with some tolerance threshold on
numerical values.</td></tr>
      *   <tr><td>{@link ComparisonMode#DEBUG DEBUG}:</td>
      *        <td>Special mode for figuring out why two objects expected to be equal
are not.</td></tr>
-     * </table></blockquote>
+     * </table>
      *
      * The main guideline is that if {@code sourceCRS.equals(targetCRS, IGNORE_METADATA)}
returns {@code true},
      * then the transformation from {@code sourceCRS} to {@code targetCRS} should be the
identity transform
@@ -790,7 +790,8 @@ public class AbstractIdentifiedObject ex
      * {@section Conformance to the <code>equals(Object)</code> method contract}
      * {@link ComparisonMode#STRICT} is the only mode compliant with the {@link Object#equals(Object)}
contract.
      * For all other modes, the comparison is not guaranteed to be <cite>symmetric</cite>
neither
-     * <cite>transitive</cite>. See {@link LenientComparable#equals(Object, ComparisonMode)}
for more information.
+     * <cite>transitive</cite>. See {@link LenientComparable#equals(Object, ComparisonMode)
LenientComparable}
+     * for more information.
      *
      * @param  object The object to compare to {@code this}.
      * @param  mode The strictness level of the comparison.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java?rev=1566633&r1=1566632&r2=1566633&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
[UTF-8] Mon Feb 10 14:26:14 2014
@@ -110,7 +110,7 @@ public interface LenientComparable {
      * The strictness level is controlled by the second argument,
      * from stricter to more permissive values:
      *
-     * <blockquote><table class="compact" >
+     * <table class="compact" >
      *   <tr><td>{@link ComparisonMode#STRICT STRICT}:</td>
      *        <td>All attributes of the compared objects shall be strictly equal.</td></tr>
      *   <tr><td>{@link ComparisonMode#BY_CONTRACT BY_CONTRACT}:</td>
@@ -122,20 +122,20 @@ public interface LenientComparable {
      *           with some tolerance threshold on numerical values.</td></tr>
      *   <tr><td>{@link ComparisonMode#DEBUG DEBUG}:</td>
      *        <td>Special mode for figuring out why two objects expected to be equal
are not.</td></tr>
-     * </table></blockquote>
+     * </table>
      *
      * {@section Conformance to the <code>equals(Object)</code> method contract}
      * {@link ComparisonMode#STRICT} is the only mode compliant with the {@link Object#equals(Object)}
contract.
-     * For all other modes, the comparison is not guaranteed to be <cite>symmetric</cite>
neither
+     * For all other modes <var>m</var>, the comparison is not guaranteed to
be <cite>symmetric</cite> neither
      * <cite>transitive</cite>:
      *
      * <ul>
-     *   <li>{@code x.equals(y, mode)} is <strong>not</strong> guaranteed
to be equal to {@code y.equals(x, mode)}.
+     *   <li>{@code x.equals(y,m)} is <strong>not</strong> guaranteed to
be equal to {@code y.equals(x,m)}.
      *       In particular, the {@code BY_CONTRACT} mode and all modes below it will typically
compare only the
      *       properties known to {@code this} instance, ignoring any properties that may
be known only by the other
      *       instance.</li>
-     *   <li>{@code x.equals(y, mode)} and {@code y.equals(z, mode)} does <strong>not</strong>
implies
-     *       {@code x.equals(z, mode)}. In particular, the use of a comparison threshold
for the
+     *   <li>{@code x.equals(y,m)} and {@code y.equals(z,m)} does <strong>not</strong>
implies
+     *       {@code x.equals(z,m)}. In particular, the use of a comparison threshold for
the
      *       {@code APPROXIMATIVE} mode is incompatible with the transitivity contract.</li>
      * </ul>
      *



Mime
View raw message