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 2017/01/19 18:46:46 UTC
svn commit: r1779506 [1/9] - in /sis/branches/JDK8/core:
sis-feature/src/main/java/org/apache/sis/feature/
sis-metadata/src/main/java/org/apache/sis/io/wkt/
sis-metadata/src/main/java/org/apache/sis/metadata/
sis-metadata/src/main/java/org/apache/sis/m...
Author: desruisseaux
Date: Thu Jan 19 18:46:44 2017
New Revision: 1779506
URL: http://svn.apache.org/viewvc?rev=1779506&view=rev
Log:
Javadoc formatting and minor warning fixes.
Contains also a fix for a hole in ISOMetadata.freeze().
Modified:
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywordClass.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAbsoluteExternalPositionalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAccuracyOfATimeMeasurement.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessCommission.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessOmission.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConceptualConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultFormatConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultGriddedDataPositionalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeAttributeAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultRelativeInternalPositionalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalValidity.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultThematicClassificationCorrectness.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTopologicalConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -408,8 +408,10 @@ public class DefaultFeatureType extends
if (property != null) {
final String tip = entry.getKey();
if (byName.putIfAbsent(tip, property) == null) {
- // This block is skipped if there is properties named "tip" and "head:tip".
- // The 'indices' value may be null if the property is an operation.
+ /*
+ * This block is skipped if there is properties named "tip" and "head:tip".
+ * The 'indices' value may be null if the property is an operation.
+ */
final Integer value = indices.get(property.getName().toString());
if (value != null && indices.put(tip, value) != null) {
throw new AssertionError(tip); // Should never happen.
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -141,8 +141,8 @@ public class Colors implements Cloneable
/**
* Returns the color for the given syntactic element.
*
- * @param key The syntactic element for which to get the color.
- * @return The color of the specified element, or {@code null} if none.
+ * @param key the syntactic element for which to get the color.
+ * @return the color of the specified element, or {@code null} if none.
*/
public final String getName(final ElementKind key) { // Declared final for consistency with getAnsiSequence(\u2026)
final X364 color = map.get(key);
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -148,8 +148,8 @@ public enum ElementKind {
* The given type can be any sub-type of the above types. If an object implements more
* than one of the above interfaces, then the selected {@code ElementKind} is arbitrary.
*
- * @param type The object type, or {@code null}.
- * @return The element kind of the given type, or {@code null} if none match.
+ * @param type the object type, or {@code null}.
+ * @return the element kind of the given type, or {@code null} if none match.
*/
public static ElementKind forType(final Class<?> type) {
if (type != null) {
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -97,8 +97,8 @@ public abstract class FormattableObject
*
* <p>By default this method formats this object according the {@link Convention#WKT2} rules.</p>
*
- * @return The default Well Know Text representation of this object.
- * @throws UnformattableObjectException If this object can not be formatted as a standard WKT.
+ * @return the default Well Know Text representation of this object.
+ * @throws UnformattableObjectException if this object can not be formatted as a standard WKT.
*
* @see org.opengis.referencing.IdentifiedObject#toWKT()
*/
@@ -116,7 +116,7 @@ public abstract class FormattableObject
* Consequently the WKT is not guaranteed to be ISO 19162 compliant.
* For stricter conformance, use {@link #toWKT()} instead.</p>
*
- * @return The Well Known Text (WKT) or an alternative representation of this object.
+ * @return the Well Known Text (WKT) or an alternative representation of this object.
*/
@Override
public String toString() {
@@ -131,8 +131,8 @@ public abstract class FormattableObject
*
* <p>For stricter conformance to ISO 19162 standard, use {@link #toWKT()} or {@link WKTFormat} instead.</p>
*
- * @param convention The WKT convention to use.
- * @return The Well Known Text (WKT) or a pseudo-WKT representation of this object.
+ * @param convention the WKT convention to use.
+ * @return the Well Known Text (WKT) or a pseudo-WKT representation of this object.
*/
public String toString(final Convention convention) {
ArgumentChecks.ensureNonNull("convention", convention);
@@ -165,12 +165,12 @@ public abstract class FormattableObject
* If {@code strict} is true, then an exception is thrown if the WKT is not standard-compliant.
* If {@code strict} if false, then warnings are appended after the WKT instead.
*
- * @param convention The convention for choosing WKT element names.
+ * @param convention the convention for choosing WKT element names.
* @param colorize {@code true} for applying syntax coloring, or {@code false} otherwise.
* @param strict {@code true} if an exception shall be thrown for unformattable objects,
* or {@code false} for providing a non-standard formatting instead.
- * @return The Well Known Text (WKT) or a pseudo-WKT representation of this object.
- * @throws UnformattableObjectException If {@code strict} is {@code true} and this object can not be formatted.
+ * @return the Well Known Text (WKT) or a pseudo-WKT representation of this object.
+ * @throws UnformattableObjectException if {@code strict} is {@code true} and this object can not be formatted.
*/
private String formatWKT(final Convention convention, final boolean colorize, final boolean strict)
throws UnformattableObjectException
@@ -239,8 +239,8 @@ public abstract class FormattableObject
* while the keyword needs to be defined by the concrete subclasses.
* In such case, the method in the abstract class shall return {@code null}.</p>
*
- * @param formatter The formatter where to format the inner content of this WKT element.
- * @return The {@linkplain KeywordCase#CAMEL_CASE CamelCase} keyword for the WKT element, or {@code null} if unknown.
+ * @param formatter the formatter where to format the inner content of this WKT element.
+ * @return the {@linkplain KeywordCase#CAMEL_CASE CamelCase} keyword for the WKT element, or {@code null} if unknown.
*
* @see #toWKT()
* @see #toString()
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -49,8 +49,8 @@ public interface Parser {
* {@linkplain org.apache.sis.referencing.crs.AbstractCRS Coordinate Reference Systems} or
* {@linkplain org.apache.sis.referencing.operation.transform.AbstractMathTransform Math Transforms}.
*
- * @param text Object encoded in Well-Known Text format (version 1 or 2).
- * @return The result of parsing the given text.
+ * @param text object encoded in Well-Known Text format (version 1 or 2).
+ * @return the result of parsing the given text.
* @throws FactoryException if the object creation failed.
*/
Object createFromWKT(String text) throws FactoryException;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -366,7 +366,7 @@ public class Symbols implements Localize
* Returns the number of paired quotes. For example if the WKT parser accepts both the
* {@code "\u2026"} and {@code \u201c\u2026\u201d} quote pairs, then this method returns 2.
*
- * @return The number of quote pairs.
+ * @return the number of quote pairs.
*
* @see #getOpeningQuote(int)
* @see #getClosingQuote(int)
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -54,7 +54,7 @@ public class UnformattableObjectExceptio
/**
* Constructs a new exception with the specified detail message.
*
- * @param message The detail message, or {@code null} if none.
+ * @param message the detail message, or {@code null} if none.
*/
public UnformattableObjectException(final String message) {
super(message);
@@ -63,8 +63,8 @@ public class UnformattableObjectExceptio
/**
* Constructs a new exception with the specified detail message and cause.
*
- * @param message The detail message, or {@code null} if none.
- * @param cause The cause, or {@code null} if none.
+ * @param message the detail message, or {@code null} if none.
+ * @param cause the cause, or {@code null} if none.
*/
public UnformattableObjectException(final String message, final Throwable cause) {
super(message, cause);
@@ -73,7 +73,7 @@ public class UnformattableObjectExceptio
/**
* Constructs a new exception with the specified cause.
*
- * @param cause The cause, or {@code null} if none.
+ * @param cause the cause, or {@code null} if none.
*/
public UnformattableObjectException(final Throwable cause) {
super(cause);
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -81,10 +81,10 @@ final class VerticalInfo {
/**
* Adds to the chained list a new {@code DefaultVerticalExtent} instance pending completion.
*
- * @param next The existing {@code VerticalInfo} instance. Will become the next instance
- * to process after {@code this} in a chain of {@code VerticalInfo}.
- * @param extents Where to add the vertical extent.
- * @param unit The unit to assign to the {@code extent}. Can not be null.
+ * @param next the existing {@code VerticalInfo} instance. Will become the next instance
+ * to process after {@code this} in a chain of {@code VerticalInfo}.
+ * @param extents where to add the vertical extent.
+ * @param unit the unit to assign to the {@code extent}. Can not be null.
*/
VerticalInfo(final VerticalInfo next, final DefaultExtent extents, final double minimum, final double maximum, final Unit<Length> unit) {
this.next = next;
@@ -105,7 +105,7 @@ final class VerticalInfo {
*
* This method processes also all other {@code VerticalInfo} instances in the chained list.
*
- * @return The new head of the chained list (may be {@code this}), or {@code null} if the list
+ * @return the new head of the chained list (may be {@code this}), or {@code null} if the list
* became empty as a result of this operation.
*/
final VerticalInfo resolve(final VerticalCRS crs) {
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -28,7 +28,7 @@ import org.apache.sis.measure.ValueRange
* in order to make possible to return this range from the {@link PropertyInformation#getDomainValue()}
* method.
*
- * @param <E> The type of range elements as a subclass of {@link Number}.
+ * @param <E> the type of range elements as a subclass of {@link Number}.
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -38,8 +38,8 @@ final class InformationMap extends Prope
/**
* Creates an information map for the specified accessor.
*
- * @param accessor The accessor to use for the metadata.
- * @param keyPolicy Determines the string representation of keys in the map.
+ * @param accessor the accessor to use for the metadata.
+ * @param keyPolicy determines the string representation of keys in the map.
*/
InformationMap(final PropertyAccessor accessor, final KeyNamePolicy keyPolicy) {
super(accessor, keyPolicy);
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -479,8 +479,10 @@ public class MetadataStandard implements
if (!it.hasNext()) {
return candidate;
}
- // Found more than one interface; we don't know which one to pick.
- // Returns 'null' for now; the caller will thrown an exception.
+ /*
+ * Found more than one interface; we don't know which one to pick.
+ * Returns 'null' for now; the caller will thrown an exception.
+ */
} else if (IMPLEMENTATION_CAN_ALTER_API && isPendingAPI(key.type)) {
/*
* Found no interface. According to our method contract we should return null.
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -97,6 +97,7 @@ public abstract class ModifiableMetadata
/**
* A null implementation for the {@link #FREEZING} constant.
*/
+ @SuppressWarnings("CloneableClassWithoutClone")
private static final class Null extends ModifiableMetadata {
@Override public MetadataStandard getStandard() {
return null;
@@ -185,8 +186,10 @@ public abstract class ModifiableMetadata
return this;
}
candidate.freeze();
- // Set the field only after success. The 'unmodifiable' field must
- // stay null if an exception occurred during clone() or freeze().
+ /*
+ * Set the field only after success. The 'unmodifiable' field must
+ * stay null if an exception occurred during clone() or freeze().
+ */
unmodifiable = candidate;
}
assert !unmodifiable.isModifiable();
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -40,9 +40,9 @@ final class NameMap extends PropertyMap<
/**
* Creates a name map for the specified accessor.
*
- * @param accessor The accessor to use for the metadata.
- * @param keyPolicy Determines the string representation of keys in the map.
- * @param valuePolicy Determines the string representation of values in this map.
+ * @param accessor the accessor to use for the metadata.
+ * @param keyPolicy determines the string representation of keys in the map.
+ * @param valuePolicy determines the string representation of values in this map.
*/
NameMap(final PropertyAccessor accessor, final KeyNamePolicy keyPolicy, final KeyNamePolicy valuePolicy) {
super(accessor, keyPolicy);
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -377,7 +377,7 @@ class PropertyAccessor {
Classes.getShortName(type) + '.' + name));
}
if (deprecated) {
- mapping.put(name, old); // Restore the undeprecated method.
+ mapping.put(name, old); // Restore the undeprecated method.
}
}
}
@@ -413,7 +413,7 @@ class PropertyAccessor {
for (Method candidate : getters) {
if (Classes.isPossibleGetter(candidate)) {
final String name = candidate.getName();
- if (name.startsWith(SET)) { // Paranoiac check.
+ if (name.startsWith(SET)) { // Paranoiac check.
continue;
}
/*
@@ -424,13 +424,13 @@ class PropertyAccessor {
if (MetadataStandard.IMPLEMENTATION_CAN_ALTER_API) {
if (type == implementation) {
if (!type.isInterface() && !candidate.isAnnotationPresent(UML.class)) {
- continue; // @UML considered optional only for interfaces.
+ continue; // @UML considered optional only for interfaces.
}
} else try {
candidate = type.getMethod(name, (Class[]) null);
} catch (NoSuchMethodException e) {
if (!candidate.isAnnotationPresent(UML.class)) {
- continue; // Not a method from an interface, and no @UML in implementation.
+ continue; // Not a method from an interface, and no @UML in implementation.
}
}
}
@@ -446,7 +446,7 @@ class PropertyAccessor {
final Class<?> pt = getters[pi].getReturnType();
final Class<?> ct = candidate .getReturnType();
if (ct.isAssignableFrom(pt)) {
- continue; // Previous type was more accurate.
+ continue; // Previous type was more accurate.
}
if (pt.isAssignableFrom(ct)) {
getters[pi] = candidate;
@@ -494,7 +494,7 @@ class PropertyAccessor {
*
* @param name the name of the property to search.
* @param mandatory whether this method shall throw an exception or return {@code -1}
- * if the given name is not found.
+ * if the given name is not found.
* @return the index of the given name, or -1 if none and {@code mandatory} is {@code false}.
* @throws IllegalArgumentException if the name is not found and {@code mandatory} is {@code true}.
*/
@@ -588,8 +588,10 @@ class PropertyAccessor {
if (implementation != type) try {
getter = implementation.getMethod(getter.getName(), (Class<?>[]) null);
} catch (NoSuchMethodException error) {
- // Should never happen, since the implementation class
- // implements the interface where the getter come from.
+ /*
+ * Should never happen, since the implementation class
+ * implements the interface where the getter come from.
+ */
throw new AssertionError(error);
}
return getter.getDeclaringClass();
@@ -800,8 +802,10 @@ class PropertyAccessor {
if (changed == null) {
changed = (mode == RETURN_NULL) || (newValues[0] != oldValue);
if (changed && mode == APPEND && !ValueExistencePolicy.isNullOrEmpty(oldValue)) {
- // If 'convert' did not added the value in a collection and if a value already
- // exists, do not modify the existing value. Exit now with "no change" status.
+ /*
+ * If 'convert' did not added the value in a collection and if a value already
+ * exists, do not modify the existing value. Exit now with "no change" status.
+ */
return null;
}
}
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -91,7 +91,7 @@ final class PropertyComparator implement
/**
* Creates a new comparator for the given implementation class.
*
- * @param implementation The implementation class, or the interface if the implementation class is unknown.
+ * @param implementation the implementation class, or the interface if the implementation class is unknown.
*/
PropertyComparator(Class<?> implementation) {
this.implementation = implementation;
@@ -123,8 +123,8 @@ final class PropertyComparator implement
* when the implementation has been updated for a new standard, while the interface is still reflecting the
* old standard.
*
- * @param implementation The implementation class, or the interface is the implementation class is unknown.
- * @param method The method to check for deprecation.
+ * @param implementation the implementation class, or the interface is the implementation class is unknown.
+ * @param method the method to check for deprecation.
* @return {@code true} if the method is deprecated.
*/
static boolean isDeprecated(final Class<?> implementation, Method method) {
@@ -140,8 +140,10 @@ final class PropertyComparator implement
try {
method = implementation.getMethod(method.getName(), (Class[]) null);
} catch (NoSuchMethodException e) {
- // Should never happen since the implementation is supposed to implement
- // the interface that declare the method given in argument.
+ /*
+ * Should never happen since the implementation is supposed to implement
+ * the interface that declare the method given in argument.
+ */
throw new AssertionError(e);
}
return method.isAnnotationPresent(Deprecated.class);
@@ -156,23 +158,22 @@ final class PropertyComparator implement
if (deprecated != isDeprecated(implementation, m2)) {
return deprecated ? +1 : -1;
}
- int c = indexOf(m2) - indexOf(m1); // indexOf(\u2026) are sorted in descending order.
+ int c = indexOf(m2) - indexOf(m1); // indexOf(\u2026) are sorted in descending order.
if (c == 0) {
final UML a1 = m1.getAnnotation(UML.class);
final UML a2 = m2.getAnnotation(UML.class);
if (a1 != null) {
- if (a2 == null) return +1; // Sort annotated elements first.
- c = order(a1) - order(a2); // Mandatory elements must be first.
+ if (a2 == null) return +1; // Sort annotated elements first.
+ c = order(a1) - order(a2); // Mandatory elements must be first.
if (c == 0) {
// Fallback on alphabetical order.
c = a1.identifier().compareToIgnoreCase(a2.identifier());
}
return c;
} else if (a2 != null) {
- return -1; // Sort annotated elements first.
+ return -1; // Sort annotated elements first.
}
- // Fallback on alphabetical order.
- c = m1.getName().compareToIgnoreCase(m2.getName());
+ c = m1.getName().compareToIgnoreCase(m2.getName()); // Fallback on alphabetical order.
}
return c;
}
@@ -270,9 +271,9 @@ final class PropertyComparator implement
* by the property name {@code "title"}. We will perform this operation only if there is
* at least 1 character after the prefix.
*
- * @param name The method name (can not be {@code null}).
- * @param base Must be the result of {@code prefix(name).length()}.
- * @return The property name (never {@code null}).
+ * @param name the method name (can not be {@code null}).
+ * @param base must be the result of {@code prefix(name).length()}.
+ * @return the property name (never {@code null}).
*/
static String toPropertyName(String name, final int base) {
final int length = name.length();
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -92,6 +92,7 @@ abstract class PropertyMap<V> extends Ab
* if they define a different entries set class than the default {@link Entries} inner class.
*/
@Override
+ @SuppressWarnings("ReturnOfCollectionOrArrayField") // Intentionally modifiable set.
public Set<Map.Entry<String,V>> entrySet() {
if (entrySet == null) {
entrySet = new Entries();
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -34,7 +34,7 @@ import java.util.IdentityHashMap;
* would not suit since it invokes {@code equals(Object)} and {@code hashCode()}, which are precisely
* the methods that we want to avoid invoking twice.
*
- * @param <V> The kind of values to store in the maps.
+ * @param <V> the kind of values to store in the maps.
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -499,13 +499,14 @@ class TreeNode implements Node {
final Collection<?> values = (Collection<?>) super.getUserObject();
if (!(values instanceof List<?>)) {
// 'setValue' is the public method which invoked this one.
- throw new UnsupportedOperationException(Errors.format(
- Errors.Keys.UnsupportedOperation_1, "setValue"));
+ throw new UnsupportedOperationException(Errors.format(Errors.Keys.UnsupportedOperation_1, "setValue"));
}
final Class<?> targetType;
if (values instanceof CheckedContainer<?>) {
- // Typically the same than getElementType(), but let be safe
- // in case some implementations have stricter requirements.
+ /*
+ * Typically the same than getElementType(), but let be safe
+ * in case some implementations have stricter requirements.
+ */
targetType = ((CheckedContainer<?>) values).getElementType();
} else {
targetType = baseType;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -40,9 +40,9 @@ final class TypeMap extends PropertyMap<
/**
* Creates a type map for the specified accessor.
*
- * @param accessor The accessor to use for the metadata.
- * @param keyPolicy Determines the string representation of keys in the map..
- * @param valuePolicy The kind of values in this map.
+ * @param accessor the accessor to use for the metadata.
+ * @param keyPolicy determines the string representation of keys in the map..
+ * @param valuePolicy the kind of values in this map.
*/
TypeMap(final PropertyAccessor accessor, final KeyNamePolicy keyPolicy, final TypeValuePolicy valuePolicy) {
super(accessor, keyPolicy);
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -42,7 +42,7 @@ public class UnmodifiableMetadataExcepti
/**
* Creates a new exception with the specified detail message.
*
- * @param message The detail message.
+ * @param message the detail message.
*/
public UnmodifiableMetadataException(final String message) {
super(message);
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -51,10 +51,10 @@ final class ValueMap extends PropertyMap
/**
* Creates a map of values for the specified metadata and accessor.
*
- * @param metadata The metadata object to wrap.
- * @param accessor The accessor to use for the metadata.
- * @param keyPolicy Determines the string representation of keys in the map..
- * @param valuePolicy The behavior of this map toward null or empty values.
+ * @param metadata the metadata object to wrap.
+ * @param accessor the accessor to use for the metadata.
+ * @param keyPolicy determines the string representation of keys in the map..
+ * @param valuePolicy the behavior of this map toward null or empty values.
*/
ValueMap(final Object metadata, final PropertyAccessor accessor,
final KeyNamePolicy keyPolicy, final ValueExistencePolicy valuePolicy)
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -43,6 +43,7 @@ import org.opengis.metadata.citation.Onl
* @version 0.5
* @module
*/
+@SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones.
@XmlType(name = "MD_ApplicationSchemaInformation_Type", propOrder = {
"name",
"schemaLanguage",
@@ -53,9 +54,7 @@ import org.opengis.metadata.citation.Onl
"softwareDevelopmentFileFormat"
})
@XmlRootElement(name = "MD_ApplicationSchemaInformation")
-public class DefaultApplicationSchemaInformation extends ISOMetadata
- implements ApplicationSchemaInformation
-{
+public class DefaultApplicationSchemaInformation extends ISOMetadata implements ApplicationSchemaInformation {
/**
* Serial number for inter-operability with different versions.
*/
@@ -105,9 +104,9 @@ public class DefaultApplicationSchemaInf
/**
* Creates a application schema information initialized to the specified values.
*
- * @param name The name of the application schema used.
- * @param schemaLanguage The the identification of the schema language used.
- * @param constraintLanguage The formal language used in application schema.
+ * @param name the name of the application schema used.
+ * @param schemaLanguage the the identification of the schema language used.
+ * @param constraintLanguage the formal language used in application schema.
*/
public DefaultApplicationSchemaInformation(final Citation name,
final String schemaLanguage,
@@ -123,7 +122,7 @@ public class DefaultApplicationSchemaInf
* This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
* given object are not recursively copied.
*
- * @param object The metadata to copy values from, or {@code null} if none.
+ * @param object the metadata to copy values from, or {@code null} if none.
*
* @see #castOrCopy(ApplicationSchemaInformation)
*/
@@ -154,8 +153,8 @@ public class DefaultApplicationSchemaInf
* metadata contained in the given object are not recursively copied.</li>
* </ul>
*
- * @param object The object to get as a SIS implementation, or {@code null} if none.
- * @return A SIS implementation containing the values of the given object (may be the
+ * @param object the object to get as a SIS implementation, or {@code null} if none.
+ * @return a SIS implementation containing the values of the given object (may be the
* given object itself), or {@code null} if the argument was null.
*/
public static DefaultApplicationSchemaInformation castOrCopy(final ApplicationSchemaInformation object) {
@@ -168,7 +167,7 @@ public class DefaultApplicationSchemaInf
/**
* Name of the application schema used.
*
- * @return Name of the application schema, or {@code null}.
+ * @return name of the application schema, or {@code null}.
*/
@Override
@XmlElement(name = "name", required = true)
@@ -179,7 +178,7 @@ public class DefaultApplicationSchemaInf
/**
* Sets the name of the application schema used.
*
- * @param newValue The new name.
+ * @param newValue the new name.
*/
public void setName(final Citation newValue) {
checkWritePermission();
@@ -189,7 +188,7 @@ public class DefaultApplicationSchemaInf
/**
* Identification of the schema language used.
*
- * @return The schema language used, or {@code null}.
+ * @return the schema language used, or {@code null}.
*/
@Override
@XmlElement(name = "schemaLanguage", required = true)
@@ -200,7 +199,7 @@ public class DefaultApplicationSchemaInf
/**
* Sets the identification of the schema language used.
*
- * @param newValue The new schema language.
+ * @param newValue the new schema language.
*/
public void setSchemaLanguage(final String newValue) {
checkWritePermission();
@@ -210,7 +209,7 @@ public class DefaultApplicationSchemaInf
/**
* Formal language used in Application Schema.
*
- * @return Formal language used in Application Schema, or {@code null}.
+ * @return formal language used in Application Schema, or {@code null}.
*/
@Override
@XmlElement(name = "constraintLanguage", required = true)
@@ -221,7 +220,7 @@ public class DefaultApplicationSchemaInf
/**
* Sets the formal language used in application schema.
*
- * @param newValue The new constraint language.
+ * @param newValue the new constraint language.
*/
public void setConstraintLanguage(final String newValue) {
checkWritePermission();
@@ -231,7 +230,7 @@ public class DefaultApplicationSchemaInf
/**
* Full application schema given as an ASCII file.
*
- * @return Application schema as an ASCII file, or {@code null}.
+ * @return application schema as an ASCII file, or {@code null}.
*/
@Override
/// @XmlElement(name = "schemaAscii")
@@ -242,7 +241,7 @@ public class DefaultApplicationSchemaInf
/**
* Sets the full application schema given as an ASCII file.
*
- * @param newValue The new ASCII file.
+ * @param newValue the new ASCII file.
*/
public void setSchemaAscii(final CharSequence newValue) {
checkWritePermission();
@@ -252,7 +251,7 @@ public class DefaultApplicationSchemaInf
/**
* Full application schema given as a graphics file.
*
- * @return Application schema as a graphics file, or {@code null}.
+ * @return application schema as a graphics file, or {@code null}.
*/
@Override
/// @XmlElement(name = "graphicsFile")
@@ -263,7 +262,7 @@ public class DefaultApplicationSchemaInf
/**
* Sets the full application schema given as a graphics file.
*
- * @param newValue The new graphics file.
+ * @param newValue the new graphics file.
*/
public void setGraphicsFile(final OnlineResource newValue) {
checkWritePermission();
@@ -273,7 +272,7 @@ public class DefaultApplicationSchemaInf
/**
* Full application schema given as a software development file.
*
- * @return Application schema as a software development file, or {@code null}.
+ * @return application schema as a software development file, or {@code null}.
*/
@Override
/// @XmlElement(name = "softwareDevelopmentFile")
@@ -284,7 +283,7 @@ public class DefaultApplicationSchemaInf
/**
* Sets the full application schema given as a software development file.
*
- * @param newValue The new software development file.
+ * @param newValue the new software development file.
*/
public void setSoftwareDevelopmentFile(final OnlineResource newValue) {
checkWritePermission();
@@ -294,7 +293,7 @@ public class DefaultApplicationSchemaInf
/**
* Software dependent format used for the application schema software dependent file.
*
- * @return Format used for the application schema software file, or {@code null}.
+ * @return format used for the application schema software file, or {@code null}.
*/
@Override
@XmlElement(name = "softwareDevelopmentFileFormat")
@@ -305,7 +304,7 @@ public class DefaultApplicationSchemaInf
/**
* Sets the software dependent format used for the application schema software dependent file.
*
- * @param newValue The new software development file format.
+ * @param newValue the new software development file format.
*/
public void setSoftwareDevelopmentFileFormat(final String newValue) {
checkWritePermission();
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -54,6 +54,7 @@ import static org.apache.sis.internal.me
* @version 0.5
* @module
*/
+@SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones.
@XmlType(name = "MD_ExtendedElementInformation_Type", propOrder = {
"name",
"shortName",
@@ -70,9 +71,7 @@ import static org.apache.sis.internal.me
"sources"
})
@XmlRootElement(name = "MD_ExtendedElementInformation")
-public class DefaultExtendedElementInformation extends ISOMetadata
- implements ExtendedElementInformation
-{
+public class DefaultExtendedElementInformation extends ISOMetadata implements ExtendedElementInformation {
/**
* Serial number for inter-operability with different versions.
*/
@@ -167,13 +166,13 @@ public class DefaultExtendedElementInfor
/**
* Create an extended element information initialized to the given values.
*
- * @param name The name of the extended metadata element.
- * @param definition The definition of the extended element.
- * @param condition The condition under which the extended element is mandatory.
- * @param dataType The code which identifies the kind of value provided in the extended element.
- * @param parentEntity The name of the metadata entity(s) under which this extended metadata element may appear.
- * @param rule How the extended element relates to other existing elements and entities.
- * @param source The name of the person or organization creating the extended element.
+ * @param name the name of the extended metadata element.
+ * @param definition the definition of the extended element.
+ * @param condition the condition under which the extended element is mandatory.
+ * @param dataType the code which identifies the kind of value provided in the extended element.
+ * @param parentEntity the name of the metadata entity(s) under which this extended metadata element may appear.
+ * @param rule how the extended element relates to other existing elements and entities.
+ * @param source the name of the person or organization creating the extended element.
*/
public DefaultExtendedElementInformation(final String name,
final CharSequence definition,
@@ -204,7 +203,7 @@ public class DefaultExtendedElementInfor
* metadata instances can also be obtained by unmarshalling an invalid XML document.
* </div>
*
- * @param object The metadata to copy values from, or {@code null} if none.
+ * @param object the metadata to copy values from, or {@code null} if none.
*
* @see #castOrCopy(ExtendedElementInformation)
*/
@@ -242,8 +241,8 @@ public class DefaultExtendedElementInfor
* metadata contained in the given object are not recursively copied.</li>
* </ul>
*
- * @param object The object to get as a SIS implementation, or {@code null} if none.
- * @return A SIS implementation containing the values of the given object (may be the
+ * @param object the object to get as a SIS implementation, or {@code null} if none.
+ * @return a SIS implementation containing the values of the given object (may be the
* given object itself), or {@code null} if the argument was null.
*/
public static DefaultExtendedElementInformation castOrCopy(final ExtendedElementInformation object) {
@@ -256,7 +255,7 @@ public class DefaultExtendedElementInfor
/**
* Name of the extended metadata element.
*
- * @return Name of the extended metadata element, or {@code null}.
+ * @return name of the extended metadata element, or {@code null}.
*/
@Override
@XmlElement(name = "name", required = true)
@@ -267,7 +266,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the name of the extended metadata element.
*
- * @param newValue The new name.
+ * @param newValue the new name.
*/
public void setName(final String newValue) {
checkWritePermission();
@@ -277,7 +276,7 @@ public class DefaultExtendedElementInfor
/**
* Short form suitable for use in an implementation method such as XML or SGML.
*
- * @return Short form suitable for use in an implementation method such as XML or SGML, or {@code null}.
+ * @return short form suitable for use in an implementation method such as XML or SGML, or {@code null}.
*
* @deprecated Removed as of ISO 19115:2014.
*/
@@ -291,7 +290,7 @@ public class DefaultExtendedElementInfor
/**
* Sets a short form suitable for use in an implementation method such as XML or SGML.
*
- * @param newValue The new short name.
+ * @param newValue the new short name.
*
* @deprecated Removed as of ISO 19115:2014.
*/
@@ -306,7 +305,7 @@ public class DefaultExtendedElementInfor
* Returns a non-null value only if the {@linkplain #getDataType() data type}
* is {@linkplain Datatype#CODE_LIST_ELEMENT code list element}.
*
- * @return Three digit code assigned to the extended element, or {@code null}.
+ * @return three digit code assigned to the extended element, or {@code null}.
*
* @deprecated Removed as of ISO 19115:2014.
*/
@@ -320,7 +319,7 @@ public class DefaultExtendedElementInfor
/**
* Sets a three digit code assigned to the extended element.
*
- * @param newValue The new domain code.
+ * @param newValue the new domain code.
*
* @deprecated Removed as of ISO 19115:2014.
*/
@@ -333,7 +332,7 @@ public class DefaultExtendedElementInfor
/**
* Definition of the extended element.
*
- * @return Definition of the extended element, or {@code null}.
+ * @return definition of the extended element, or {@code null}.
*/
@Override
@XmlElement(name = "definition", required = true)
@@ -344,7 +343,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the definition of the extended element.
*
- * @param newValue The new definition.
+ * @param newValue the new definition.
*/
public void setDefinition(final InternationalString newValue) {
checkWritePermission();
@@ -354,7 +353,7 @@ public class DefaultExtendedElementInfor
/**
* Obligation of the extended element.
*
- * @return Obligation of the extended element, or {@code null}.
+ * @return obligation of the extended element, or {@code null}.
*/
@Override
@XmlElement(name = "obligation")
@@ -365,7 +364,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the obligation of the extended element.
*
- * @param newValue The new obligation.
+ * @param newValue the new obligation.
*/
public void setObligation(final Obligation newValue) {
checkWritePermission();
@@ -377,7 +376,7 @@ public class DefaultExtendedElementInfor
* Returns a non-null value only if the {@linkplain #getObligation() obligation}
* is {@linkplain Obligation#CONDITIONAL conditional}.
*
- * @return The condition under which the extended element is mandatory, or {@code null}.
+ * @return the condition under which the extended element is mandatory, or {@code null}.
*/
@Override
@XmlElement(name = "condition")
@@ -388,7 +387,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the condition under which the extended element is mandatory.
*
- * @param newValue The new condition.
+ * @param newValue the new condition.
*/
public void setCondition(final InternationalString newValue) {
checkWritePermission();
@@ -398,7 +397,7 @@ public class DefaultExtendedElementInfor
/**
* Code which identifies the kind of value provided in the extended element.
*
- * @return The kind of value provided in the extended element, or {@code null}.
+ * @return the kind of value provided in the extended element, or {@code null}.
*/
@Override
@XmlElement(name = "dataType", required = true)
@@ -409,7 +408,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the code which identifies the kind of value provided in the extended element.
*
- * @param newValue The new data type.
+ * @param newValue the new data type.
*/
public void setDataType(final Datatype newValue) {
checkWritePermission();
@@ -423,7 +422,7 @@ public class DefaultExtendedElementInfor
* {@linkplain Datatype#CODE_LIST code list} or {@linkplain Datatype#CODE_LIST_ELEMENT
* code list element}.
*
- * @return Maximum occurrence of the extended element, or {@code null}.
+ * @return maximum occurrence of the extended element, or {@code null}.
*/
@Override
@ValueRange(minimum = 0)
@@ -435,7 +434,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the maximum occurrence of the extended element.
*
- * @param newValue The new maximum occurrence, or {@code null}.
+ * @param newValue the new maximum occurrence, or {@code null}.
* @throws IllegalArgumentException if the given value is negative.
*/
public void setMaximumOccurrence(final Integer newValue) {
@@ -452,7 +451,7 @@ public class DefaultExtendedElementInfor
* {@linkplain Datatype#CODE_LIST code list} or {@linkplain Datatype#CODE_LIST_ELEMENT
* code list element}.
*
- * @return Valid values that can be assigned to the extended element, or {@code null}.
+ * @return valid values that can be assigned to the extended element, or {@code null}.
*/
@Override
@XmlElement(name = "domainValue")
@@ -463,7 +462,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the valid values that can be assigned to the extended element.
*
- * @param newValue The new domain value.
+ * @param newValue the new domain value.
*/
public void setDomainValue(final InternationalString newValue) {
checkWritePermission();
@@ -474,7 +473,7 @@ public class DefaultExtendedElementInfor
* Name of the metadata entity(s) under which this extended metadata element may appear.
* The name(s) may be standard metadata element(s) or other extended metadata element(s).
*
- * @return Name of the metadata entity(s) under which this extended metadata element may appear.
+ * @return name of the metadata entity(s) under which this extended metadata element may appear.
*/
@Override
@XmlElement(name = "parentEntity", required = true)
@@ -485,7 +484,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the name of the metadata entity(s) under which this extended metadata element may appear.
*
- * @param newValues The new parent entity.
+ * @param newValues the new parent entity.
*/
public void setParentEntity(final Collection<? extends String> newValues) {
parentEntity = writeCollection(newValues, parentEntity, String.class);
@@ -494,7 +493,7 @@ public class DefaultExtendedElementInfor
/**
* Specifies how the extended element relates to other existing elements and entities.
*
- * @return How the extended element relates to other existing elements and entities, or {@code null}.
+ * @return how the extended element relates to other existing elements and entities, or {@code null}.
*/
@Override
@XmlElement(name = "rule", required = true)
@@ -505,7 +504,7 @@ public class DefaultExtendedElementInfor
/**
* Sets how the extended element relates to other existing elements and entities.
*
- * @param newValue The new rule.
+ * @param newValue the new rule.
*/
public void setRule(final InternationalString newValue) {
checkWritePermission();
@@ -515,7 +514,7 @@ public class DefaultExtendedElementInfor
/**
* Returns the reason for creating the extended element.
*
- * @return Reason for creating the extended element, or {@code null}.
+ * @return reason for creating the extended element, or {@code null}.
*
* @since 0.5
*/
@@ -527,7 +526,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the reason for creating the extended element.
*
- * @param newValue The new rationale.
+ * @param newValue the new rationale.
*
* @since 0.5
*/
@@ -539,7 +538,7 @@ public class DefaultExtendedElementInfor
/**
* @deprecated As of ISO 19115:2014, replaced by {@link #getRationale()}.
*
- * @return Reason for creating the extended element.
+ * @return reason for creating the extended element.
*/
@Override
@Deprecated
@@ -573,7 +572,7 @@ public class DefaultExtendedElementInfor
/**
* @deprecated As of ISO 19115:2014, replaced by {@link #setRationale(InternationalString)}.
*
- * @param newValues The new rationales.
+ * @param newValues the new rationales.
*/
@Deprecated
public void setRationales(final Collection<? extends InternationalString> newValues) {
@@ -584,7 +583,7 @@ public class DefaultExtendedElementInfor
/**
* Name of the person or organization creating the extended element.
*
- * @return Name of the person or organization creating the extended element.
+ * @return name of the person or organization creating the extended element.
*/
@Override
@XmlElement(name = "source", required = true)
@@ -595,7 +594,7 @@ public class DefaultExtendedElementInfor
/**
* Sets the name of the person or organization creating the extended element.
*
- * @param newValues The new sources.
+ * @param newValues the new sources.
*/
public void setSources(final Collection<? extends Responsibility> newValues) {
sources = writeCollection(newValues, sources, Responsibility.class);
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -41,6 +41,7 @@ import org.opengis.metadata.FeatureTypeL
* @version 0.3
* @module
*/
+@SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones.
@XmlType(propOrder = {
"spatialObject",
"spatialSchemaName"
@@ -71,7 +72,7 @@ public class DefaultFeatureTypeList exte
/**
* Creates a feature type list initialized to the given values.
*
- * @param spatialObject the instance of a type defined in the spatial schema, or {@code null} if none.
+ * @param spatialObject the instance of a type defined in the spatial schema, or {@code null} if none.
* @param spatialSchemaName the name of the spatial schema used, or {@code null} if none.
*/
public DefaultFeatureTypeList(final String spatialObject, final String spatialSchemaName) {
@@ -84,7 +85,7 @@ public class DefaultFeatureTypeList exte
* This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
* given object are not recursively copied.
*
- * @param object the metadata to copy values from, or {@code null} if none.
+ * @param object the metadata to copy values from, or {@code null} if none.
*
* @see #castOrCopy(FeatureTypeList)
*/
@@ -135,7 +136,7 @@ public class DefaultFeatureTypeList exte
/**
* Sets the instance of a type defined in the spatial schema.
*
- * @param newValue the new spatial object.
+ * @param newValue the new spatial object.
*/
public void setSpatialObject(final String newValue) {
checkWritePermission();
@@ -156,7 +157,7 @@ public class DefaultFeatureTypeList exte
/**
* Sets the name of the spatial schema used.
*
- * @param newValue the new spatial schema.
+ * @param newValue the new spatial schema.
*/
public void setSpatialSchemaName(final String newValue) {
checkWritePermission();
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java?rev=1779506&r1=1779505&r2=1779506&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] Thu Jan 19 18:46:44 2017
@@ -83,6 +83,7 @@ import org.apache.sis.internal.util.Cita
* @see ImmutableIdentifier
* @see org.apache.sis.referencing.IdentifiedObjects#toURN(Class, Identifier)
*/
+@SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones.
@XmlType(name = "MD_Identifier_Type", propOrder = {
"authority",
"code"
@@ -140,8 +141,7 @@ public class DefaultIdentifier extends I
/**
* Creates an identifier initialized to the given code.
*
- * @param code The alphanumeric value identifying an instance in the namespace,
- * or {@code null} if none.
+ * @param code the alphanumeric value identifying an instance in the namespace, or {@code null} if none.
*/
public DefaultIdentifier(final String code) {
this.code = code;
@@ -164,8 +164,8 @@ public class DefaultIdentifier extends I
* {@linkplain org.apache.sis.util.CharSequences#isUnicodeIdentifier(CharSequence) unicode identifier}.</li>
* </ol>
*
- * @param authority The the person or party responsible for maintenance of the namespace, or {@code null} if none.
- * @param code The alphanumeric value identifying an instance in the namespace, or {@code null} if none.
+ * @param authority the the person or party responsible for maintenance of the namespace, or {@code null} if none.
+ * @param code the alphanumeric value identifying an instance in the namespace, or {@code null} if none.
*
* @see org.apache.sis.metadata.iso.citation.Citations#getUnicodeIdentifier(Citation)
*/
@@ -180,7 +180,7 @@ public class DefaultIdentifier extends I
* This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
* given object are not recursively copied.
*
- * @param object The metadata to copy values from, or {@code null} if none.
+ * @param object the metadata to copy values from, or {@code null} if none.
*
* @see #castOrCopy(Identifier)
*/
@@ -209,8 +209,8 @@ public class DefaultIdentifier extends I
* metadata contained in the given object are not recursively copied.</li>
* </ul>
*
- * @param object The object to get as a SIS implementation, or {@code null} if none.
- * @return A SIS implementation containing the values of the given object (may be the
+ * @param object the object to get as a SIS implementation, or {@code null} if none.
+ * @return a SIS implementation containing the values of the given object (may be the
* given object itself), or {@code null} if the argument was null.
*/
public static DefaultIdentifier castOrCopy(final Identifier object) {
@@ -225,7 +225,7 @@ public class DefaultIdentifier extends I
* The organization's abbreviation is often the same than this identifier
* {@linkplain #getCodeSpace() code space}, but not necessarily.
*
- * @return Person or party responsible for maintenance of the namespace, or {@code null} if not available.
+ * @return person or party responsible for maintenance of the namespace, or {@code null} if not available.
*/
@Override
@XmlElement(name = "authority")
@@ -236,7 +236,7 @@ public class DefaultIdentifier extends I
/**
* Sets the person or party responsible for maintenance of the namespace.
*
- * @param newValue The new authority.
+ * @param newValue the new authority.
*/
public void setAuthority(final Citation newValue) {
checkWritePermission();
@@ -252,7 +252,7 @@ public class DefaultIdentifier extends I
* The code is mandatory according ISO specification, but this {@code DefaultIdentifier}
* implementation does not enforce this restriction.
*
- * @return Value identifying an instance in the namespace.
+ * @return value identifying an instance in the namespace.
*/
@Override
@XmlElement(name = "code", required = true)
@@ -264,7 +264,7 @@ public class DefaultIdentifier extends I
* Sets the alphanumeric value identifying an instance in the namespace.
* Should avoid characters that are not legal in URLs.
*
- * @param newValue The new code, or {@code null}.
+ * @param newValue the new code, or {@code null}.
*/
public void setCode(final String newValue) {
checkWritePermission();
@@ -277,7 +277,7 @@ public class DefaultIdentifier extends I
*
* <div class="note"><b>Example:</b> {@code "EPSG"}.</div>
*
- * @return The identifier or namespace in which the code is valid, or {@code null} if none.
+ * @return the identifier or namespace in which the code is valid, or {@code null} if none.
*
* @since 0.5
*/
@@ -289,7 +289,7 @@ public class DefaultIdentifier extends I
/**
* Sets the identifier or namespace in which the code is valid.
*
- * @param newValue The new code space, or {@code null} if none.
+ * @param newValue the new code space, or {@code null} if none.
*
* @since 0.5
*/
@@ -305,7 +305,7 @@ public class DefaultIdentifier extends I
*
* <div class="note"><b>Example:</b> the version of the underlying EPSG database.</div>
*
- * @return The version identifier for the namespace, or {@code null} if none.
+ * @return the version identifier for the namespace, or {@code null} if none.
*/
@Override
public String getVersion() {
@@ -315,7 +315,7 @@ public class DefaultIdentifier extends I
/**
* Sets the version identifier for the namespace.
*
- * @param newValue The new version, or {@code null} if none.
+ * @param newValue the new version, or {@code null} if none.
*/
public void setVersion(final String newValue) {
checkWritePermission();
@@ -327,7 +327,7 @@ public class DefaultIdentifier extends I
*
* <div class="note"><b>Example:</b> "World Geodetic System 1984".</div>
*
- * @return The natural language description, or {@code null} if none.
+ * @return the natural language description, or {@code null} if none.
*
* @since 0.5
*/
@@ -339,7 +339,7 @@ public class DefaultIdentifier extends I
/**
* Sets the natural language description of the meaning of the code value.
*
- * @param newValue The new natural language description, or {@code null} if none.
+ * @param newValue the new natural language description, or {@code null} if none.
*
* @since 0.5
*/