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/09 17:26:25 UTC
svn commit: r1466079 - in
/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso:
constraint/DefaultLegalConstraints.java distribution/package-info.java
identification/package-info.java lineage/package-info.java
Author: desruisseaux
Date: Tue Apr 9 15:26:24 2013
New Revision: 1466079
URL: http://svn.apache.org/r1466079
Log:
Minor javadoc corrections.
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java?rev=1466079&r1=1466078&r2=1466079&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java [UTF-8] Tue Apr 9 15:26:24 2013
@@ -27,6 +27,9 @@ import org.opengis.metadata.constraint.L
/**
* Restrictions and legal prerequisites for accessing and using the resource.
+ * The {@linkplain #getOtherConstraints() other constraint} element shall be non-empty only if
+ * {@linkplain #getAccessConstraints() access constraints} and/or {@linkplain #getUseConstraints()
+ * use constraints} elements have a value of {@link Restriction#OTHER_RESTRICTIONS}.
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java?rev=1466079&r1=1466078&r2=1466079&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] Tue Apr 9 15:26:24 2013
@@ -37,8 +37,8 @@
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDigitalTransferOptions Digital transfer options}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDataFile Data file}<br>
* {@linkplain org.opengis.util.CodeList Code list}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.distribution.MediumName Medium name}</br>
- * {@code └─} {@linkplain org.opengis.metadata.distribution.MediumFormat Medium format}</br>
+ * {@code ├─} {@linkplain org.opengis.metadata.distribution.MediumName Medium name}<br>
+ * {@code └─} {@linkplain org.opengis.metadata.distribution.MediumFormat Medium format}<br>
* </td><td class="sep" width="50%" nowrap>
* {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDistribution Distribution}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultFormat Format}<br>
@@ -46,8 +46,8 @@
* {@code │ └─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultStandardOrderProcess Standard order process}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDigitalTransferOptions Digital transfer options}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultMedium Medium}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.distribution.MediumName Medium name} «code list»</br>
- * {@code └─} {@linkplain org.opengis.metadata.distribution.MediumFormat Medium format} «code list»</br>
+ * {@code ├─} {@linkplain org.opengis.metadata.distribution.MediumName Medium name} «code list»<br>
+ * {@code └─} {@linkplain org.opengis.metadata.distribution.MediumFormat Medium format} «code list»<br>
* {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDataFile Data file}<br>
* </td></tr></table>
*
Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1466079&r1=1466078&r2=1466079&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Tue Apr 9 15:26:24 2013
@@ -45,7 +45,7 @@
* {@code ├─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category}<br>
* {@code └─} {@linkplain org.opengis.metadata.identification.CharacterSet Character set}<br>
* </td><td class="sep" width="50%" nowrap>
- * {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
+ * {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.Progress Progress} «code list»<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic Browse graphic}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultKeywords Keywords}<br>
Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java?rev=1466079&r1=1466078&r2=1466079&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] Tue Apr 9 15:26:24 2013
@@ -38,9 +38,10 @@
* {@code └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessStepReport Process step report}<br>
* </td><td class="sep" width="50%" nowrap>
* {@linkplain org.apache.sis.metadata.iso.lineage.DefaultLineage Lineage}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultSource Source}<br>
+ * {@code │ └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultNominalResolution Nominal resolution}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessStep Process step}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultSource Source}<br>
- * {@code │ └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultNominalResolution Nominal resolution}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessing Processing}<br>
* {@code │ └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultAlgorithm Algorithm}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessStepReport Process step report}<br>