sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1763840 [1/12] - in /sis/branches/JDK7: ./ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-feature/src/main/java/org/apache/sis/feature/builder/ core/sis-feature/src/main/java/org/apache/sis/internal/feature/ core/sis...
Date Fri, 07 Oct 2016 21:35:45 GMT
Author: desruisseaux
Date: Fri Oct  7 21:35:43 2016
New Revision: 1763840

URL: http://svn.apache.org/viewvc?rev=1763840&view=rev
Log:
Merge from the JDK8 branch.

Added:
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources.java
      - copied unchanged from r1763833, sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources.properties
      - copied unchanged from r1763833, sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources.properties
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources_fr.properties
      - copied unchanged from r1763833, sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources_fr.properties
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
      - copied unchanged from r1763833, sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
      - copied unchanged from r1763833, sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
      - copied unchanged from r1763833, sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/IntSupplier.java   (with props)
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/PackedVector.java
      - copied, changed from r1763833, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/PackedVector.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/
      - copied from r1763833, sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.properties
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.properties
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources_fr.properties
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources_fr.properties
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/LogAdapter.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/LogAdapter.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/GenericNameMap.java
      - copied, changed from r1763833, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/GenericNameMap.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.properties
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.properties
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources_fr.properties
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources_fr.properties
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalNameException.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalNameException.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/GenericNameMapTest.java
      - copied unchanged from r1763833, sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/GenericNameMapTest.java
Removed:
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/AttributeTest.java
Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/pom.xml
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGParameterDomain.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/SignReversalComment.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineMatrix.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ImmutableAffineTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.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/DefaultParameterValueGroup.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.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/TensorValues.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.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/EPSGFactoryFallback.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.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/CoordinateSystems.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/DefaultEllipsoidalCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.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/factory/AuthorityFactoryIdentifier.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.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/Matrices.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Solver.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/EqualAreaProjection.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ProjectionException.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DatumShiftTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
    sis/branches/JDK7/core/sis-utility/pom.xml
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeType.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.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/Constants.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ConcatenatedVector.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/SequenceVector.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/MeasurementRange.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.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/util/ArgumentChecks.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/Numbers.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.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/Names.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java
    sis/branches/JDK7/ide-project/NetBeans/build.xml
    sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
    sis/branches/JDK7/pom.xml
    sis/branches/JDK7/storage/pom.xml
    sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
    sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
    sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Dimension.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.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-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridGeometryTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfoTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
    sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataOutput.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelImageOutputStream.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MemoryDataTransfer.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 21:35:43 2016
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1760700
+/sis/branches/JDK8:1584960-1763833
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/pom.xml?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/pom.xml (original)
+++ sis/branches/JDK7/core/pom.xml Fri Oct  7 21:35:43 2016
@@ -142,7 +142,8 @@
   <build>
     <plugins>
 
-      <!-- Collect JAR files in <root>/target/binaries directory. -->
+      <!-- Compile properties files into resources UTF files and
+           collect JAR files in <root>/target/binaries directory. -->
       <plugin>
         <groupId>org.apache.sis.core</groupId>
         <artifactId>sis-build-helper</artifactId>
@@ -150,6 +151,7 @@
         <executions>
           <execution>
             <goals>
+              <goal>compile-resources</goal>
               <goal>collect-jars</goal>
             </goals>
           </execution>

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -23,7 +23,7 @@ import org.opengis.util.GenericName;
 import org.opengis.metadata.quality.DataQuality;
 import org.apache.sis.util.Debug;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
 import org.opengis.feature.Feature;
@@ -193,7 +193,7 @@ public abstract class AbstractAssociatio
     final void ensureValid(final FeatureType base, final FeatureType type) {
         if (base != type && !DefaultFeatureType.maybeAssignableFrom(base, type)) {
             throw new InvalidPropertyValueException(
-                    Errors.format(Errors.Keys.IllegalArgumentClass_3, getName(), base.getName(), type.getName()));
+                    Resources.format(Resources.Keys.IllegalFeatureType_3, getName(), base.getName(), type.getName()));
         }
     }
 

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -28,6 +28,7 @@ import org.apache.sis.util.resources.Err
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.CorruptedObjectException;
 import org.apache.sis.internal.util.CheckedArrayList;
+import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
 import java.util.Objects;
@@ -41,6 +42,7 @@ import org.opengis.feature.Feature;
 import org.opengis.feature.FeatureType;
 import org.opengis.feature.FeatureAssociation;
 import org.opengis.feature.FeatureAssociationRole;
+import org.opengis.feature.IdentifiedType;
 import org.opengis.feature.Operation;
 
 
@@ -199,7 +201,7 @@ public abstract class AbstractFeature im
         final String name = property.getName().toString();
         verifyPropertyType(name, property);
         if (property instanceof Attribute<?> && !Containers.isNullOrEmpty(((Attribute<?>) property).characteristics())) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.CanNotAssignCharacteristics_1, name));
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.CanNotAssignCharacteristics_1, name));
         }
         setPropertyValue(name, property.getValue());
     }
@@ -286,7 +288,7 @@ public abstract class AbstractFeature im
             if (result != null) {
                 setPropertyValue(result, value);
             } else {
-                throw new IllegalStateException(Errors.format(Errors.Keys.CanNotSetPropertyValue_1, name));
+                throw new IllegalStateException(Resources.format(Resources.Keys.CanNotSetPropertyValue_1, name));
             }
         }
     }
@@ -436,7 +438,7 @@ public abstract class AbstractFeature im
                     } while ((element = it.next()) == null || base.isInstance(element));
                     // Found an illegal value. Exeption is thrown below.
                 }
-                throw illegalValueClass(attribute.getName(), element); // 'element' can not be null here.
+                throw illegalValueClass(pt, base, element);         // 'element' can not be null here.
             }
         }
         ((Attribute) attribute).setValue(value);
@@ -454,14 +456,14 @@ public abstract class AbstractFeature im
             if (value instanceof Feature) {
                 final FeatureType actual = ((Feature) value).getType();
                 if (base != actual && !DefaultFeatureType.maybeAssignableFrom(base, actual)) {
-                    throw illegalPropertyType(role.getName(), actual.getName());
+                    throw illegalFeatureType(role, base, actual);
                 }
             } else if (value instanceof Collection<?>) {
                 verifyAssociationValues(role, (Collection<?>) value);
                 association.setValues((Collection<? extends Feature>) value);
-                return; // Skip the setter at the end of this method.
+                return;                                 // Skip the setter at the end of this method.
             } else {
-                throw illegalValueClass(association.getName(), value);
+                throw illegalValueClass(role, Feature.class, value);
             }
         }
         association.setValue((Feature) value);
@@ -502,20 +504,20 @@ public abstract class AbstractFeature im
         } else if (property instanceof FeatureAssociation) {
             pt = ((FeatureAssociation) property).getRole();
         } else {
-            throw illegalPropertyType(base.getName(), property.getClass());
+            throw new InvalidPropertyValueException(Resources.format(Resources.Keys.IllegalPropertyType_2, base.getName(), property.getClass()));
         }
         if (pt != base) {
             if (base == null) {
-                throw new PropertyNotFoundException(Errors.format(Errors.Keys.PropertyNotFound_2, getName(), name));
+                throw new PropertyNotFoundException(Resources.format(Resources.Keys.PropertyNotFound_2, getName(), name));
             } else {
-                throw new InvalidPropertyValueException(Errors.format(Errors.Keys.MismatchedPropertyType_1, name));
+                throw new InvalidPropertyValueException(Resources.format(Resources.Keys.MismatchedPropertyType_1, name));
             }
         }
     }
 
     /**
-     * Verifies the validity of the given value for the property of the given name, then returns the value
-     * to store. The returned value is usually the same than the given one, except in the case of collections.
+     * Verifies the validity of the given value for the property of the given name, then returns the value to store.
+     * The returned value is usually the same than the given one, except in the case of collections.
      */
     final Object verifyPropertyValue(final String name, final Object value) {
         final PropertyType pt = type.getProperty(name);
@@ -551,7 +553,7 @@ public abstract class AbstractFeature im
         } else if (!isSingleton && value instanceof Collection<?>) {
             return CheckedArrayList.castOrCopy((Collection<?>) value, valueClass);
         } else {
-            throw illegalValueClass(type.getName(), value);
+            throw illegalValueClass(type, valueClass, value);
         }
     }
 
@@ -577,13 +579,13 @@ public abstract class AbstractFeature im
             if (base == valueType || DefaultFeatureType.maybeAssignableFrom(base, valueType)) {
                 return isSingleton ? value : singletonList(Feature.class, role.getMinimumOccurs(), value);
             } else {
-                throw illegalPropertyType(role.getName(), valueType.getName());
+                throw illegalFeatureType(role, base, valueType);
             }
         } else if (!isSingleton && value instanceof Collection<?>) {
             verifyAssociationValues(role, (Collection<?>) value);
             return CheckedArrayList.castOrCopy((Collection<?>) value, Feature.class);
         } else {
-            throw illegalValueClass(role.getName(), value);
+            throw illegalValueClass(role, Feature.class, value);
         }
     }
 
@@ -596,11 +598,11 @@ public abstract class AbstractFeature im
         for (final Object value : values) {
             ArgumentChecks.ensureNonNullElement("values", index, value);
             if (!(value instanceof Feature)) {
-                throw illegalValueClass(role.getName(), value);
+                throw illegalValueClass(role, Feature.class, value);
             }
             final FeatureType type = ((Feature) value).getType();
             if (base != type && !DefaultFeatureType.maybeAssignableFrom(base, type)) {
-                throw illegalPropertyType(role.getName(), type.getName());
+                throw illegalFeatureType(role, base, type);
             }
             index++;
         }
@@ -613,7 +615,7 @@ public abstract class AbstractFeature im
     @SuppressWarnings("unchecked")
     private static <V> Collection<V> singletonList(final Class<V> valueClass, final int minimumOccurs, final Object value) {
         final CheckedArrayList<V> values = new CheckedArrayList<>(valueClass, Math.max(minimumOccurs, 4));
-        values.add((V) value); // Type will be checked by CheckedArrayList.
+        values.add((V) value);                              // Type will be checked by CheckedArrayList.
         return values;
     }
 
@@ -623,23 +625,29 @@ public abstract class AbstractFeature im
      * but that property can not be stored in or extracted from a {@link Property} instance.
      */
     static IllegalArgumentException unsupportedPropertyType(final GenericName name) {
-        return new IllegalArgumentException(Errors.format(Errors.Keys.CanNotInstantiate_1, name));
+        return new IllegalArgumentException(Resources.format(Resources.Keys.CanNotInstantiateProperty_1, name));
     }
 
     /**
      * Returns the exception for a property value of wrong Java class.
      *
-     * @param value The value, which shall be non-null.
+     * @param  value  the value, which shall be non-null.
      */
-    private static ClassCastException illegalValueClass(final GenericName name, final Object value) {
-        return new ClassCastException(Errors.format(Errors.Keys.IllegalPropertyValueClass_2, name, value.getClass()));
+    private static ClassCastException illegalValueClass(
+            final IdentifiedType property, final Class<?> expected, final Object value)
+    {
+        return new ClassCastException(Resources.format(Resources.Keys.IllegalPropertyValueClass_3,
+                property.getName(), expected, value.getClass()));
     }
 
     /**
-     * Returns the exception for a property value (usually a feature) of wrong type.
+     * Returns the exception for an association value of wrong type.
      */
-    private static InvalidPropertyValueException illegalPropertyType(final GenericName name, final Object value) {
-        return new InvalidPropertyValueException(Errors.format(Errors.Keys.IllegalPropertyValueClass_2, name, value));
+    private static InvalidPropertyValueException illegalFeatureType(
+            final FeatureAssociationRole association, final FeatureType expected, final FeatureType actual)
+    {
+        return new InvalidPropertyValueException(Resources.format(Resources.Keys.IllegalFeatureType_3,
+                association.getName(), expected.getName(), actual.getName()));
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -19,10 +19,10 @@ package org.apache.sis.feature;
 import java.util.Map;
 import org.opengis.util.GenericName;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.internal.util.Cloner;
 import org.apache.sis.internal.util.AbstractMap;
 import org.apache.sis.internal.util.AbstractMapEntry;
+import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
 import org.opengis.feature.Attribute;
@@ -59,8 +59,8 @@ final class CharacteristicMap extends Ab
     /**
      * Creates an initially empty map of attribute characteristics.
      *
-     * @param source The attribute which is characterized by {@code characterizedBy}.
-     * @param characterizedBy Description of the characteristics of {@code source}.
+     * @param  source  the attribute which is characterized by {@code characterizedBy}.
+     * @param  characterizedBy  description of the characteristics of {@code source}.
      */
     CharacteristicMap(final Attribute<?> source, final CharacteristicTypeMap types) {
         this.source = source;
@@ -70,7 +70,7 @@ final class CharacteristicMap extends Ab
     /**
      * Returns a copy of this map. Characteristics are also cloned.
      *
-     * @return A copy of this map.
+     * @return a copy of this map.
      */
     @Override
     public CharacteristicMap clone() throws CloneNotSupportedException {
@@ -166,15 +166,16 @@ final class CharacteristicMap extends Ab
     /**
      * Returns the index for the characteristic of the given name.
      *
-     * @param  key The name for which to get the characteristic index.
-     * @return The index for the characteristic of the given name.
+     * @param  key  the name for which to get the characteristic index.
+     * @return the index for the characteristic of the given name.
      * @throws PropertyNotFoundException if the given key is not the name of a characteristic in this map.
      */
     private int indexOf(final String key) {
         ArgumentChecks.ensureNonNull("key", key);
         final Integer index = types.indices.get(key);
         if (index == null) {
-            throw new PropertyNotFoundException(Errors.format(Errors.Keys.PropertyNotFound_2, source.getName(), key));
+            throw new PropertyNotFoundException(Resources.format(
+                    Resources.Keys.CharacteristicsNotFound_2, source.getName(), key));
         }
         return index;
     }
@@ -184,8 +185,8 @@ final class CharacteristicMap extends Ab
      * If the given instance is not the expected one, then an {@link IllegalArgumentException}
      * will be thrown with an error message formatted using the name of expected and given types.
      *
-     * @param index Index of the expected attribute type.
-     * @param type  The actual attribute type.
+     * @param  index  index of the expected attribute type.
+     * @param  type   the actual attribute type.
      */
     final void verifyAttributeType(final int index, final AttributeType<?> type) {
         final AttributeType<?> expected = types.characterizedBy[index];
@@ -193,15 +194,15 @@ final class CharacteristicMap extends Ab
             final GenericName en = expected.getName();
             final GenericName an = type.getName();
             throw new InvalidPropertyValueException(String.valueOf(en).equals(String.valueOf(an))
-                    ? Errors.format(Errors.Keys.MismatchedPropertyType_1, en)
-                    : Errors.format(Errors.Keys.CanNotAssign_2, en.push(source.getName()), an));
+                    ? Resources.format(Resources.Keys.MismatchedPropertyType_1, en)
+                    : Resources.format(Resources.Keys.CanNotSetCharacteristics_2, en.push(source.getName()), an));
         }
     }
 
     /**
      * Sets the attribute characteristic for the given name.
      *
-     * @param  key The name of the characteristic to set.
+     * @param  key  the name of the characteristic to set.
      * @throws IllegalArgumentException if the given key is not the name of a characteristic in this map.
      */
     @Override
@@ -221,7 +222,7 @@ final class CharacteristicMap extends Ab
      * If no characteristic exists for the given name and that name is valid,
      * creates a new map entry with a default {@code Attribute} characteristic.
      *
-     * @param  name The name of the characteristic to create, if it does not already exist.
+     * @param  name  the name of the characteristic to create, if it does not already exist.
      * @return {@code true} if a new characteristic has been created for the given name.
      * @throws IllegalArgumentException if the given key is not the name of a characteristic in this map.
      */
@@ -241,7 +242,7 @@ final class CharacteristicMap extends Ab
     /**
      * Adds the given characteristic if none is currently associated for the same characteristic name.
      *
-     * @param  value The characteristic to add.
+     * @param  value  the characteristic to add.
      * @return {@code true} if the characteristic has been added.
      * @throws IllegalArgumentException if given characteristic is not valid for this map.
      * @throws IllegalStateException if another characteristic already exists for the characteristic name.
@@ -261,8 +262,8 @@ final class CharacteristicMap extends Ab
         } else if (previous.equals(value)) {
             return false;
         } else {
-            throw new IllegalStateException(Errors.format(
-                    Errors.Keys.PropertyAlreadyExists_2, source.getName(), value.getName()));
+            throw new IllegalStateException(Resources.format(
+                    Resources.Keys.CharacteristicsAlreadyExists_2, source.getName(), value.getName()));
         }
     }
 

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.IdentityHashMap;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.feature.Resources;
 import org.apache.sis.util.Debug;
 
 import static org.apache.sis.util.ArgumentChecks.*;
@@ -356,7 +356,7 @@ public class DefaultAssociationRole exte
         if (type instanceof NamedFeatureType) {
             type = ((NamedFeatureType) type).resolved;
             if (type == null) {
-                throw new IllegalStateException(Errors.format(Errors.Keys.UnresolvedFeatureName_1, getName()));
+                throw new IllegalStateException(Resources.format(Resources.Keys.UnresolvedFeatureName_1, getName()));
             }
             valueType = type;
         }

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=1763840&r1=1763839&r2=1763840&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 Oct  7 21:35:43 2016
@@ -34,10 +34,10 @@ import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.internal.util.CollectionsExt;
 import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
 import java.util.Objects;
@@ -262,7 +262,7 @@ public class DefaultFeatureType extends
             for (final FeatureType type : this.superTypes) {
                 if (type instanceof NamedFeatureType) {
                     // Hierarchy of feature types can not be cyclic.
-                    throw new IllegalArgumentException(Errors.format(Errors.Keys.UnresolvedFeatureName_1, type.getName()));
+                    throw new IllegalArgumentException(Resources.format(Resources.Keys.UnresolvedFeatureName_1, type.getName()));
                 }
             }
         }
@@ -292,7 +292,7 @@ public class DefaultFeatureType extends
             if (property instanceof AbstractOperation) {
                 for (final String dependency : ((AbstractOperation) property).getDependencies()) {
                     if (!byName.containsKey(dependency)) {
-                        throw new IllegalArgumentException(Errors.format(Errors.Keys.DependencyNotFound_3,
+                        throw new IllegalArgumentException(Resources.format(Resources.Keys.DependencyNotFound_3,
                                 property.getName(), dependency, super.getName()));
                     }
                 }
@@ -382,7 +382,7 @@ public class DefaultFeatureType extends
         }
         /*
          * If some properties use long name of the form "head:tip", creates short aliases containing only the "tip"
-         * name for convenience, provided that it does not create ambiguity. If an short alias could map to two or
+         * name for convenience, provided that it does not create ambiguity.  If a short alias could map to two or
          * more properties, then this alias is not added.
          *
          * In the 'aliases' map below, null values will be assigned to ambiguous short names.
@@ -471,7 +471,7 @@ public class DefaultFeatureType extends
                     }
                 } else if (!isAssignableIgnoreName(previous, property)) {
                     final GenericName owner = ownerOf(this, sourceProperties, previous);
-                    throw new IllegalArgumentException(Errors.format(Errors.Keys.PropertyAlreadyExists_2,
+                    throw new IllegalArgumentException(Resources.format(Resources.Keys.PropertyAlreadyExists_2,
                             (owner != null) ? owner : "?", name));
                 }
             }
@@ -585,7 +585,7 @@ public class DefaultFeatureType extends
      *
      * @see #OPERATION_INDEX
      */
-    private static boolean isParameterlessOperation(final PropertyType type) {
+    static boolean isParameterlessOperation(final PropertyType type) {
         if (type instanceof Operation) {
             final ParameterDescriptorGroup parameters = ((Operation) type).getParameters();
             return ((parameters == null) || parameters.descriptors().isEmpty())
@@ -814,7 +814,7 @@ public class DefaultFeatureType extends
         if (pt != null) {
             return pt;
         }
-        throw new PropertyNotFoundException(Errors.format(Errors.Keys.PropertyNotFound_2, getName(), name));
+        throw new PropertyNotFoundException(Resources.format(Resources.Keys.PropertyNotFound_2, getName(), name));
     }
 
     /**
@@ -839,7 +839,7 @@ public class DefaultFeatureType extends
     @Override
     public Feature newInstance() throws FeatureInstantiationException {
         if (isAbstract) {
-            throw new FeatureInstantiationException(Errors.format(Errors.Keys.AbstractType_1, getName()));
+            throw new FeatureInstantiationException(Resources.format(Resources.Keys.AbstractFeatureType_1, getName()));
         }
         return isSparse ? new SparseFeature(this) : new DenseFeature(this);
     }

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -20,9 +20,9 @@ import java.util.Map;
 import java.util.Arrays;
 import org.opengis.metadata.maintenance.ScopeCode;
 import org.opengis.metadata.quality.DataQuality;
+import org.apache.sis.internal.feature.Resources;
 import org.apache.sis.internal.util.Cloner;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.resources.Errors;
 
 // Branch-dependent imports
 import org.opengis.feature.Property;
@@ -92,7 +92,7 @@ final class DenseFeature extends Abstrac
         if (index != null) {
             return index;
         }
-        throw new PropertyNotFoundException(Errors.format(Errors.Keys.PropertyNotFound_2, getName(), name));
+        throw new PropertyNotFoundException(Resources.format(Resources.Keys.PropertyNotFound_2, getName(), name));
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -116,8 +116,8 @@ public class FeatureFormat extends Tabul
     /**
      * Creates a new formatter for the given locale and timezone.
      *
-     * @param locale   The locale, or {@code null} for {@code Locale.ROOT}.
-     * @param timezone The timezone, or {@code null} for UTC.
+     * @param  locale    the locale, or {@code null} for {@code Locale.ROOT}.
+     * @param  timezone  the timezone, or {@code null} for UTC.
      */
     public FeatureFormat(final Locale locale, final TimeZone timezone) {
         super(locale, timezone);
@@ -144,8 +144,8 @@ public class FeatureFormat extends Tabul
      *   <li>{@link java.util.Locale.Category#DISPLAY} specifies the locale to use for labels.</li>
      * </ul>
      *
-     * @param  category The category for which a locale is desired.
-     * @return The locale for the given category (never {@code null}).
+     * @param  category  the category for which a locale is desired.
+     * @return the locale for the given category (never {@code null}).
      */
     @Override
     public Locale getLocale(final Locale.Category category) {
@@ -169,7 +169,7 @@ public class FeatureFormat extends Tabul
      *   <li>{@link FeatureType}</li>
      * </ul>
      *
-     * @throws IOException If an error occurred while writing to the given appendable.
+     * @throws IOException if an error occurred while writing to the given appendable.
      */
     @Override
     public void format(final Object object, final Appendable toAppendTo) throws IOException {
@@ -253,6 +253,12 @@ header: for (int i=0; ; i++) {
         for (final PropertyType propertyType : featureType.getProperties(true)) {
             Object value = null;
             if (feature != null) {
+                if (!(propertyType instanceof AttributeType<?>) &&
+                    !(propertyType instanceof FeatureAssociationRole) &&
+                    !DefaultFeatureType.isParameterlessOperation(propertyType))
+                {
+                    continue;
+                }
                 value = feature.getPropertyValue(propertyType.getName().toString());
                 if (value == null) {
                     if (propertyType instanceof AttributeType &&
@@ -295,7 +301,7 @@ header: for (int i=0; ; i++) {
             final int minimumOccurs, maximumOccurs;         // Negative values mean no cardinality.
             final IdentifiedType resultType;                // Result of operation if applicable.
             if (propertyType instanceof Operation) {
-                resultType = ((Operation) propertyType).getResult();
+                resultType = ((Operation) propertyType).getResult();                // May be null
             } else {
                 resultType = propertyType;
             }
@@ -313,7 +319,7 @@ header: for (int i=0; ; i++) {
                 valueType     = toString(DefaultAssociationRole.getValueTypeName(pt));
                 valueClass    = Feature.class;
             } else {
-                valueType  = toString(resultType.getName());
+                valueType  = (resultType != null) ? toString(resultType.getName()) : "";
                 valueClass = null;
                 minimumOccurs = -1;
                 maximumOccurs = -1;
@@ -456,7 +462,7 @@ header: for (int i=0; ; i++) {
      * Not yet supported.
      *
      * @return Currently never return.
-     * @throws ParseException Currently always thrown.
+     * @throws ParseException currently always thrown.
      */
     @Override
     public Object parse(final CharSequence text, final ParsePosition pos) throws ParseException {

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -25,9 +25,9 @@ import org.opengis.metadata.quality.Data
 import org.opengis.metadata.quality.Element;
 import org.opengis.metadata.quality.Result;
 import org.apache.sis.util.Static;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.iso.DefaultNameFactory;
 import org.apache.sis.internal.system.DefaultFactories;
+import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
 import org.opengis.feature.Attribute;
@@ -78,7 +78,7 @@ public final class Features extends Stat
             // We require a strict equality - not type.isAssignableFrom(actual) - because in
             // the later case we could have (to be strict) to return a <? extends V> type.
             if (!valueClass.equals(actual)) {
-                throw new ClassCastException(Errors.format(Errors.Keys.MismatchedValueClass_3,
+                throw new ClassCastException(Resources.format(Resources.Keys.MismatchedValueClass_3,
                         type.getName(), valueClass, actual));
             }
         }
@@ -107,7 +107,7 @@ public final class Features extends Stat
             // We require a strict equality - not type.isAssignableFrom(actual) - because in
             // the later case we could have (to be strict) to return a <? extends V> type.
             if (!valueClass.equals(actual)) {
-                throw new ClassCastException(Errors.format(Errors.Keys.MismatchedValueClass_3,
+                throw new ClassCastException(Resources.format(Resources.Keys.MismatchedValueClass_3,
                         attribute.getName(), valueClass, actual));
             }
         }

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -57,7 +57,7 @@ abstract class Field<V> implements Prope
     /**
      * Returns the field feature or attribute value, or {@code null} if none.
      *
-     * @return The feature or attribute value (may be {@code null}).
+     * @return the feature or attribute value (may be {@code null}).
      * @throws MultiValuedPropertyException if this field contains more than one value.
      *
      * @see AbstractFeature#getPropertyValue(String)
@@ -70,7 +70,7 @@ abstract class Field<V> implements Prope
      * The returned collection is <cite>live</cite>: changes in the returned collection
      * will be reflected immediately in this {@code Field} instance, and conversely.
      *
-     * @return The features or attribute values in a <cite>live</cite> collection.
+     * @return the features or attribute values in a <cite>live</cite> collection.
      */
     public Collection<V> getValues() {
         return new PropertySingleton<>(this);
@@ -79,7 +79,7 @@ abstract class Field<V> implements Prope
     /**
      * Sets the feature or attribute value. All previous values are replaced by the given singleton.
      *
-     * @param value The new value, or {@code null} for removing all values from this field.
+     * @param  value  the new value, or {@code null} for removing all values from this field.
      *
      * @see AbstractFeature#setPropertyValue(String, Object)
      */
@@ -91,7 +91,7 @@ abstract class Field<V> implements Prope
      * <p>The default implementation ensures that the given collection contains at most one element,
      * then delegates to {@link #setValue(Object)}.</p>
      *
-     * @param values The new values.
+     * @param  values  the new values.
      * @throws InvalidPropertyValueException if the given collection contains too many elements.
      */
     public void setValues(final Collection<? extends V> values) throws InvalidPropertyValueException {

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -19,7 +19,7 @@ package org.apache.sis.feature;
 import java.util.Collection;
 import org.apache.sis.internal.util.CheckedArrayList;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
 import org.opengis.feature.Feature;
@@ -97,7 +97,7 @@ final class MultiValuedAssociation exten
         switch (values.size()) {
             case 0:  return null;
             case 1:  return values.get(0);
-            default: throw new MultiValuedPropertyException(Errors.format(Errors.Keys.NotASingleton_1, getName()));
+            default: throw new MultiValuedPropertyException(Resources.format(Resources.Keys.NotASingleton_1, getName()));
         }
     }
 
@@ -109,6 +109,7 @@ final class MultiValuedAssociation exten
      * @return The features in a <cite>live</cite> collection.
      */
     @Override
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")
     public Collection<Feature> getValues() {
         return values;
     }

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -21,6 +21,7 @@ import org.apache.sis.internal.util.Chec
 import org.apache.sis.util.collection.CheckedContainer;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
 import org.opengis.feature.AttributeType;
@@ -67,7 +68,7 @@ final class MultiValuedAttribute<V> exte
      * Creates a new attribute of the given type initialized to the
      * {@linkplain DefaultAttributeType#getDefaultValue() default value}.
      *
-     * @param type Information about the attribute (base Java class, domain of values, <i>etc.</i>).
+     * @param  type  information about the attribute (base Java class, domain of values, <i>etc.</i>).
      */
     public MultiValuedAttribute(final AttributeType<V> type) {
         super(type);
@@ -82,8 +83,8 @@ final class MultiValuedAttribute<V> exte
      * Creates a new attribute of the given type initialized to the given values.
      * Note that a {@code null} value may not be the same as the default value.
      *
-     * @param type   Information about the attribute (base Java class, domain of values, <i>etc.</i>).
-     * @param values The initial values, or {@code null} for initializing to an empty list.
+     * @param  type    information about the attribute (base Java class, domain of values, <i>etc.</i>).
+     * @param  values  the initial values, or {@code null} for initializing to an empty list.
      */
     @SuppressWarnings("unchecked")
     MultiValuedAttribute(final AttributeType<V> type, final Object values) {
@@ -104,7 +105,7 @@ final class MultiValuedAttribute<V> exte
     /**
      * Returns the attribute value, or {@code null} if none.
      *
-     * @return The attribute value (may be {@code null}).
+     * @return the attribute value (may be {@code null}).
      * @throws MultiValuedPropertyException if this attribute contains more than one value.
      */
     @Override
@@ -112,7 +113,7 @@ final class MultiValuedAttribute<V> exte
         switch (values.size()) {
             case 0:  return null;
             case 1:  return values.get(0);
-            default: throw new MultiValuedPropertyException(Errors.format(Errors.Keys.NotASingleton_1, getName()));
+            default: throw new MultiValuedPropertyException(Resources.format(Resources.Keys.NotASingleton_1, getName()));
         }
     }
 
@@ -121,7 +122,7 @@ final class MultiValuedAttribute<V> exte
      * The returned collection is <cite>live</cite>: changes in the returned collection
      * will be reflected immediately in this {@code Attribute} instance, and conversely.
      *
-     * @return The attribute values in a <cite>live</cite> collection.
+     * @return the attribute values in a <cite>live</cite> collection.
      */
     @Override
     @SuppressWarnings("ReturnOfCollectionOrArrayField")
@@ -132,7 +133,7 @@ final class MultiValuedAttribute<V> exte
     /**
      * Sets the attribute value.
      *
-     * @param value The new value, or {@code null} for removing all values from this attribute.
+     * @param  value  the new value, or {@code null} for removing all values from this attribute.
      */
     @Override
     public void setValue(final V value) {
@@ -145,7 +146,7 @@ final class MultiValuedAttribute<V> exte
     /**
      * Sets the attribute values. All previous values are replaced by the given collection.
      *
-     * @param newValues The new values.
+     * @param  newValues  the new values.
      */
     @Override
     public void setValues(final Collection<? extends V> newValues) {
@@ -161,7 +162,7 @@ final class MultiValuedAttribute<V> exte
      * This implementation returns a <em>shallow</em> copy:
      * the attribute {@linkplain #getValues() values} are <strong>not</strong> cloned.
      *
-     * @return A clone of this attribute.
+     * @return a clone of this attribute.
      * @throws CloneNotSupportedException if this attribute can not be cloned.
      */
     @Override
@@ -175,7 +176,7 @@ final class MultiValuedAttribute<V> exte
     /**
      * Returns a hash code value for this attribute.
      *
-     * @return A hash code value.
+     * @return a hash code value.
      */
     @Override
     public int hashCode() {

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -27,7 +27,7 @@ import org.opengis.feature.PropertyNotFo
 import org.opengis.feature.FeatureInstantiationException;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.feature.Resources;
 
 
 /**
@@ -100,7 +100,7 @@ final class NamedFeatureType implements
      */
     @Override
     public PropertyType getProperty(final String name) throws PropertyNotFoundException {
-        throw new PropertyNotFoundException(Errors.format(Errors.Keys.PropertyNotFound_2, getName(), name));
+        throw new PropertyNotFoundException(Resources.format(Resources.Keys.PropertyNotFound_2, getName(), name));
     }
 
     /**
@@ -142,7 +142,7 @@ final class NamedFeatureType implements
      */
     @Override
     public Feature newInstance() throws FeatureInstantiationException {
-        throw new FeatureInstantiationException(Errors.format(Errors.Keys.UnresolvedFeatureName_1, getName()));
+        throw new FeatureInstantiationException(Resources.format(Resources.Keys.UnresolvedFeatureName_1, getName()));
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -155,7 +155,7 @@ final class PropertySingleton<V> extends
      * Removes the singleton value, if presents.
      * This method is for {@link Iter#remove()} implementation only.
      *
-     * @param  c The expected {@link #modCount} value, for check against concurrent modification.
+     * @param  c  the expected {@link #modCount} value, for check against concurrent modification.
      */
     final void clear(final int c) {
         if (c != modCount) {

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -25,6 +25,7 @@ import org.apache.sis.util.collection.Ch
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.Debug;
+import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
 import java.util.Objects;
@@ -120,7 +121,7 @@ abstract class PropertyView<V> extends F
             }
             value = it.next();
             if (it.hasNext()) {
-                throw new MultiValuedPropertyException(Errors.format(Errors.Keys.NotASingleton_1, name));
+                throw new MultiValuedPropertyException(Resources.format(Resources.Keys.NotASingleton_1, name));
             }
         }
         return getValueClass().cast(value);

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -21,10 +21,10 @@ import java.util.HashMap;
 import java.util.ConcurrentModificationException;
 import org.opengis.metadata.maintenance.ScopeCode;
 import org.opengis.metadata.quality.DataQuality;
+import org.apache.sis.internal.feature.Resources;
 import org.apache.sis.internal.util.Cloner;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.CorruptedObjectException;
-import org.apache.sis.util.resources.Errors;
 
 // Branch-dependent imports
 import java.util.Objects;
@@ -127,7 +127,7 @@ final class SparseFeature extends Abstra
         if (index != null) {
             return index;
         }
-        throw new PropertyNotFoundException(Errors.format(Errors.Keys.PropertyNotFound_2, getName(), name));
+        throw new PropertyNotFoundException(Resources.format(Resources.Keys.PropertyNotFound_2, getName(), name));
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -24,6 +24,7 @@ import org.opengis.parameter.ParameterDe
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.util.GenericName;
 import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.internal.feature.Resources;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ObjectConverter;
 import org.apache.sis.util.ObjectConverters;
@@ -146,13 +147,13 @@ final class StringJoinOperation extends
                 attributeType = ((Operation) attributeType).getResult();
             }
             if (!(attributeType instanceof AttributeType)) {
-                throw new IllegalArgumentException(Errors.getResources(identification)
-                        .getString(Errors.Keys.IllegalPropertyType_2, name,
-                        Classes.getLeafInterfaces(attributeType.getClass(), PropertyType.class)[0]));
+                final Class<?>[] inf = Classes.getLeafInterfaces(Classes.getClass(attributeType), PropertyType.class);
+                throw new IllegalArgumentException(Resources.forProperties(identification)
+                        .getString(Resources.Keys.IllegalPropertyType_2, name, (inf.length != 0) ? inf[0] : null));
             }
             if (((AttributeType<?>) attributeType).getMaximumOccurs() > 1) {
-                throw new IllegalArgumentException(Errors.getResources(identification)
-                        .getString(Errors.Keys.NotASingleton_1, name));
+                throw new IllegalArgumentException(Resources.forProperties(identification)
+                        .getString(Resources.Keys.NotASingleton_1, name));
             }
             /*
              * StringJoinOperation does not need to keep the AttributeType references.
@@ -297,7 +298,7 @@ final class StringJoinOperation extends
                     throw e;
                 }
                 throw new UnconvertibleObjectException(Errors.format(
-                        Errors.Keys.IllegalPropertyValueClass_2, name, value.getClass(), e));
+                        Errors.Keys.IncompatiblePropertyValue_1, name), e);
             }
             return sb.append(suffix).toString();
         }
@@ -389,8 +390,8 @@ final class StringJoinOperation extends
              * in order to have a "all or nothing" behavior.
              */
             if (values.length != count) {
-                throw new InvalidPropertyValueException(
-                        Errors.format(Errors.Keys.UnexpectedNumberOfComponents_3, value, values.length, count));
+                throw new InvalidPropertyValueException(Resources.format(
+                        Resources.Keys.UnexpectedNumberOfComponents_4, getName(), value, values.length, count));
             }
             for (int i=0; i < values.length; i++) {
                 feature.setPropertyValue(attributeNames[i], values[i]);

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -32,6 +32,7 @@ import org.apache.sis.internal.util.SetO
 import org.apache.sis.internal.util.AbstractIterator;
 import org.apache.sis.internal.feature.AttributeConvention;
 import org.apache.sis.internal.feature.Geometries;
+import org.apache.sis.internal.feature.Resources;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.ObjectConverters;
@@ -597,7 +598,7 @@ public final class AttributeTypeBuilder<
                         throw new IllegalStateException(errors().getString(Errors.Keys.UnsupportedImplementation_1, valueClass));
                     }
                     if (owner.defaultGeometry != null) {
-                        throw new IllegalStateException(errors().getString(Errors.Keys.PropertyAlreadyExists_2,
+                        throw new IllegalStateException(resources().getString(Resources.Keys.PropertyAlreadyExists_2,
                                 owner.getDisplayName(), AttributeConvention.GEOMETRY_PROPERTY));
                     }
                     owner.defaultGeometry = this;

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -32,6 +32,7 @@ import org.apache.sis.feature.DefaultFea
 import org.apache.sis.feature.FeatureOperations;
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.internal.feature.AttributeConvention;
+import org.apache.sis.internal.feature.Resources;
 import org.apache.sis.util.CorruptedObjectException;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArraysExt;
@@ -748,7 +749,7 @@ public class FeatureTypeBuilder extends
                 }
                 if (AttributeConvention.IDENTIFIER_PROPERTY.equals(identifierTypes[0].getName())) {
                     if (identifierCursor > 1) {
-                        throw new IllegalStateException(Errors.format(Errors.Keys.PropertyAlreadyExists_2,
+                        throw new IllegalStateException(Resources.format(Resources.Keys.PropertyAlreadyExists_2,
                                 getDisplayName(), AttributeConvention.IDENTIFIER_PROPERTY));
                     }
                     System.arraycopy(propertyTypes, 1, propertyTypes, 0, --propertyCursor);

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Locale;
 import org.opengis.util.ScopedName;
 import org.opengis.util.GenericName;
+import org.apache.sis.internal.feature.Resources;
 import org.apache.sis.feature.AbstractIdentifiedType;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.resources.Errors;
@@ -33,6 +34,7 @@ import org.apache.sis.util.Debug;
 // Branch-dependent imports
 import java.util.Objects;
 import org.opengis.feature.IdentifiedType;
+import org.opengis.feature.PropertyNotFoundException;
 
 
 /**
@@ -359,7 +361,7 @@ public abstract class TypeBuilder implem
             }
         }
         if (ambiguity != null) {
-            throw new IllegalArgumentException(errors().getString(
+            throw new PropertyNotFoundException(errors().getString(
                     Errors.Keys.AmbiguousName_3, best.getName(), ambiguity.getName(), name));
         }
         return best;
@@ -384,6 +386,13 @@ public abstract class TypeBuilder implem
     }
 
     /**
+     * Returns the {@code sis-feature} specific resources for error messages.
+     */
+    final Resources resources() {
+        return Resources.forProperties(identification);
+    }
+
+    /**
      * Same as {@link org.apache.sis.util.ArgumentChecks#ensureNonNull(String, Object)},
      * but uses the current locale in case of error.
      *

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -190,7 +190,7 @@ public final class ServiceParameter exte
                 if (valueClass != null) {
                     final String code = id.getCode();
                     if (code != null) {
-                        return Names.createMemberName(id.getCodeSpace(), ":", code, valueClass);
+                        return Names.createMemberName(id.getCodeSpace(), null, code, valueClass);
                     }
                 }
             }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -58,11 +58,10 @@ final class DomainRange<E extends Number
      * the given type is not wide enough, then the values are truncated in the same way
      * than the Java language casts primitive types.
      *
-     * @param  type  The element type, restricted to one of {@link Byte}, {@link Short},
-     *               {@link Integer}, {@link Long}, {@link Float} or {@link Double}.
-     * @param  range The range of values.
-     * @throws IllegalArgumentException If the given type is not one of the primitive
-     *         wrappers for numeric types.
+     * @param  type   the element type, restricted to one of {@link Byte}, {@link Short},
+     *                {@link Integer}, {@link Long}, {@link Float} or {@link Double}.
+     * @param  range  the range of values.
+     * @throws IllegalArgumentException if the given type is not one of the primitive wrappers for numeric types.
      */
     DomainRange(final Class<E> type, final ValueRange range) throws IllegalArgumentException {
         super(type, range);

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -42,7 +42,7 @@ public final strictfp class ServiceParam
      * @return The test parameter.
      */
     public static ServiceParameter create() {
-        final MemberName paramName = Names.createMemberName(null, ":", "Version", String.class);
+        final MemberName paramName = Names.createMemberName(null, null, "Version", String.class);
         final ServiceParameter param = new ServiceParameter();
         param.memberName    = paramName;
         param.optionality   = true;

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -24,10 +24,10 @@ import org.opengis.parameter.ParameterDe
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.GeneralParameterDescriptor;
 import org.apache.sis.internal.jaxb.gco.PropertyType;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
 import org.apache.sis.util.CorruptedObjectException;
 import org.apache.sis.util.collection.Containers;
-import org.apache.sis.util.resources.Errors;
 
 
 /**
@@ -215,7 +215,7 @@ public final class CC_OperationParameter
      */
     private static void verifyEquivalence(final String name, final boolean condition) {
         if (!condition) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.MismatchedParameterDescriptor_1, name));
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.MismatchedParameterDescriptor_1, name));
         }
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGParameterDomain.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGParameterDomain.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGParameterDomain.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGParameterDomain.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -46,7 +46,7 @@ public final class EPSGParameterDomain e
     /**
      * Creates a new parameter descriptor for the given units.
      *
-     * @param units The units.
+     * @param  units  the units.
      */
     public EPSGParameterDomain(final Set<Unit<?>> units) {
         super(Double.class, null, false, null, false);




Mime
View raw message