sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1555431 - in /sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing: CRS.java crs/DefaultCompoundCRS.java
Date Sat, 04 Jan 2014 22:56:47 GMT
Author: desruisseaux
Date: Sat Jan  4 22:56:47 2014
New Revision: 1555431

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

Modified:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java?rev=1555431&r1=1555430&r2=1555431&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] Sat Jan  4 22:56:47 2014
@@ -81,18 +81,21 @@ public final class CRS extends Static {
      * {@example Apache SIS allows 4-dimensional (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)
      * coordinate reference system to be built in two different ways as shown below:
      *
-     * <table class="compact"><tr><td><blockquote>
-     *   <code>CompoundCRS</code> (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)<br>
-     *   <code>  ├─CompoundCRS</code> (<var>x</var>,<var>y</var>,<var>z</var>)<br>
-     *   <code>  │   ├─ProjectedCRS</code> (<var>x</var>,<var>y</var>)<br>
-     *   <code>  │   └─VerticalCRS</code> (<var>z</var>)<br>
-     *   <code>  └─TemporalCRS</code> (<var>t</var>)
+     * <table class="compact">
+     * <tr><th>Hierarchical structure</th><th>Flat list</th></tr>
+     * <tr><td><blockquote>
+     *   <code>CompoundCRS</code> — (<var>x</var>, <var>y</var>,
<var>z</var>, <var>t</var>)<br>
+     *   <code>  ├─CompoundCRS</code> — (<var>x</var>, <var>y</var>,
<var>z</var>)<br>
+     *   <code>  │   ├─ProjectedCRS</code> — (<var>x</var>,
<var>y</var>)<br>
+     *   <code>  │   └─VerticalCRS</code> — (<var>z</var>)<br>
+     *   <code>  └─TemporalCRS</code> — (<var>t</var>)
      * </blockquote></td><td><blockquote>
-     *   <code>CompoundCRS</code> (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)<br>
-     *   <code>  ├─ProjectedCRS</code> (<var>x</var>,<var>y</var>)<br>
-     *   <code>  ├─VerticalCRS</code> (<var>z</var>)<br>
-     *   <code>  └─TemporalCRS</code> (<var>t</var>)
-     * </blockquote></td></tr></table>
+     *   <code>CompoundCRS</code> — (<var>x</var>, <var>y</var>,
<var>z</var>, <var>t</var>)<br>
+     *   <code>  ├─ProjectedCRS</code> — (<var>x</var>, <var>y</var>)<br>
+     *   <code>  ├─VerticalCRS</code> — (<var>z</var>)<br>
+     *   <code>  └─TemporalCRS</code> — (<var>t</var>)
+     * </blockquote>
+     * </td></tr></table>
      *
      * This method guaranteed that the returned list is a flat one as shown on the right
side.
      * Note that such flat lists are the only one allowed by ISO/OGC standards for compound
CRS.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java?rev=1555431&r1=1555430&r2=1555431&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
[UTF-8] Sat Jan  4 22:56:47 2014
@@ -47,18 +47,21 @@ import static org.apache.sis.util.Utilit
  * This class is often used for defining 4-dimensional (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)
  * coordinate reference systems as an aggregation of simpler CRS. Below is two examples of
such aggregations:
  *
- * <table class="compact"><tr><td><blockquote>
- *   <code>CompoundCRS</code> (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)<br>
- *   <code>  ├─ProjectedCRS</code> (<var>x</var>,<var>y</var>)<br>
- *   <code>  ├─VerticalCRS</code> (<var>z</var>)<br>
- *   <code>  └─TemporalCRS</code> (<var>t</var>)
+ * <table class="compact">
+ * <tr><th>Flat list</th><th>Hierarchical structure</th></tr>
+ * <tr><td><blockquote>
+ *   <code>CompoundCRS</code> — (<var>x</var>, <var>y</var>,
<var>z</var>, <var>t</var>)<br>
+ *   <code>  ├─ProjectedCRS</code> — (<var>x</var>, <var>y</var>)<br>
+ *   <code>  ├─VerticalCRS</code> — (<var>z</var>)<br>
+ *   <code>  └─TemporalCRS</code> — (<var>t</var>)
  * </blockquote></td><td><blockquote>
- *   <code>CompoundCRS</code> (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)<br>
- *   <code>  ├─CompoundCRS</code> (<var>x</var>,<var>y</var>,<var>z</var>)<br>
- *   <code>  │   ├─ProjectedCRS</code> (<var>x</var>,<var>y</var>)<br>
- *   <code>  │   └─VerticalCRS</code> (<var>z</var>)<br>
- *   <code>  └─TemporalCRS</code> (<var>t</var>)
- * </blockquote></td></tr></table>
+ *   <code>CompoundCRS</code> — (<var>x</var>, <var>y</var>,
<var>z</var>, <var>t</var>)<br>
+ *   <code>  ├─CompoundCRS</code> — (<var>x</var>, <var>y</var>,
<var>z</var>)<br>
+ *   <code>  │   ├─ProjectedCRS</code> — (<var>x</var>,
<var>y</var>)<br>
+ *   <code>  │   └─VerticalCRS</code> — (<var>z</var>)<br>
+ *   <code>  └─TemporalCRS</code> — (<var>t</var>)
+ * </blockquote></td></tr>
+ * </table>
  *
  * Strictly speaking, only the flat list on the left side is allowed by OGC/ISO specifications.
  * However Apache SIS relaxes this rule by allowing hierarchies as shown on the right side.
This



Mime
View raw message