sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1463494 - 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
Date Tue, 02 Apr 2013 11:44:25 GMT
Author: desruisseaux
Date: Tue Apr  2 11:44:25 2013
New Revision: 1463494

URL: http://svn.apache.org/r1463494
Log:
More class/aggregation hierarchy javadoc.

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=1463494&r1=1463493&r2=1463494&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:44:25 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.opengis.util.CodeList}<ul>
+ *   <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>

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=1463494&r1=1463493&r2=1463494&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:44:25 2013
@@ -39,7 +39,7 @@
  *     <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.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>

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=1463494&r1=1463493&r2=1463494&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 11:44:25 2013
@@ -24,6 +24,33 @@
  * 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>.
  *
+ * <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>
+ * </td></tr></table>
+ *
  * {@section Collections and null values}
  * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code
null} argument.
  * A null argument value means that the metadata element can not be provided, and the reason
for that is unspecified.

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=1463494&r1=1463493&r2=1463494&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 11:44:25 2013
@@ -24,6 +24,49 @@
  * 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>.
  *
+ * <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.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>
+ * </td></tr></table>
+ *
  * {@section Bands in gridded data}
  * ISO 19115 defines a {@link org.opengis.metadata.content.Band} interface
  * which expresses the range of wavelengths in the electromagnetic spectrum.

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=1463494&r1=1463493&r2=1463494&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:44:25 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.opengis.util.CodeList}<ul>
+ *   <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>



Mime
View raw message