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 2014/04/18 07:14:07 UTC
svn commit: r1588414 [1/3] - in /sis/branches/JDK7: ./
application/sis-console/src/main/java/org/apache/sis/console/
application/sis-webapp/
core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/
core/sis-feature/src/main/java/org/apache/s...
Author: desruisseaux
Date: Fri Apr 18 05:14:04 2014
New Revision: 1588414
URL: http://svn.apache.org/r1588414
Log:
Merge from the JDK8 branch.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java
sis/branches/JDK7/application/sis-webapp/pom.xml
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/package-info.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/package-info.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DaemonThread.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshalContext.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
sis/branches/JDK7/pom.xml
sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/FrenchProfile.java
sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/package-info.java
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/branches/JDK8:r1587365-1588413
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -29,9 +29,9 @@ import org.apache.sis.util.logging.Monol
/**
- * Command line interface for Apache SIS. The {@link #main(String[])} method accepts the following commands:
+ * Command line interface for Apache SIS. The {@link #main(String[])} method accepts the following actions:
*
- * <blockquote><table class="compact">
+ * <blockquote><table class="compact" summary="Supported command-line actions.">
* <tr><td>{@code help} </td><td>Show a help overview.</td></tr>
* <tr><td>{@code about} </td><td>Show information about Apache SIS and system configuration.</td></tr>
* <tr><td>{@code mime-type}</td><td>Show MIME type for the given file.</td></tr>
@@ -40,7 +40,7 @@ import org.apache.sis.util.logging.Monol
*
* Each command can accepts an arbitrary amount of the following options:
*
- * <blockquote><table class="compact">
+ * <blockquote><table class="compact" summary="Supported command-line options.">
* <tr><td>{@code --format} </td><td>The output format: {@code xml}, {@code wkt}, {@code wkt1} or {@code text}.</td></tr>
* <tr><td>{@code --locale} </td><td>The locale to use for the command output.</td></tr>
* <tr><td>{@code --timezone} </td><td>The timezone for the dates to be formatted.</td></tr>
Modified: sis/branches/JDK7/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/pom.xml?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK7/application/sis-webapp/pom.xml Fri Apr 18 05:14:04 2014
@@ -63,7 +63,7 @@
<executions>
<execution>
<id>reserve-ports</id>
- <phase>initialize</phase>
+ <phase>pre-integration-test</phase>
<goals>
<goal>reserve-network-port</goal>
</goals>
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -27,7 +27,8 @@ import com.sun.tools.doclets.formats.htm
* This tag shall contain a keyword, for example <code>{@scmUrl metadata}</code>.
* Valid keywords are:
*
- * <table class="sis>
+ * <table class="sis">
+ * <caption>Recognized keywords</caption>
* <tr><th>Keyword</th> <th>path</th></tr>
* <tr><td>metadata</td> <td>core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso</td></tr>
* <tr><td>referencing</td> <td>core/sis-referencing/src/test/resources/org/apache/sis/referencing</td></tr>
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -122,6 +122,7 @@ public class AbstractIdentifiedType impl
* Other properties listed in the table below are optional.
*
* <table class="sis">
+ * <caption>Recognized properties</caption>
* <tr>
* <th>Property name</th>
* <th>Value type</th>
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -100,6 +100,7 @@ public class DefaultAttributeType<T> ext
* The following table is a reminder of main (not all) properties:
*
* <table class="sis">
+ * <caption>Recognized properties (non exhaustive list)</caption>
* <tr>
* <th>Property name</th>
* <th>Value type</th>
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -70,6 +70,7 @@ public class DefaultFeatureType extends
* The following table is a reminder of main (not all) properties:
*
* <table class="sis">
+ * <caption>Recognized properties (non exhaustive list)</caption>
* <tr>
* <th>Property name</th>
* <th>Value type</th>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -59,7 +59,7 @@ public final class DateAdapter extends X
* the value. JAXB calls automatically this method at unmarshalling time.
*
* @param value The XML date, or {@code null}.
- * @return The {@code java.util} date, or {@code null.
+ * @return The {@code java.util} date, or {@code null}.
*/
@Override
public Date unmarshal(final XMLGregorianCalendar value) {
@@ -70,8 +70,8 @@ public final class DateAdapter extends X
* Converts the date to the object to be marshalled in a XML file or stream.
* JAXB calls automatically this method at marshalling time.
*
- * @param value The {@code java.util} date value, or {@code null.
- * @return The XML date, or {@code null.
+ * @param value The {@code java.util} date value, or {@code null}.
+ * @return The XML date, or {@code null}.
*/
@Override
public XMLGregorianCalendar marshal(final Date value) {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -59,7 +59,7 @@ public final class UniversalTimeAdapter
* the value. JAXB calls automatically this method at unmarshalling time.
*
* @param value The XML date, or {@code null}.
- * @return The {@code java.util} date, or {@code null.
+ * @return The {@code java.util} date, or {@code null}.
*/
@Override
public Date unmarshal(final XMLGregorianCalendar value) {
@@ -70,8 +70,8 @@ public final class UniversalTimeAdapter
* Converts the date to the object to be marshalled in a XML file or stream.
* JAXB calls automatically this method at marshalling time.
*
- * @param value The {@code java.util} date value, or {@code null.
- * @return The XML date, or {@code null.
+ * @param value The {@code java.util} date value, or {@code null}.
+ * @return The XML date, or {@code null}.
*/
@Override
public XMLGregorianCalendar marshal(final Date value) {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -212,6 +212,8 @@ public class Colors implements Cloneable
/**
* Replaces the deserialized instance by {@link #DEFAULT} one if possible.
+ *
+ * @return The object to use after deserialization.
*/
final Object readResolve() {
return isImmutable && map.equals(DEFAULT.map) ? DEFAULT : this;
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -112,6 +112,7 @@ public enum Convention {
* as shown in the following table:
*
* <table class="sis">
+ * <caption>Geocentric axis directions</caption>
* <tr><th>ISO 19111</th> <th>OGC 01-009</th> <th>Description</th></tr>
* <tr><td>Geocentric X</td> <td>Other</td> <td>Toward prime meridian</td></tr>
* <tr><td>Geocentric Y</td> <td>Easting</td> <td>Toward 90°E longitude</td></tr>
@@ -236,6 +237,7 @@ public enum Convention {
* The following table shows the names given by various organizations or projects for the same projection:
*
* <table class="sis">
+ * <caption>Map projection name examples</caption>
* <tr><th>Authority</th> <th>Projection name</th></tr>
* <tr><td>EPSG</td> <td>Mercator (variant A)</td></tr>
* <tr><td>OGC</td> <td>Mercator_1SP</td></tr>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -127,6 +127,7 @@ public enum ElementKind {
* The current implementation defines the following associations:
*
* <table class="sis">
+ * <caption>Mapping from Java type to WKT element</caption>
* <tr><th>Base type</th> <th>Kind</th></tr>
* <tr><td>{@link Datum}</td> <td>{@link #DATUM}</td></tr>
* <tr><td>{@link OperationMethod}</td> <td>{@link #METHOD}</td></tr>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -259,7 +259,7 @@ public class Formatter implements Locali
* {@code true} if we are in the process of formatting the optional complementary attributes.
* Those attributes are {@code SCOPE}, {@code AREA}, {@code BBOX}, {@code VERTICALEXTENT}, {@code TIMEEXTENT},
* {@code ID} (previously known as {@code AUTHORITY}) and {@code REMARKS}, and have a special treatment: they
- * are written by {@link #append(FormattableObject))} after the {@code formatTo(Formatter)} method returned.
+ * are written by {@link #append(FormattableObject)} after the {@code formatTo(Formatter)} method returned.
*
* @see #appendComplement(IdentifiedObject, boolean)
*/
@@ -522,6 +522,7 @@ public class Formatter implements Locali
* </ul>
*
* <blockquote><table class="sis">
+ * <caption>Complementary WKT elements</caption>
* <tr><th>WKT 2 element</th><th>WKT 1 element</th><th>For types</th></tr>
* <tr><td>{@code Anchor[…]}</td> <td></td> <td>{@link Datum}</td></tr>
* <tr><td>{@code Scope[…]}</td> <td></td> <td>{@link ReferenceSystem}, {@link Datum}, {@link CoordinateOperation}</td></tr>
@@ -611,7 +612,7 @@ public class Formatter implements Locali
* Appends the optional complementary attributes common to many {@link IdentifiedObject} subtypes.
* Those attributes are {@code ANCHOR}, {@code SCOPE}, {@code AREA}, {@code BBOX}, {@code VERTICALEXTENT},
* {@code TIMEEXTENT}, {@code ID} (previously known as {@code AUTHORITY}) and {@code REMARKS},
- * and have a special treatment: they are written by {@link #append(FormattableObject))}
+ * and have a special treatment: they are written by {@link #append(FormattableObject)}
* after the {@code formatTo(Formatter)} method returned.
*
* <p>The {@code ID[<name>,<code>,…]} element is written only for the root element, unless the convention are
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,12 +24,13 @@ package org.apache.sis.io.wkt;
* because WKT 2 has more keywords made by combination of words. Examples:
*
* <table class="sis">
+ * <caption>WKT element case comparisons</caption>
* <tr><th>Upper case</th> <th>Camel case</th></tr>
- * <tr><td>{@code TIMEEXTENT}</td> <td>{@code TimeExtent}</td></td>
- * <tr><td>{@code ANGLEUNIT}</td> <td>{@code AngleUnit}</td></td>
- * <tr><td>{@code BASEGEODCRS}</td> <td>{@code BaseGeodCRS}</td></td>
- * <tr><td>{@code DERIVINGCONVERSION}</td> <td>{@code DerivingConversion}</td></td>
- * <tr><td>{@code ENGINEERINGDATUM}</td> <td>{@code EngineeringDatum}</td></td>
+ * <tr><td>{@code TIMEEXTENT}</td> <td>{@code TimeExtent}</td></tr>
+ * <tr><td>{@code ANGLEUNIT}</td> <td>{@code AngleUnit}</td></tr>
+ * <tr><td>{@code BASEGEODCRS}</td> <td>{@code BaseGeodCRS}</td></tr>
+ * <tr><td>{@code DERIVINGCONVERSION}</td> <td>{@code DerivingConversion}</td></tr>
+ * <tr><td>{@code ENGINEERINGDATUM}</td> <td>{@code EngineeringDatum}</td></tr>
* </table>
*
* <div class="note"><b>Note:</b>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -32,7 +32,7 @@ import static org.apache.sis.util.Argume
* The two constants defined in this class, namely {@link #SQUARE_BRACKETS} and {@link #CURLY_BRACKETS},
* define the symbols for ISO 19162 compliant WKT formatting. Their properties are:
*
- * <blockquote><table class="compact">
+ * <blockquote><table class="compact" summary="Standard WKT symbols.">
* <tr>
* <td>Locale for number format:</td>
* <td>{@link Locale#ROOT}</td>
@@ -41,14 +41,14 @@ import static org.apache.sis.util.Argume
* <tr>
* <td>Bracket symbols:</td>
* <td>{@code [}…{@code ]} or {@code (}…{@code )}</td>
- * <td><font size="-1"><b>Note:</b> the {@code […]} brackets are common in referencing WKT,
- * while the {@code (…)} brackets are common in geometry WKT.</font></td>
+ * <td><span style="font-size: small"><b>Note:</b> the {@code […]} brackets are common in referencing WKT,
+ * while the {@code (…)} brackets are common in geometry WKT.</span></td>
* </tr>
* <tr>
* <td>Quote symbols:</td>
* <td>{@code "}…{@code "}</td>
- * <td><font size="-1"><b>Note:</b> Apache SIS accepts also {@code “…”} quotes for more readable
- * {@code String} literals in Java code, but this is non-standard.</font></td>
+ * <td><span style="font-size: small"><b>Note:</b> Apache SIS accepts also {@code “…”} quotes
+ * for more readable {@code String} literals in Java code, but this is non-standard.</span></td>
* </tr>
* <tr>
* <td>Sequence symbols:</td>
@@ -679,6 +679,8 @@ public class Symbols implements Localize
/**
* Invoked on deserialization for replacing the deserialized instance by the constant instance.
* This method also opportunistically recompute the {@link #quote} field if no replacement is done.
+ *
+ * @return The object to use after deserialization.
*/
final Object readResolve() {
if (isImmutable) {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -286,6 +286,7 @@ public class WKTFormat extends CompoundF
* The following table shows the names given by various organizations or projects for the same projection:
*
* <table class="sis">
+ * <caption>Projection name examples</caption>
* <tr><th>Authority</th> <th>Projection name</th></tr>
* <tr><td>EPSG</td> <td>Mercator (variant A)</td></tr>
* <tr><td>OGC</td> <td>Mercator_1SP</td></tr>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -44,6 +44,7 @@ import org.apache.sis.util.logging.Loggi
* metadata does not support the operation. Those methods are:
*
* <table class="sis">
+ * <caption>Metadata operations</caption>
* <tr>
* <th>Read-only operations</th>
* <th class="sep">Read/write operations</th>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -836,6 +836,10 @@ public class MetadataStandard implements
/**
* Invoked during deserialization for restoring the transient fields.
+ *
+ * @param in The input stream from which to deserialize a metadata standard.
+ * @throws IOException If an I/O error occurred while reading or if the stream contains invalid data.
+ * @throws ClassNotFoundException If the class serialized on the stream is not on the classpath.
*/
private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -125,12 +125,9 @@ public abstract class ModifiableMetadata
* Returns {@code true} if this metadata is modifiable. This method returns
* {@code false} if {@link #freeze()} has been invoked on this object.
*
- * <table width="80%" align="center" cellpadding="18" border="4" bgcolor="#FFE0B0">
- * <tr><td>
- * <b>Warning:</b> this method is likely to change. SIS 0.4 will probably uses a "state" enumeration
- * (modifiable, appendable, etc.).
- * </td></tr>
- * </table>
+ * <div class="warning"><b>Warning:</b>
+ * this method is likely to change. Future SIS version will probably uses a "state" enumeration
+ * (modifiable, appendable, etc.).</div>
*
* @return {@code true} if this metadata is modifiable.
*
@@ -169,12 +166,9 @@ public abstract class ModifiableMetadata
* {@linkplain #freeze() freeze} the clone before to return it.</li>
* </ul>
*
- * <table width="80%" align="center" cellpadding="18" border="4" bgcolor="#FFE0B0">
- * <tr><td>
- * <b>Warning:</b> this method is likely to change. SIS 0.4 will probably uses a "state" enumeration
- * (modifiable, appendable, etc.).
- * </td></tr>
- * </table>
+ * <div class="warning"><b>Warning:</b>
+ * this method is likely to change. Future SIS version will probably uses a "state" enumeration
+ * (modifiable, appendable, etc.).</div>
*
* @return An unmodifiable copy of this metadata.
*/
@@ -214,12 +208,9 @@ public abstract class ModifiableMetadata
* <p>Subclasses usually don't need to override this method since the default implementation
* performs its work using Java reflection.</p>
*
- * <table width="80%" align="center" cellpadding="18" border="4" bgcolor="#FFE0B0">
- * <tr><td>
- * <b>Warning:</b> this method is likely to change. SIS 0.4 will probably uses a "state" enumeration
- * (modifiable, appendable, etc.).
- * </td></tr>
- * </table>
+ * <div class="warning"><b>Warning:</b>
+ * this method is likely to change. Future SIS version will probably uses a "state" enumeration
+ * (modifiable, appendable, etc.).</div>
*
* @see #isModifiable()
* @see #checkWritePermission()
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -55,7 +55,7 @@ public enum ValueExistencePolicy {
}
/** Substitutes null or empty collections by a null singleton element
- in order to make the property visible in {@link TreeNode}. */
+ in order to make the property visible in {@code TreeNode}. */
@Override boolean substituteByNullElement(final Collection<?> values) {
return (values == null) || values.isEmpty();
}
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -266,6 +266,7 @@ public class ImmutableIdentifier extends
* Other properties listed in the table below are optional.
*
* <table class="sis">
+ * <caption>Recognized properties</caption>
* <tr>
* <th>Property name</th>
* <th>Value type</th>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: 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>
@@ -48,7 +50,7 @@
* {@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" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: 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} «code list»<br>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -57,7 +57,7 @@ public final class Citations extends Sta
public static final Citation OGC = new SimpleCitation("OGC");
/**
- * The <a href="http://www.ogp.org.uk">International Association of Oil & Gas Producers</a> organization.
+ * The <a href="http://www.ogp.org.uk">International Association of Oil & Gas Producers</a> organization.
* This organization is responsible for maintainance of {@link #EPSG} database.
*
* @see #EPSG
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: 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>
@@ -42,7 +44,7 @@
* {@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" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: 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} «code list»<br>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,23 +24,25 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td class="sep" width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: 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" width="50%" nowrap>
+ * {@code ├─} {@linkplain org.opengis.metadata.constraint.Restriction Restriction}<br>
+ * {@code └─} {@linkplain org.opengis.metadata.constraint.Classification Classification}<br>
+ * </td><td class="sep" style="width: 50%; white-space: 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} «code list»<br>
+ * {@code └─} {@linkplain org.opengis.metadata.constraint.Restriction Restriction} «code list»<br>
* {@linkplain org.apache.sis.metadata.iso.constraint.DefaultSecurityConstraints Security constraints}<br>
- * {@code └─} {@linkplain org.opengis.metadata.constraints.Classification Classification} «code list»<br>
+ * {@code └─} {@linkplain org.opengis.metadata.constraint.Classification Classification} «code list»<br>
* </td></tr></table>
*
* {@section Null values, nil objects and collections}
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.content.AbstractContentInformation Content information} «abstract»<br>
* {@code │ ├─} {@linkplain org.apache.sis.metadata.iso.content.DefaultFeatureCatalogueDescription Feature catalogue description}<br>
@@ -42,7 +44,7 @@
* {@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" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.content.AbstractContentInformation Content information} «abstract»<br>
* {@linkplain org.apache.sis.metadata.iso.content.DefaultFeatureCatalogueDescription Feature catalogue description}<br>
* {@linkplain org.apache.sis.metadata.iso.content.DefaultCoverageDescription Coverage description}<br>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDistribution Distribution}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDistributor Distributor}<br>
@@ -39,7 +41,7 @@
* {@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>
- * </td><td class="sep" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDistribution Distribution}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultFormat Format}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDistributor Distributor}<br>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.extent.DefaultExtent Extent}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.extent.AbstractGeographicExtent Geographic extent} «abstract»<br>
@@ -37,7 +39,7 @@
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.extent.DefaultVerticalExtent Vertical extent}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.extent.DefaultTemporalExtent Temporal extent}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.extent.DefaultSpatialTemporalExtent Spatial temporal extent}<br>
- * </td><td class="sep" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.extent.DefaultExtent Extent}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.extent.AbstractGeographicExtent Geographic extent}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.extent.DefaultVerticalExtent Vertical extent}<br>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
* {@code │ ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultDataIdentification Data identification}<br>
@@ -44,7 +46,7 @@
* {@code ├─} {@linkplain org.opengis.metadata.identification.InitiativeType Initiative type}<br>
* {@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>
+ * </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@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>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultLineage Lineage}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessStep Process step}<br>
@@ -36,7 +38,7 @@
* {@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>
- * </td><td class="sep" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: 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>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,17 +24,19 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.maintenance.DefaultMaintenanceInformation Maintenance information}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.maintenance.DefaultScopeDescription Scope description}<br>
* {@linkplain org.opengis.util.CodeList Code list}<br>
* {@code ├─} {@linkplain org.opengis.metadata.maintenance.MaintenanceFrequency Maintenance frequency}<br>
* {@code └─} {@linkplain org.opengis.metadata.maintenance.ScopeCode Scope code}<br>
- * </td><td class="sep" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.maintenance.DefaultMaintenanceInformation Maintenance information}<br>
* {@code ├─} {@linkplain org.opengis.metadata.maintenance.MaintenanceFrequency Maintenance frequency} «code list»<br>
* {@code ├─} {@linkplain org.opengis.metadata.maintenance.ScopeCode Scope code} «code list»<br>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -27,10 +27,12 @@
* <a href="https://geo-ide.noaa.gov/wiki/index.php?title=Category:ISO_19115">NOAA wiki page</a>
* is a good source of information.
*
- * <table class="sis"><tr>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: 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>
@@ -42,7 +44,7 @@
* {@linkplain org.opengis.util.CodeList Code list}<br>
* {@code ├─} {@linkplain org.opengis.metadata.Datatype Data type}<br>
* {@code └─} {@linkplain org.opengis.metadata.Obligation Obligation}<br>
- * </td><td class="sep" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: 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>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.quality.DefaultDataQuality Data quality}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.quality.AbstractElement Element} «abstract»<br>
@@ -59,7 +61,7 @@
* {@code └─} {@linkplain org.apache.sis.metadata.iso.quality.DefaultScope Scope}<br>
* {@linkplain org.opengis.util.CodeList Code list}<br>
* {@code └─} {@linkplain org.opengis.metadata.quality.EvaluationMethodType Evaluation method type}<br>
- * </td><td class="sep" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.quality.DefaultDataQuality Data quality}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.quality.DefaultScope Scope}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.quality.AbstractElement Element} «abstract»<br>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -24,10 +24,12 @@
* 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>
+ * <table class="sis">
+ * <caption>Package overview</caption>
+ * <tr>
* <th>Class hierarchy</th>
* <th class="sep">Aggregation hierarchy</th>
- * </tr><tr><td width="50%" nowrap>
+ * </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.spatial.AbstractSpatialRepresentation Spatial representation} «abstract»<br>
* {@code │ ├─} {@linkplain org.apache.sis.metadata.iso.spatial.DefaultVectorSpatialRepresentation Vector spatial representation}<br>
@@ -46,7 +48,7 @@
* {@code ├─} {@linkplain org.opengis.metadata.spatial.PixelOrientation Pixel orientation}<br>
* {@code ├─} {@linkplain org.opengis.metadata.spatial.DimensionNameType Dimension name type}<br>
* {@code └─} {@linkplain org.opengis.metadata.spatial.SpatialRepresentationType Spatial representation type}<br>
- * </td><td class="sep" width="50%" nowrap>
+ * </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.spatial.AbstractSpatialRepresentation Spatial representation} «abstract»<br>
* {@linkplain org.apache.sis.metadata.iso.spatial.DefaultVectorSpatialRepresentation Vector spatial representation}<br>
* {@code ├─} {@linkplain org.opengis.metadata.spatial.TopologyLevel Topology level} «code list»<br>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -23,7 +23,7 @@
* Many metadata standards exist, including <cite>Dublin core</cite>, <cite>ISO 19115</cite> and the Image I/O
* metadata defined in {@link javax.imageio.metadata}. The SIS implementation focuses on ISO 19115 (including
* its ISO 19115-2 extension), but the classes are designed in a way that allow the usage of different standards.
- * This genericity goal should be keept in mind in the discussion below.
+ * This genericity goal should be keep in mind in the discussion below.
*
* {@section How Metadata are defined}
* A metadata standard is defined by a set of Java interfaces belonging to a specific package and its sub-packages.
@@ -41,7 +41,7 @@
*
* <p>The implementation classes, if they exist, are defined in different packages than the interfaces.
* For example the ISO 19115 interfaces, declared in {@link org.opengis.metadata}, are implemented by
- * SIS in {@link org.apache.sis.metadata.iso}. The subpackages hierarchy is the same, and the names
+ * SIS in {@link org.apache.sis.metadata.iso}. The sub-packages hierarchy is the same, and the names
* of implementation classes are the name of the implemented interfaces prefixed with {@code Abstract}
* or {@code Default}.</p>
*
@@ -67,7 +67,7 @@
*
* <p>In addition, the metadata modules provide support methods for handling the metadata objects through Java Reflection.
* This is an approach similar to <cite>Java Beans</cite>, in that users are encouraged to use directly the API of
- * <cite>Plain Old Java</cite> objects (actually interfaces) everytime their type is known at compile time,
+ * <cite>Plain Old Java</cite> objects (actually interfaces) every time their type is known at compile time,
* and fallback on the reflection technic when the type is known only at runtime.</p>
*
* <p>Using Java reflection, a metadata can be viewed in many different ways:</p>
@@ -83,24 +83,24 @@
* The metadata are organized as a tree. For example the {@code Citation} metadata contains one or many
* {@code ResponsibleParty} elements, each of them containing a {@code Contact} element, which contains
* a {@code Telephone} element, <i>etc</i>. For each node, there is many information that can be displayed
- * in columns:
+ * in columns:</p>
* <ul>
* <li>A description of the element.</li>
* <li>The type of values ({@code String}, {@code double}, <i>etc</i>).</li>
* <li>The range of valid values (if the type is numeric),
* or an enumeration of valid values (if the type is a code list).</li>
* <li>The value stored in the element, or the default value.</li>
- * </ul></p></li>
+ * </ul></li>
*
* <li><p><b>As a table record in a database (using {@link org.apache.sis.metadata.sql})</b><br>
- * It is possible to establish the following mapping between metadata and a SQL database:
+ * It is possible to establish the following mapping between metadata and a SQL database:</p>
* <ul>
* <li>Each metadata interface maps to a table of the same name in the database.</li>
* <li>Each property in the above interface maps to a column of the same name in the above table.</li>
* <li>Each instance of the above interface is a record in the above table.</li>
* </ul>
* Using Java reflection, it is possible to generate implementations of the metadata interfaces
- * where each call to a getter method is translated into a SQL query for the above database.</p></li>
+ * where each call to a getter method is translated into a SQL query for the above database.</li>
* </ul>
*
* {@section How Metadata are marshalled}
Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -87,7 +87,7 @@ public final strictfp class HardCodedCit
}
/**
- * The <a href="http://www.ogp.org.uk">International Association of Oil & Gas Producers</a> organization.
+ * The <a href="http://www.ogp.org.uk">International Association of Oil & Gas Producers</a> organization.
* This organization is responsible for maintainance of {@link #EPSG} database.
* An {@linkplain Citation#getAlternateTitles() alternate title} for this citation is "OGP"
* (according ISO 19115, alternate titles often contain abbreviations).
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -75,8 +75,8 @@ import java.util.Objects;
* envelopes crossing the anti-meridian, like the red box below (the green box is the usual case).
* The default implementation of methods listed in the right column can handle such cases.
*
- * <table class="compact" align="center"><tr><td>
- * <img style="vertical-align: middle" src="doc-files/AntiMeridian.png">
+ * <center><table class="compact" summary="Anti-meridian spanning support."><tr><td>
+ * <img style="vertical-align: middle" src="doc-files/AntiMeridian.png" alt="Envelope spannning the anti-meridian">
* </td><td style="vertical-align: middle">
* Supported methods:
* <ul>
@@ -89,7 +89,7 @@ import java.util.Objects;
* <li>{@link #contains(Envelope)}</li>
* <li>{@link #intersects(Envelope)}</li>
* </ul>
- * </td></tr></table>
+ * </td></tr></table></center>
*
* {@section Choosing the range of longitude values}
* Geographic CRS typically have longitude values in the [-180 … +180]° range, but the [0 … 360]°
@@ -591,6 +591,7 @@ public abstract class AbstractEnvelope i
* The 'for' loop below iterates only over the 'i' values for which the 'isWrapAround' bit is set to 1.
*/
int mask = 1; // For identifying whether we need to set the lower or the upper ordinate.
+ @SuppressWarnings("null")
final CoordinateSystem cs = crs.getCoordinateSystem(); // Should not be null at this point.
for (int i; (i = Long.numberOfTrailingZeros(isWrapAround)) != Long.SIZE; isWrapAround &= ~(1L << i)) {
final CoordinateSystemAxis axis = cs.getAxis(i);
@@ -737,7 +738,7 @@ public abstract class AbstractEnvelope i
* For every cases illustrated below, the yellow box is considered completely enclosed
* in the blue envelope:
*
- * <p><img src="doc-files/Contains.png"></p>
+ * <p><img src="doc-files/Contains.png" alt="Examples of envelope inclusions"></p>
*
* @param envelope The envelope to test for inclusion.
* @return {@code true} if this envelope completely encloses the specified one.
@@ -1228,7 +1229,7 @@ public abstract class AbstractEnvelope i
/**
* Invoked by {@link LowerCorner} and {@link UpperCorner} when a coordinate is modified.
* The default implementation throws an {@link UnmodifiableGeometryException} in every cases.
- * This method is overridden and made public by {@link GeneralGeometry}.
+ * This method is overridden and made public by {@link GeneralEnvelope}.
*
* <p>The declaration in this {@code AbstractEnvelope} class is not public on purpose,
* since this class intentionally have no public setter methods. This is necessary for
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -72,9 +72,9 @@ import java.util.Objects;
* {@linkplain #height height} field values. The default implementation of methods listed in the
* right column can handle such cases.
*
- * <table class="compact" align="center"><tr><td>
- * <img src="doc-files/AntiMeridian.png">
- * </td><td>
+ * <center><table class="compact" summary="Anti-meridian spanning support."><tr><td>
+ * <img style="vertical-align: middle" src="doc-files/AntiMeridian.png" alt="Envelope spannning the anti-meridian">
+ * </td><td style="vertical-align: middle">
* Supported methods:
* <ul>
* <li>{@link #getMinimum(int)}</li>
@@ -91,7 +91,7 @@ import java.util.Objects;
* <li>{@link #add(Rectangle2D)}</li>
* <li>{@link #add(double,double)}</li>
* </ul>
- * </td></tr></table>
+ * </td></tr></table></center>
*
* The {@link #getMinX()}, {@link #getMinY()}, {@link #getMaxX()}, {@link #getMaxY()},
* {@link #getCenterX()}, {@link #getCenterY()}, {@link #getWidth()} and {@link #getHeight()}
@@ -989,7 +989,7 @@ public class Envelope2D extends Rectangl
* <p>
* After adding a point, a call to {@link #contains(double, double)} with the added point
* as an argument will return {@code true}, except if one of the point ordinates was
- * {@link Double#NaN} in which case the corresponding ordinate has been ignored.
+ * {@link java.lang.Double#NaN} in which case the corresponding ordinate has been ignored.
*
* {@section Spanning the anti-meridian of a Geographic CRS}
* This method supports anti-meridian spanning in the same way than
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -71,8 +71,8 @@ import static org.apache.sis.math.MathFu
* envelopes crossing the anti-meridian, like the red box below (the green box is the usual case).
* The default implementation of methods listed in the right column can handle such cases.
*
- * <table class="compact" align="center"><tr><td>
- * <img style="vertical-align: middle" src="doc-files/AntiMeridian.png">
+ * <center><table class="compact" summary="Anti-meridian spanning support."><tr><td>
+ * <img style="vertical-align: middle" src="doc-files/AntiMeridian.png" alt="Envelope spannning the anti-meridian">
* </td><td style="vertical-align: middle">
* Supported methods:
* <ul>
@@ -89,7 +89,7 @@ import static org.apache.sis.math.MathFu
* <li>{@link #add(Envelope)}</li>
* <li>{@link #add(DirectPosition)}</li>
* </ul>
- * </td></tr></table>
+ * </td></tr></table></center>
*
* {@section Envelope validation}
* If and only if this envelope is associated to a non-null CRS, then constructors and setter methods
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/package-info.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/package-info.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -23,6 +23,7 @@
* objects, and list the Java2D classes that are conceptually equivalent.
*
* <table class="sis">
+ * <caption>Java2D and geometry equivalences</caption>
* <tr>
* <th>Purpose</th>
* <th>Any dimension</th>
@@ -59,7 +60,7 @@
* longitude greater than the upper corner longitude, like the red box below (the green box is the
* usual case):
*
- * <center><img src="doc-files/AntiMeridian.png"></center>
+ * <center><img src="doc-files/AntiMeridian.png" alt="Envelope spannning the anti-meridian"></center>
*
* In SIS, every envelopes defined in this package support the extended bounding box interpretation:
* for any dimension, ordinate values such that <var>upper</var> < <var>lower</var> are handled
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java?rev=1588414&r1=1588413&r2=1588414&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java [UTF-8] Fri Apr 18 05:14:04 2014
@@ -101,32 +101,33 @@ public final class AxisDirections extend
* ({@code NORTH}, {@code EAST}, {@code UP}, {@code FUTURE}).
* More specifically, the following conversion table is applied:
*
- * <table class="compact"><tr>
- * <td><table class="sis">
+ * <table class="compact">
+ * <caption>Mapping to "absolute" directions</caption><tr>
+ * <td><table class="sis" summary="Geospatial directions">
* <tr>
- * <th width='50%'>Direction</th>
- * <th width='50%'>Absolute value</th>
+ * <th style="width: 50%">Direction</th>
+ * <th style="width: 50%">Absolute value</th>
* </tr>
- * <tr><td width='50%'>{@code NORTH}</td> <td width='50%'>{@code NORTH}</td> </tr>
- * <tr><td width='50%'>{@code SOUTH}</td> <td width='50%'>{@code NORTH}</td> </tr>
- * <tr><td width='50%'>{@code EAST}</td> <td width='50%'>{@code EAST}</td> </tr>
- * <tr><td width='50%'>{@code WEST}</td> <td width='50%'>{@code EAST}</td> </tr>
- * <tr><td width='50%'>{@code UP}</td> <td width='50%'>{@code UP}</td> </tr>
- * <tr><td width='50%'>{@code DOWN}</td> <td width='50%'>{@code UP}</td> </tr>
+ * <tr><td>{@code NORTH}</td> <td>{@code NORTH}</td> </tr>
+ * <tr><td>{@code SOUTH}</td> <td>{@code NORTH}</td> </tr>
+ * <tr><td>{@code EAST}</td> <td>{@code EAST}</td> </tr>
+ * <tr><td>{@code WEST}</td> <td>{@code EAST}</td> </tr>
+ * <tr><td>{@code UP}</td> <td>{@code UP}</td> </tr>
+ * <tr><td>{@code DOWN}</td> <td>{@code UP}</td> </tr>
* </table></td>
- * <td width='50%'><table class="sis">
+ * <td><table class="sis" summary="Other directions">
* <tr>
- * <th width='50%'>Direction</th>
- * <th width='50%'>Absolute value</th>
+ * <th style="width: 50%">Direction</th>
+ * <th style="width: 50%">Absolute value</th>
* </tr>
- * <tr><td width='50%'>{@code DISPLAY_RIGHT}</td> <td width='50%'>{@code DISPLAY_RIGHT}</td> </tr>
- * <tr><td width='50%'>{@code DISPLAY_LEFT}</td> <td width='50%'>{@code DISPLAY_RIGHT}</td> </tr>
- * <tr><td width='50%'>{@code DISPLAY_UP}</td> <td width='50%'>{@code DISPLAY_UP}</td> </tr>
- * <tr><td width='50%'>{@code DISPLAY_DOWN}</td> <td width='50%'>{@code DISPLAY_UP}</td> </tr>
- * <tr><td width='50%'>{@code FUTURE}</td> <td width='50%'>{@code FUTURE}</td> </tr>
- * <tr><td width='50%'>{@code PAST}</td> <td width='50%'>{@code FUTURE}</td> </tr>
+ * <tr><td>{@code DISPLAY_RIGHT}</td> <td>{@code DISPLAY_RIGHT}</td> </tr>
+ * <tr><td>{@code DISPLAY_LEFT}</td> <td>{@code DISPLAY_RIGHT}</td> </tr>
+ * <tr><td>{@code DISPLAY_UP}</td> <td>{@code DISPLAY_UP}</td> </tr>
+ * <tr><td>{@code DISPLAY_DOWN}</td> <td>{@code DISPLAY_UP}</td> </tr>
+ * <tr><td>{@code FUTURE}</td> <td>{@code FUTURE}</td> </tr>
+ * <tr><td>{@code PAST}</td> <td>{@code FUTURE}</td> </tr>
* </table></td></tr>
- * <tr align="center"><td width='50%'>{@code OTHER}</td><td width='50%'>{@code OTHER}</td></tr>
+ * <tr align="center"><td>{@code OTHER}</td><td>{@code OTHER}</td></tr>
* </table>
*
* @param dir The direction for which to return the absolute direction, or {@code null}.