svn commit: r1463487 - in /sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso: acquisition/package-info.java citation/package-info.java package-info.java

[de...@apache.org]

Author: desruisseaux
Date: Tue Apr  2 11:18:30 2013
New Revision: 1463487

URL: http://svn.apache.org/r1463487
Log:
Fixed erroneous package name for CodeList in @link.
Added class hierarchy documentation for citation package.

Modified:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java?rev=1463487&r1=1463486&r2=1463487&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] Tue Apr  2 11:18:30 2013
@@ -42,7 +42,7 @@
  *     <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultInstrument Instrument}</li>
  *     <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord Environmental record}</li>
  *   </ul></li>
- *   <li>{@linkplain org.geoapi.util.CodeList}<ul>
+ *   <li>{@linkplain org.opengis.util.CodeList}<ul>
  *     <li>{@linkplain org.opengis.metadata.acquisition.ObjectiveType Objective type}</li>
  *     <li>{@linkplain org.opengis.metadata.acquisition.Trigger Trigger}</li>
  *     <li>{@linkplain org.opengis.metadata.acquisition.Context Context}</li>

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1463487&r1=1463486&r2=1463487&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] Tue Apr  2 11:18:30 2013
@@ -24,7 +24,29 @@
  * For a global overview of metadata in SIS, see the
  * <a href="{@docRoot}/../sis-metadata/index.html">Metadata page on the project web site</a>.
  *
- * <p><b>Aggregation hierarchy:</b></p>
+ * <table class="sis"><tr>
+ *   <th>Class hierarchy</th>
+ *   <th>Aggregation hierarchy</th>
+ * </tr><tr><td>
+ * <ul>
+ *   <li>{@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<ul>
+ *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultCitation Citation}</li>
+ *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultCitationDate Citation date}</li>
+ *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultResponsibleParty Responsible party}</li>
+ *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultContact Contact}</li>
+ *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultTelephone Telephone}</li>
+ *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultAddress Address}</li>
+ *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultOnlineResource Online resource}</li>
+ *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultSeries Series}</li>
+ *   </ul></li>
+ *   <li>{@linkplain org.opengis.util.CodeList}<ul>
+ *     <li>{@linkplain org.opengis.metadata.citation.DateType Date type}</li>
+ *     <li>{@linkplain org.opengis.metadata.citation.OnLineFunction Online function}</li>
+ *     <li>{@linkplain org.opengis.metadata.citation.PresentationForm Presentation form}</li>
+ *     <li>{@linkplain org.opengis.metadata.citation.Role Role}</li>
+ *   </ul></li>
+ * </ul>
+ * </td><td>
  * <ul>
  *   <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultCitation Citation}<ul>
  *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultCitationDate Citation date}<ul>
@@ -44,6 +66,7 @@
  *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultSeries Series}</li>
  *   </ul></li>
  * </ul>
+ * </td></tr></table>
  *
  * {@section Unified identifiers view}
  * Apache SIS provides a unified view of all metadata identifiers. This view includes the citation

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1463487&r1=1463486&r2=1463487&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] Tue Apr  2 11:18:30 2013
@@ -38,7 +38,7 @@
  *     <li>{@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList Feature type list}</li>
  *     <li>{@linkplain org.apache.sis.metadata.iso.DefaultIdentifier Identifier}</li>
  *   </ul></li>
- *   <li>{@linkplain org.geoapi.util.CodeList}<ul>
+ *   <li>{@linkplain org.opengis.util.CodeList}<ul>
  *     <li>{@linkplain org.opengis.metadata.Datatype Data type}</li>
  *     <li>{@linkplain org.opengis.metadata.Obligation Obligation}</li>
  *   </ul></li>