You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/04/02 16:48:37 UTC

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

Author: desruisseaux
Date: Tue Apr  2 14:48:37 2013
New Revision: 1463572

URL: http://svn.apache.org/r1463572
Log:
Javadoc reformating: write the hierarchical and aggretation trees manually.

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/constraint/package-info.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/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=1463572&r1=1463571&r2=1463572&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 14:48:37 2013
@@ -26,61 +26,47 @@
  *
  * <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.opengis.util.CodeList Code list}<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>
- *       <li>{@linkplain org.opengis.metadata.acquisition.ObjectiveType Objective type} (a code list)</li>
- *       <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatformPass PlatformPass}<ul>
- *         <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEvent Event}<ul>
- *           <li>{@linkplain org.opengis.metadata.acquisition.Trigger Trigger} (a code list)</li>
- *           <li>{@linkplain org.opengis.metadata.acquisition.Context Context} (a code list)</li>
- *           <li>{@linkplain org.opengis.metadata.acquisition.Sequence Sequence} (a code list)</li>
- *         </ul></li>
- *       </ul></li>
- *     </ul></li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequirement Requirement}<ul>
- *       <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequestedDate Requested date}</li>
- *       <li>{@linkplain org.opengis.metadata.acquisition.Priority Priority} (a code list)</li>
- *     </ul></li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlan Plan}<ul>
- *       <li>{@linkplain org.opengis.metadata.acquisition.GeometryType Geometry type} (a code list)</li>
- *       <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultOperation Operation}<ul>
- *         <li>{@linkplain org.opengis.metadata.acquisition.OperationType Operation type} (a code list)</li>
- *         <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatform Platform}<ul>
- *           <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultInstrument Instrument}</li>
- *         </ul></li>
- *       </ul></li>
- *     </ul></li>
- *   </ul></li>
- *   <li>{@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord Environmental record}</li>
- * </ul>
+ *   <th class="sep">Aggregation hierarchy</th>
+ * </tr><tr><td nowrap>
+ * {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultAcquisitionInformation Acquisition information}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultObjective Objective}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatformPass PlatformPass}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEvent Event}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequirement Requirement}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequestedDate Requested date}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlan Plan}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultOperation Operation}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatform Platform}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultInstrument Instrument}<br>
+ * {@code  └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord Environmental record}<br>
+ * {@linkplain org.opengis.util.CodeList Code list}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.acquisition.ObjectiveType Objective type}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.acquisition.Trigger Trigger}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.acquisition.Context Context}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.acquisition.Sequence Sequence}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.acquisition.Priority Priority}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.acquisition.GeometryType Geometry type}<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.acquisition.OperationType Operation type}<br>
+ * </td><td class="sep" nowrap>
+ * {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultAcquisitionInformation Acquisition information}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultObjective Objective}<br>
+ * {@code  │   ├─} {@linkplain org.opengis.metadata.acquisition.ObjectiveType Objective type} (a code list)<br>
+ * {@code  │   ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatformPass PlatformPass}<br>
+ * {@code  │   │   └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEvent Event}<br>
+ * {@code  │   │       ├─} {@linkplain org.opengis.metadata.acquisition.Trigger Trigger} (a code list)<br>
+ * {@code  │   │       ├─} {@linkplain org.opengis.metadata.acquisition.Context Context} (a code list)<br>
+ * {@code  │   │       └─} {@linkplain org.opengis.metadata.acquisition.Sequence Sequence} (a code list)<br>
+ * {@code  │   ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequirement Requirement}<br>
+ * {@code  │   │   ├─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequestedDate Requested date}<br>
+ * {@code  │   │   └─} {@linkplain org.opengis.metadata.acquisition.Priority Priority} (a code list)<br>
+ * {@code  │   └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlan Plan}<br>
+ * {@code  │       ├─} {@linkplain org.opengis.metadata.acquisition.GeometryType Geometry type} (a code list)<br>
+ * {@code  │       └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultOperation Operation}<br>
+ * {@code  │           ├─} {@linkplain org.opengis.metadata.acquisition.OperationType Operation type} (a code list)<br>
+ * {@code  │           └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatform Platform}<br>
+ * {@code  │               └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultInstrument Instrument}<br>
+ * {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord Environmental record}<br>
  * </td></tr></table>
  *
  * {@section Collections and null values}

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=1463572&r1=1463571&r2=1463572&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 14:48:37 2013
@@ -26,46 +26,35 @@
  *
  * <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 Code list}<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>
- *       <li>{@linkplain org.opengis.metadata.citation.DateType Date type} (a code list)</li>
- *     </ul></li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultResponsibleParty Responsible party}<ul>
- *       <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultContact Contact}<ul>
- *         <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}<ul>
- *           <li>{@linkplain org.opengis.metadata.citation.OnLineFunction Online function} (a code list)</li>
- *         </ul></li>
- *       </ul></li>
- *       <li>{@linkplain org.opengis.metadata.citation.Role Role} (a code list)</li>
- *     </ul></li>
- *     <li>{@linkplain org.opengis.metadata.citation.PresentationForm Presentation form} (a code list)</li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.citation.DefaultSeries Series}</li>
- *   </ul></li>
- * </ul>
+ *   <th class="sep">Aggregation hierarchy</th>
+ * </tr><tr><td nowrap>
+ * {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitation Citation}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitationDate Citation date}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultResponsibleParty Responsible party}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultContact Contact}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultTelephone Telephone}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultAddress Address}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultOnlineResource Online resource}<br>
+ * {@code  └─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultSeries Series}<br>
+ * {@linkplain org.opengis.util.CodeList Code list}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.citation.DateType Date type}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.citation.OnLineFunction Online function}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.citation.PresentationForm Presentation form}<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.citation.Role Role}<br>
+ * </td><td class="sep" nowrap>
+ * {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitation Citation}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitationDate Citation date}<br>
+ * {@code  │   └─} {@linkplain org.opengis.metadata.citation.DateType Date type} (a code list)<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultResponsibleParty Responsible party}<br>
+ * {@code  │   ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultContact Contact}<br>
+ * {@code  │   │   ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultTelephone Telephone}<br>
+ * {@code  │   │   ├─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultAddress Address}<br>
+ * {@code  │   │   └─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultOnlineResource Online resource}<br>
+ * {@code  │   │       └─} {@linkplain org.opengis.metadata.citation.OnLineFunction Online function} (a code list)<br>
+ * {@code  │   └─} {@linkplain org.opengis.metadata.citation.Role Role} (a code list)<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.citation.PresentationForm Presentation form} (a code list)<br>
+ * {@code  └─} {@linkplain org.apache.sis.metadata.iso.citation.DefaultSeries Series}<br>
  * </td></tr></table>
  *
  * {@section Unified identifiers view}

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java?rev=1463572&r1=1463571&r2=1463572&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java [UTF-8] Tue Apr  2 14:48:37 2013
@@ -26,29 +26,21 @@
  *
  * <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.constraint.DefaultConstraints Constraints}<ul>
- *       <li>{@linkplain org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints Legal constraints}</li>
- *       <li>{@linkplain org.apache.sis.metadata.iso.constraint.DefaultSecurityConstraints Security constraints}</li>
- *     </ul></li>
- *   </ul></li>
- *   <li>{@linkplain org.opengis.util.CodeList Code list}<ul>
- *     <li>{@linkplain org.opengis.metadata.constraints.Restriction Restriction}</li>
- *     <li>{@linkplain org.opengis.metadata.constraints.Classification Classification}</li>
- *   </ul></li>
- * </ul>
- * </td><td>
- * <ul>
- *   <li>{@linkplain org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints Legal constraints}<ul>
- *     <li>{@linkplain org.opengis.metadata.constraints.Restriction Restriction} (a code list)</li>
- *   </ul></li>
- *   <li>{@linkplain org.apache.sis.metadata.iso.constraint.DefaultSecurityConstraints Security constraints}<ul>
- *     <li>{@linkplain org.opengis.metadata.constraints.Classification Classification} (a code list)</li>
- *   </ul></li>
- * </ul>
+ *   <th clas="sep">Aggregation hierarchy</th>
+ * </tr><tr><td class="sep" nowrap>
+ * {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
+ * {@code  └─} {@linkplain org.apache.sis.metadata.iso.constraint.DefaultConstraints Constraints}<br>
+ * {@code      ├─} {@linkplain org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints Legal constraints}<br>
+ * {@code      └─} {@linkplain org.apache.sis.metadata.iso.constraint.DefaultSecurityConstraints Security constraints}<br>
+ * {@linkplain org.opengis.util.CodeList Code list}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.constraints.Restriction Restriction}<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.constraints.Classification Classification}<br>
+ * </td><td class="sep" nowrap>
+ * {@linkplain org.apache.sis.metadata.iso.constraint.DefaultConstraints Constraints}<br>
+ * {@linkplain org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints Legal constraints}<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.constraints.Restriction Restriction} (a code list)<br>
+ * {@linkplain org.apache.sis.metadata.iso.constraint.DefaultSecurityConstraints Security constraints}<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.constraints.Classification Classification} (a code list)<br>
  * </td></tr></table>
  *
  * {@section Collections and null values}

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java?rev=1463572&r1=1463571&r2=1463572&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] Tue Apr  2 14:48:37 2013
@@ -26,45 +26,35 @@
  *
  * <table class="sis"><tr>
  *   <th>Class hierarchy</th>
- *   <th>Aggregation hierarchy</th>
+ *   <th class="sep">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.content.AbstractContentInformation Content information}<ul>
- *       <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultFeatureCatalogueDescription Feature catalogue description}</li>
- *       <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultCoverageDescription Coverage description}<ul>
- *         <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultImageDescription Image description}</li>
- *       </ul></li>
- *     </ul></li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultRangeDimension Range dimension}<ul>
- *       <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultBand Band</li>
- *     </ul></li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultRangeElementDescription Range element description}</li>
- *   </ul></li>
- *   <li>{@linkplain org.opengis.util.CodeList Code list}<ul>
- *     <li>{@linkplain org.opengis.metadata.content.BandDefinition Band definition}</li>
- *     <li>{@linkplain org.opengis.metadata.content.CoverageContentType Coverage content type}</li>
- *     <li>{@linkplain org.opengis.metadata.content.ImagingCondition Imaging condition}</li>
- *     <li>{@linkplain org.opengis.metadata.content.PolarizationOrientation Polarization orientation}</li>
- *     <li>{@linkplain org.opengis.metadata.content.TransferFunctionType Transfer function type}</li>
- *   </ul></li>
- * </ul>
- * </td><td>
- * <ul>
- *   <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultCoverageDescription Coverage description}<ul>
- *     <li>{@linkplain org.opengis.metadata.content.CoverageContentType Coverage content type} (a code list)</li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultRangeDimension Range dimension}</li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultRangeElementDescription Range element description}</li>
- *   </ul></li>
- *   <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultBand Band<ul>
- *     <li>{@linkplain org.opengis.metadata.content.BandDefinition Band definition} (a code list)</li>
- *     <li>{@linkplain org.opengis.metadata.content.PolarizationOrientation Polarization orientation}} (a code list)</li>
- *     <li>{@linkplain org.opengis.metadata.content.TransferFunctionType Transfer function type}} (a code list)</li>
- *   </ul></li>
- *   <li>{@linkplain org.apache.sis.metadata.iso.content.DefaultImageDescription Image description}<ul>
- *     <li>{@linkplain org.opengis.metadata.content.ImagingCondition Imaging condition} (a code list)</li>
- *   </ul></li>
- * </ul>
+ * {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.content.AbstractContentInformation Content information}<br>
+ * {@code  │   ├─} {@linkplain org.apache.sis.metadata.iso.content.DefaultFeatureCatalogueDescription Feature catalogue description}<br>
+ * {@code  │   └─} {@linkplain org.apache.sis.metadata.iso.content.DefaultCoverageDescription Coverage description}<br>
+ * {@code  │       └─} {@linkplain org.apache.sis.metadata.iso.content.DefaultImageDescription Image description}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.content.DefaultRangeDimension Range dimension}<br>
+ * {@code  │   └─} {@linkplain org.apache.sis.metadata.iso.content.DefaultBand Band}<br>
+ * {@code  └─} {@linkplain org.apache.sis.metadata.iso.content.DefaultRangeElementDescription Range element description}<br>
+ * {@linkplain org.opengis.util.CodeList Code list}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.content.BandDefinition Band definition}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.content.CoverageContentType Coverage content type}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.content.ImagingCondition Imaging condition}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.content.PolarizationOrientation Polarization orientation}<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.content.TransferFunctionType Transfer function type}<br>
+ * </td><td class="sep">
+ * {@linkplain org.apache.sis.metadata.iso.content.AbstractContentInformation Content information}<br>
+ * {@linkplain org.apache.sis.metadata.iso.content.DefaultFeatureCatalogueDescription Feature catalogue description}<br>
+ * {@linkplain org.apache.sis.metadata.iso.content.DefaultCoverageDescription Coverage description}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.content.CoverageContentType Coverage content type} (a code list)<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.content.DefaultRangeDimension Range dimension}<br>
+ * {@code  └─} {@linkplain org.apache.sis.metadata.iso.content.DefaultRangeElementDescription Range element description}<br>
+ * {@linkplain org.apache.sis.metadata.iso.content.DefaultBand Band}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.content.BandDefinition Band definition} (a code list)<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.content.PolarizationOrientation Polarization orientation} (a code list)<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.content.TransferFunctionType Transfer function type}} (a code list)<br>
+ * {@linkplain org.apache.sis.metadata.iso.content.DefaultImageDescription Image description}<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.content.ImagingCondition Imaging condition} (a code list)<br>
  * </td></tr></table>
  *
  * {@section Bands in gridded data}

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=1463572&r1=1463571&r2=1463572&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 14:48:37 2013
@@ -26,38 +26,29 @@
  *
  * <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.opengis.util.CodeList Code list}<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>
- *     <li>{@linkplain org.apache.sis.metadata.iso.DefaultApplicationSchemaInformation Application schema information}</li>
- *     <li>{@linkplain org.apache.sis.metadata.iso.DefaultMetadataExtensionInformation Metadata extension information}<ul>
- *       <li>{@linkplain org.apache.sis.metadata.iso.DefaultExtendedElementInformation Extended element information}<ul>
- *         <li>{@linkplain org.opengis.metadata.Datatype Data type} (a code list)</li>
- *         <li>{@linkplain org.opengis.metadata.Obligation Obligation} (a code list)</li>
- *       </ul></li>
- *     </ul></li>
- *   </ul></li>
- *   <li>{@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList Feature type list}</li>
- *   <li>{@linkplain org.apache.sis.metadata.iso.DefaultIdentifier Identifier}</li>
- * </ul>
+ *   <th class="sep">Aggregation hierarchy</th>
+ * </tr><tr><td nowrap>
+ * {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultMetadata Metadata}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultPortrayalCatalogueReference Portrayal catalogue reference}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultApplicationSchemaInformation Application schema information}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultMetadataExtensionInformation Metadata extension information}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultExtendedElementInformation Extended element information}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList Feature type list}<br>
+ * {@code  └─} {@linkplain org.apache.sis.metadata.iso.DefaultIdentifier Identifier}<br>
+ * {@linkplain org.opengis.util.CodeList Code list}<br>
+ * {@code  ├─} {@linkplain org.opengis.metadata.Datatype Data type}<br>
+ * {@code  └─} {@linkplain org.opengis.metadata.Obligation Obligation}
+ * </td><td class="sep" nowrap>
+ * {@linkplain org.apache.sis.metadata.iso.DefaultMetadata Metadata}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultPortrayalCatalogueReference Portrayal catalogue reference}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultApplicationSchemaInformation Application schema information}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultMetadataExtensionInformation Metadata extension information}<br>
+ * {@code  │   └─} {@linkplain org.apache.sis.metadata.iso.DefaultExtendedElementInformation Extended element information}<br>
+ * {@code  │       ├─} {@linkplain org.opengis.metadata.Datatype Data type} (a code list)<br>
+ * {@code  │       └─} {@linkplain org.opengis.metadata.Obligation Obligation} (a code list)<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList Feature type list}<br>
+ * {@code  └─} {@linkplain org.apache.sis.metadata.iso.DefaultIdentifier Identifier}
  * </td></tr></table>
  *
  * {@section Localization}