Author: desruisseaux
Date: Tue Apr 2 11:02:54 2013
New Revision: 1463480
URL: http://svn.apache.org/r1463480
Log:
Javadoc: complete the package description with summary of the class hierarchy.
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/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=1463480&r1=1463479&r2=1463480&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:02:54 2013
@@ -24,7 +24,35 @@
* 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.acquisition.DefaultAcquisitionInformation
Acquisition information}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultObjective Objective}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultPlatformPass PlatformPass}</li>
+ * <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEvent
Event}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultRequirement Requirement}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultRequestedDate Requested
date}</li>
+ * <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlan
Plan}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultOperation Operation}</li>
+ * <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatform
Platform}</li>
+ * <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.metadata.acquisition.ObjectiveType
Objective type}</li>
+ * <li>{@linkplain org.opengis.metadata.acquisition.Trigger Trigger}</li>
+ * <li>{@linkplain org.opengis.metadata.acquisition.Context Context}</li>
+ * <li>{@linkplain org.opengis.metadata.acquisition.Sequence Sequence}</li>
+ * <li>{@linkplain org.opengis.metadata.acquisition.Priority Priority}</li>
+ * <li>{@linkplain org.opengis.metadata.acquisition.GeometryType Geometry
type}</li>
+ * <li>{@linkplain org.opengis.metadata.acquisition.OperationType
Operation type}</li>
+ * </ul></li>
+ * </ul>
+ * </td><td>
* <ul>
* <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultAcquisitionInformation
Acquisition information}<ul>
* <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultObjective Objective}<ul>
@@ -51,8 +79,9 @@
* </ul></li>
* </ul></li>
* </ul></li>
- * <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord
Environmental record} (<i>used in</i> acquisition information)</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord
Environmental record}</li>
* </ul>
+ * </td></tr></table>
*
* {@section Collections and null values}
* Unless otherwise noted in the Javadoc, all constructors and setter methods
accept {@code null} argument.
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=1463480&r1=1463479&r2=1463480&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:02:54 2013
@@ -24,7 +24,26 @@
* 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.DefaultMetadata
Metadata}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.DefaultPortrayalCatalogueReference Portrayal
catalogue reference}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.DefaultApplicationSchemaInformation Application
schema information}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.DefaultMetadataExtensionInformation Metadata
extension information}</li>
+ * <li>{@linkplain
org.apache.sis.metadata.iso.DefaultExtendedElementInformation Extended element
information}</li>
+ * <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.metadata.Datatype Data type}</li>
+ * <li>{@linkplain org.opengis.metadata.Obligation Obligation}</li>
+ * </ul></li>
+ * </ul>
+ * </td><td>
* <ul>
* <li>{@linkplain org.apache.sis.metadata.iso.DefaultMetadata Metadata}<ul>
* <li>{@linkplain
org.apache.sis.metadata.iso.DefaultPortrayalCatalogueReference Portrayal
catalogue reference}</li>
@@ -39,6 +58,7 @@
* <li>{@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList
Feature type list}</li>
* <li>{@linkplain org.apache.sis.metadata.iso.DefaultIdentifier
Identifier}</li>
* </ul>
+ * </td></tr></table>
*
* {@section Localization}
* When a metadata object is marshalled as an ISO 19139 compliant XML
document, the marshaller