Author: desruisseaux
Date: Fri Jan 8 18:29:04 2016
New Revision: 1723780
URL: http://svn.apache.org/viewvc?rev=1723780&view=rev
Log:
Merge DatumShiftGrid (NADCON and NTv2) and EPSGFactory from the JDK8 branch.
Added:
sis/branches/JDK7/application/sis-console/src/main/artifact/log/
- copied from r1723735,
sis/branches/JDK8/application/sis-console/src/main/artifact/log/
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/
- copied from r1723735,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/
- copied from r1723735,
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedCode.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedCode.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedName.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedName.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/LinearTransform2D.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/LinearTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java
- copied unchanged from r1723735,
sis/branches/JDK8/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/FranceGeocentricInterpolation.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets2D.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MolodenskyInterpolation.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MolodenskyInterpolation.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/VerticalOffset.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/VerticalOffset.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
- copied unchanged from r1723735,
sis/branches/JDK8/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/ConcurrentAuthorityFactory.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FilteredCodes.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FilteredCodes.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/UnavailableFactoryException.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/UnavailableFactoryException.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/
- copied from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DatumShiftTransform.java
- copied unchanged from r1723735,
sis/branches/JDK8/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/InterpolatedGeocentricTransform.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform2D.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform2D.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
- copied unchanged from r1723735,
sis/branches/JDK8/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/InterpolatedTransform2D.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java
- copied unchanged from r1723735,
sis/branches/JDK8/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/internal/referencing/provider/FranceGeocentricInterpolationTest.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
- copied, changed from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/
- copied from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/internal/
- copied from r1723735,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/internal/
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
- copied unchanged from r1723735,
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/SQLInvalidRecordNumberForDirectAccessException.java
- copied unchanged from r1723735,
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/SQLInvalidRecordNumberForDirectAccessException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/SQLNoDirectAccessAvailableException.java
- copied unchanged from r1723735,
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/SQLNoDirectAccessAvailableException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/ShapefileByteReader.properties
- copied unchanged from r1723735,
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/ShapefileByteReader.properties
sis/branches/JDK7/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/ShapefileByteReader_fr.properties
- copied unchanged from r1723735,
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/ShapefileByteReader_fr.properties
sis/branches/JDK7/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/InputFeatureStream.properties
- copied unchanged from r1723735,
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/InputFeatureStream.properties
sis/branches/JDK7/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/InputFeatureStream_fr.properties
- copied unchanged from r1723735,
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/InputFeatureStream_fr.properties
Removed:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets3D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/DeprecatedCode.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/DeprecatedName.java
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/.gitignore
sis/branches/JDK7/application/sis-console/src/main/artifact/bin/sis
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.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/GeocentricAffineBetweenGeographic.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.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/Molodensky.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/ParameterBuilder.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/UnmodifiableParameterValue.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.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/crs/AbstractDerivedCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/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/DefaultAffineCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.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/SQLTranslator.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/DefaultConicProjection.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/DefaultCylindricalProjection.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPlanarProjection.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultProjection.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubTypes.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/GeneralMatrix.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/Matrix1.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix3.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix4.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.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/ContextualParameters.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CopyTransform.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/IdentityTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ScaleTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/formulas.html
sis/branches/JDK7/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AllProvidersTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectBuilder.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/crs/DefaultProjectedCRSTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3002.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3003.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3004.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3005.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/package-info.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.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/DelayedExecutor.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedRunnable.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/system/OSGiActivator.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/ServletListener.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Shutdown.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/SupervisorMBean.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Threads.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/package-info.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/DoubleDouble.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/About.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Disposable.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/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/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/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/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java
sis/branches/JDK7/ide-project/NetBeans/build.xml
sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
sis/branches/JDK7/pom.xml
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/NetcdfStoreProvider.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/AutoChecker.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileDescriptor.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/Dbase3ByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/SQLConnectionClosedException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/connection/SQLClosingIOFailureException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLIllegalColumnIndexException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoResultException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotDateException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotNumericException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLIllegalParameterException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLInvalidStatementException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelImageInputStream.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 8 18:29:04 2016
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1714138
+/sis/branches/JDK8:1584960-1723735
/sis/trunk:1394364-1508466,1519089-1519674
Modified: sis/branches/JDK7/.gitignore
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/.gitignore?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/.gitignore [UTF-8] (original)
+++ sis/branches/JDK7/.gitignore [UTF-8] Fri Jan 8 18:29:04 2016
@@ -1,28 +1,28 @@
-# Eclipse IDE files
-.classpath
-.project
-.settings/
-
-# Maven output
+# All configurations
+ide-project/local-src/
target/
-
-# Apple
-.DS_Store
-*.tmp
tmp/
+*.tmp
*.log
*.orig
-
-# Old SVN files
.svn/
-
+# NetBeans IDE files
+ide-project/NetBeans/build/
+ide-project/NetBeans/dist/
nbactions.xml
nbproject
-# Intellij files
+# Eclipse IDE files
+.classpath
+.project
+.settings/
+
+# IntelliJ IDE files
*.iml
*.ipr
*.iws
.idea/
+# MacOS
+.DS_Store
Modified: sis/branches/JDK7/application/sis-console/src/main/artifact/bin/sis
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/artifact/bin/sis?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/artifact/bin/sis [UTF-8]
(original)
+++ sis/branches/JDK7/application/sis-console/src/main/artifact/bin/sis [UTF-8]
Fri Jan 8 18:29:04 2016
@@ -31,4 +31,5 @@ fi
# Execute SIS with any optional JAR that the user may put in the 'lib'
directory.
java -classpath "$BASE_DIR/lib/*" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
+ -Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
org.apache.sis.console.Command $SIS_OPTS "$@"
Modified:
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java
[UTF-8] (original)
+++
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -16,7 +16,10 @@
*/
package org.apache.sis.console;
+import java.util.Date;
import java.util.EnumSet;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
import java.io.IOException;
import java.rmi.registry.Registry;
import javax.management.JMX;
@@ -25,12 +28,18 @@ import javax.management.MBeanServerConne
import javax.management.remote.JMXServiceURL;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
+import org.apache.sis.internal.system.Loggers;
import org.apache.sis.setup.About;
import org.apache.sis.util.Version;
+import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
+import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.resources.Vocabulary;
+import org.apache.sis.util.collection.TreeTable;
+import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.internal.system.Supervisor;
import org.apache.sis.internal.system.SupervisorMBean;
+import org.apache.sis.internal.util.X364;
/**
@@ -50,7 +59,7 @@ import org.apache.sis.internal.system.Su
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.4
+ * @version 0.7
* @module
*/
final class AboutSC extends SubCommand {
@@ -77,19 +86,20 @@ final class AboutSC extends SubCommand {
if (hasUnexpectedFileCount(0, brief ? 0 : 1)) {
return Command.INVALID_ARGUMENT_EXIT_CODE;
}
+ String[] warnings = null;
final String configuration;
- if (brief) {
+ if (brief && files.isEmpty()) {
configuration = Vocabulary.getResources(locale).getString(
Vocabulary.Keys.Version_2, "Apache SIS", Version.SIS);
} else {
+ final EnumSet<About> sections = EnumSet.allOf(About.class);
+ if (!options.containsKey(Option.VERBOSE)) {
+ sections.remove(About.LIBRARIES);
+ }
if (files.isEmpty()) {
/*
* Provide information about the local SIS installation.
*/
- final EnumSet<About> sections = EnumSet.allOf(About.class);
- if (!options.containsKey(Option.VERBOSE)) {
- sections.remove(About.LIBRARIES);
- }
configuration = About.configuration(sections, locale,
timezone).toString();
} else {
/*
@@ -98,21 +108,67 @@ final class AboutSC extends SubCommand {
*
* Tutorial:
http://docs.oracle.com/javase/tutorial/jmx/remote/custom.html
*/
- final String path = toRemoteURL(files.get(0));
+ final String address = files.get(0);
+ final String path = toRemoteURL(address);
+ final long time = System.nanoTime();
+ final TreeTable table;
try {
final JMXServiceURL url = new JMXServiceURL(path);
try (JMXConnector jmxc = JMXConnectorFactory.connect(url))
{
final MBeanServerConnection mbsc =
jmxc.getMBeanServerConnection();
final SupervisorMBean bean = JMX.newMBeanProxy(mbsc,
new ObjectName(Supervisor.NAME), SupervisorMBean.class);
- configuration = bean.configuration().toString();
+ table = bean.configuration(sections, locale, timezone);
+ warnings = bean.warnings(locale);
}
} catch (IOException e) {
error(Errors.format(Errors.Keys.CanNotConnectTo_1, path),
e);
return Command.IO_EXCEPTION_EXIT_CODE;
}
+ /*
+ * Logs a message telling how long it took to receive the
reply.
+ * Sometime the delay gives a hint about the server charge.
+ */
+ double delay = (System.nanoTime() - time) / 1E+9; // In
seconds.
+ if (delay >= 0.1) {
+ final double scale = (delay >= 10) ? 1 : (delay >= 1) ? 10
: 100;
+ delay = Math.rint(delay * scale) / scale;
+ }
+ final LogRecord record =
Messages.getResources(locale).getLogRecord(Level.INFO,
+ Messages.Keys.ConfigurationOf_3, address, new Date(),
delay);
+ record.setLoggerName(Loggers.APPLICATION);
+ Logging.log(Command.class, "main", record);
+ /*
+ * Replace the root node label from "Local configuration" to
"Remote configuration"
+ * before to get the string representation of the
configuration as a tree-table.
+ */
+ table.getRoot().setValue(TableColumn.NAME,
+
Vocabulary.getResources(locale).getString(Vocabulary.Keys.RemoteConfiguration));
+ configuration = table.toString();
}
}
out.println(configuration);
+ if (warnings != null) {
+ out.println();
+ if (colors) {
+ out.print(X364.BACKGROUND_RED.sequence());
+ out.print(X364.BOLD.sequence());
+ out.print(' ');
+ }
+
out.print(Vocabulary.getResources(locale).getLabel(Vocabulary.Keys.Warnings));
+ if (colors) {
+ out.print(' ');
+ out.println(X364.RESET.sequence());
+ out.print(X364.FOREGROUND_RED.sequence());
+ } else {
+ out.println();
+ }
+ for (final String warning : warnings) {
+ out.println(warning);
+ }
+ if (colors) {
+ out.print(X364.FOREGROUND_DEFAULT.sequence());
+ }
+ }
out.flush();
return 0;
}
Modified:
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -36,7 +36,7 @@
* {@code about} sub-command shall be invoked as below:
*
* {@preformat shell
- * java org.apache.sis.console.Command about localhost:9999
+ * java org.apache.sis.console.Command about localhost:1099
* }
*
* The {@code com.sun.management.jmxremote.local.only} property is recommended
if the remote JVM is an other
@@ -47,7 +47,7 @@
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.4
+ * @version 0.7
* @module
*/
package org.apache.sis.console;
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -97,6 +97,12 @@ public final class Doclet extends HtmlDo
final File customCSS = customCSS(output);
copyStylesheet(customCSS, output);
copyResources(customCSS.getParentFile(), output);
+ final Rewriter r = new Rewriter();
+ for (final File file : output.listFiles()) {
+ if (file.isDirectory()) { // Do not process files in the root
directory, only in sub-directories.
+ r.processDirectory(file);
+ }
+ }
} catch (IOException e) {
final StringWriter buffer = new StringWriter();
final PrintWriter p = new PrintWriter(buffer);
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java?rev=1723780&r1=1723735&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -37,6 +37,7 @@ import org.apache.sis.util.resources.Mes
import org.apache.sis.util.logging.Logging;
// Branch-dependent imports
+import java.util.concurrent.Callable;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -243,9 +244,11 @@ public abstract class Initializer {
final Class<?>[] args = {String.class};
c.getMethod("setDatabaseName", args).invoke(ds, path);
c.getMethod("setDataSourceName", args).invoke(ds, "Apache SIS spatial
metadata");
- Shutdown.register(() -> {
- shutdown();
- return null;
+ Shutdown.register(new Callable<Object>() {
+ @Override public Object call() throws ReflectiveOperationException
{
+ shutdown();
+ return null;
+ }
});
return ds;
}
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -1612,13 +1612,13 @@ public class Formatter implements Locali
@Debug
@Override
public String toString() {
- final StringBuilder b = new
StringBuilder(Classes.getShortClassName(this)).append('[');
- String separator = "";
- for (final FormattableObject element : enclosingElements) {
- b.append(separator).append(Classes.getShortClassName(element));
- separator = " 〉 ";
+ final StringBuilder b = new
StringBuilder(Classes.getShortClassName(this));
+ String separator = " of ";
+ for (int i=enclosingElements.size(); --i >= 0;) {
+
b.append(separator).append(Classes.getShortClassName(enclosingElements.get(i)));
+ separator = " inside ";
}
- return b.append(']').toString();
+ return b.toString();
}
/**
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -67,6 +67,7 @@ import org.apache.sis.internal.metadata.
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.internal.metadata.VerticalDatumTypes;
import org.apache.sis.internal.metadata.ReferencingServices;
+import org.apache.sis.internal.metadata.TransformationAccuracy;
import org.apache.sis.internal.util.LocalizedParseException;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.util.CharSequences;
@@ -86,7 +87,7 @@ import static java.util.Collections.sing
* @author Rémi Eve (IRD)
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.6
- * @version 0.6
+ * @version 0.7
* @module
*/
final class GeodeticObjectParser extends MathTransformParser implements
Comparator<CoordinateSystemAxis> {
@@ -2103,7 +2104,8 @@ final class GeodeticObjectParser extends
parseParameters(element, parameters, null, null);
properties.put(ReferencingServices.PARAMETERS_KEY, parameters);
if (accuracy != null) {
- accuracy.pullDouble("accuracy"); // TODO: share the code from
EPSG factory.
+
properties.put(CoordinateOperation.COORDINATE_OPERATION_ACCURACY_KEY,
+
TransformationAccuracy.create(accuracy.pullDouble("accuracy")));
accuracy.close(ignoredElements);
}
try {
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -351,7 +351,7 @@ public final class Warnings implements L
final String lineSeparator = System.lineSeparator();
final Messages resources = Messages.getResources(locale);
buffer.append(resources.getString(isParsing ?
Messages.Keys.IncompleteParsing_1
- : Messages.Keys.NonConformFormatting_1,
root)).append(lineSeparator);
+ :
Messages.Keys.NonConformFormatting_1, root));
if (messages != null) {
for (final Iterator<?> it = messages.iterator(); it.hasNext();) {
final InternationalString i18n = (InternationalString)
it.next();
@@ -372,13 +372,13 @@ public final class Warnings implements L
cause = null;
}
}
- buffer.append(" • ").append(message).append(lineSeparator);
+ buffer.append(lineSeparator).append(" • ").append(message);
if (cause != null) {
String details = Exceptions.getLocalizedMessage(cause,
locale);
if (details == null) {
details = cause.toString();
}
- buffer.append(" ").append(details).append(lineSeparator);
+ buffer.append(lineSeparator).append(" ").append(details);
}
}
}
@@ -387,17 +387,22 @@ public final class Warnings implements L
*/
if (!ignoredElements.isEmpty()) {
final Vocabulary vocabulary = Vocabulary.getResources(locale);
- buffer.append(" •
").append(resources.getString(Messages.Keys.UnknownElementsInText)).append(lineSeparator);
+ buffer.append(lineSeparator).append(" •
").append(resources.getString(Messages.Keys.UnknownElementsInText));
for (final Map.Entry<String, List<String>> entry :
ignoredElements.entrySet()) {
- buffer.append(" ‣
").append(vocabulary.getString(Vocabulary.Keys.Quoted_1, entry.getKey()));
+ buffer.append(lineSeparator).append(" ‣
").append(vocabulary.getString(Vocabulary.Keys.Quoted_1, entry.getKey()));
String separator =
vocabulary.getString(Vocabulary.Keys.InBetweenWords);
for (final String p : entry.getValue()) {
buffer.append(separator).append(p);
separator = ", ";
}
- buffer.append('.').append(lineSeparator);
+ buffer.append('.');
}
}
+ /*
+ * There is intentionally line separator at the end of the last line,
because the string returned by
+ * this method is typically written or logged by a call to
System.out.println(…) or something equivalent.
+ * A trailing line separator cause a visual disruption in log records
for instance.
+ */
return buffer.toString();
}
}
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -108,8 +108,9 @@ final class TreeTableView implements Tre
* Returns the columns included in this tree table.
*/
@Override
+ @SuppressWarnings("ReturnOfCollectionOrArrayField")
public List<TableColumn<?>> getColumns() {
- return COLUMNS;
+ return COLUMNS; // Unmodifiable
}
/**
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -143,23 +143,43 @@ public class DefaultQuantitativeResult e
*
* @param newValues The new values.
*/
- public void setValues(final List<Record> newValues) {
+ public void setValues(final List<? extends Record> newValues) {
values = writeList(newValues, values, Record.class);
}
/**
* Return the value type for reporting a data quality result.
*
+ * <div class="section">Default value</div>
+ * If no type has been set but all {@linkplain #getValues() values} are of
the same type,
+ * then this method defaults to that type. Otherwise this method returns
{@code null}.
+ *
* @return Value type for reporting a data quality result, or {@code null}.
*/
@Override
@XmlElement(name = "valueType")
public RecordType getValueType() {
- return valueType;
+ RecordType type = valueType;
+ if (type == null && values != null) {
+ for (final Record value : values) {
+ if (value != null) {
+ final RecordType t = value.getRecordType();
+ if (t == null) {
+ return null;
+ } else if (type == null) {
+ type = t;
+ } else if (type != t) {
+ return null;
+ }
+ }
+ }
+ }
+ return type;
}
/**
* Sets the value type for reporting a data quality result.
+ * A {@code null} value restores the default value documented in {@link
#getValueType()}.
*
* @param newValue The new value type.
*/
Modified:
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -255,7 +255,7 @@ public final strictfp class DefaultBrows
@Override
public void warningOccured(final Object source, final LogRecord
warning) {
assertFalse("No other warning were expected.", receivedWarning);
- if (verbose) {
+ if (VERBOSE) {
// In verbose mode, log the warning for allowing the developer
to
// check the message. In normal mode, the test will be silent.
Logging.getLogger(warning.getLoggerName()).log(warning);
Modified:
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -26,7 +26,7 @@ import org.junit.BeforeClass;
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.6
+ * @version 0.7
* @module
*/
@Suite.SuiteClasses({
@@ -99,7 +99,9 @@ import org.junit.BeforeClass;
org.apache.sis.io.wkt.TransliteratorTest.class,
org.apache.sis.io.wkt.ColorsTest.class,
org.apache.sis.io.wkt.FormatterTest.class,
- org.apache.sis.io.wkt.ElementTest.class
+ org.apache.sis.io.wkt.ElementTest.class,
+
+ org.apache.sis.internal.metadata.sql.SQLUtilitiesTest.class
})
public final strictfp class MetadataTestSuite extends TestSuite {
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -23,12 +23,12 @@ import static java.lang.Math.*;
* Finds the extremum of the unique cubic curve which fit the two given points
and derivatives.
* First, this method finds the A, B, C and D coefficients for the following
equation:
*
- * <blockquote><var>y</var> = A + B<var>x</var> + C<var>x</var><sup>2</sup> +
D<var>x</var><sup>3</sup></blockquote>
+ * <blockquote><var>y</var> = A + B<var>x</var> + C<var>x</var>² +
D<var>x</var>³</blockquote>
*
* Next, this method finds the extremum by finding the
(<var>x</var>,<var>y</var>) values
* that satisfy the following equation (which is the derivative of the above
equation):
*
- * <blockquote>B + 2C<var>x</var> + 3D<var>x</var><sup>2</sup> = 0</blockquote>
+ * <blockquote>B + 2C<var>x</var> + 3D<var>x</var>² = 0</blockquote>
*
* A cubic curve can have two extremum, which are stored in this object in no
particular order.
* The distance separating the two extremum is sometime a useful information
for determining if
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -163,20 +163,34 @@ public final class ReferencingUtilities
* the two first dimensions use an instance of {@link GeographicCRS}.
Otherwise (i.e. if the
* two first dimensions are not geographic), returns {@code null}.
*
+ * <p>This method excludes geocentric CRS on intend. Some callers needs
this exclusion as a way to identify
+ * which CRS in a Geographic/Geocentric conversion is the geographic one.
An other point of view is to said
+ * that if this method returns a non-null value, then the coordinates are
expected to be either two-dimensional
+ * or three-dimensional with an ellipsoidal height.</p>
+ *
* @param crs The coordinate reference system for which to get the
ellipsoid.
* @return The ellipsoid in the given CRS, or {@code null} if none.
*
* @since 0.6
*/
public static Ellipsoid
getEllipsoidOfGeographicCRS(CoordinateReferenceSystem crs) {
- while (!(crs instanceof GeographicCRS)) {
+ while (!(crs instanceof GeodeticCRS)) {
if (crs instanceof CompoundCRS) {
crs = ((CompoundCRS) crs).getComponents().get(0);
} else {
return null;
}
}
- return ((GeographicCRS) crs).getDatum().getEllipsoid();
+ /*
+ * In order to determine if the CRS is geographic, checking the
CoordinateSystem type is more reliable
+ * then checking if the CRS implements the GeographicCRS interface.
This is because the GeographicCRS
+ * interface is GeoAPI-specific, so a CRS may be OGC-compliant without
implementing that interface.
+ */
+ if (crs.getCoordinateSystem() instanceof EllipsoidalCS) {
+ return ((GeodeticCRS) crs).getDatum().getEllipsoid();
+ } else {
+ return null; // Geocentric CRS.
+ }
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -49,13 +49,13 @@ import static org.apache.sis.util.Argume
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.5
- * @version 0.6
+ * @version 0.7
* @module
*
* @see ProjectiveTransform
*/
-public class AffineTransform2D extends ImmutableAffineTransform implements
MathTransform2D,
- LinearTransform, LenientComparable, Parameterized
+public class AffineTransform2D extends ImmutableAffineTransform
+ implements LinearTransform2D, LenientComparable, Parameterized
{
/**
* Serial number for inter-operability with different versions.
@@ -284,7 +284,7 @@ public class AffineTransform2D extends I
* @throws NoninvertibleTransformException if this transform can not be
inverted.
*/
@Override
- public final MathTransform2D inverse() throws
NoninvertibleTransformException {
+ public final AffineTransform2D inverse() throws
NoninvertibleTransformException {
if (inverse == null) {
if (super.isIdentity()) {
inverse = this;
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -46,11 +46,11 @@ import org.apache.sis.util.Workaround;
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.6
- * @version 0.6
+ * @version 0.7
* @module
*/
@XmlTransient
-abstract class AbstractProvider extends DefaultOperationMethod implements
MathTransformProvider {
+public abstract class AbstractProvider extends DefaultOperationMethod
implements MathTransformProvider {
/**
* For cross-version compatibility.
*/
@@ -185,4 +185,33 @@ abstract class AbstractProvider extends
static ParameterDescriptor<Double> createShift(final ParameterBuilder
builder) {
return builder.create(0.0, SI.METRE);
}
+
+ /**
+ * Flags whether the source and/or target ellipsoid are concerned by this
operation. This method is invoked by
+ * {@link
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory} for
determining if this
+ * operation has {@code "semi_major"}, {@code "semi_minor"}, {@code
"src_semi_major"}, {@code "src_semi_minor"}
+ * parameters that may need to be filled with values inferred from the
source or target
+ * {@link org.apache.sis.referencing.datum.DefaultGeodeticDatum}.
+ * Meaning of return values:
+ *
+ * <ul>
+ * <li>0 if neither the source coordinate system or the destination
coordinate system is ellipsoidal.
+ * There is no parameter that need to be completed.</li>
+ * <li>1 if this operation has {@code "semi_major"} and {@code
"semi_minor"} parameters that need
+ * to be set to the axis lengths of the source ellipsoid.</li>
+ * <li>2 if this operation has {@code "semi_major"} and {@code
"semi_minor"} parameters that need
+ * to be set to the axis lengths of the target ellipsoid.</li>
+ * <li>3 if this operation has {@code "src_semi_major"}, {@code
"src_semi_minor"}, {@code "tgt_semi_major"}
+ * and {@code "tgt_semi_minor"} parameters that need to be set to
the axis lengths of the source and
+ * target ellipsoids.</li>
+ * </ul>
+ *
+ * This method is just a hint. If the information is not provided, {@code
DefaultMathTransformFactory}
+ * will try to infer it from the type of user-specified source and target
CRS.
+ *
+ * @return 0, 1, 2 or 3.
+ */
+ public int getEllipsoidsMask() {
+ return 0;
+ }
}
Copied:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
(from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java?p2=sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java&p1=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java&r1=1723735&r2=1723780&rev=1723780&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -33,6 +33,7 @@ import org.apache.sis.internal.referenci
// Branch-specific imports
import java.nio.file.Path;
+import org.apache.sis.internal.jdk8.JDK8;
/**
@@ -297,7 +298,7 @@ public abstract class DatumShiftGridFile
{
super(coordinateUnit, translationUnit, isCellValueRatio, x0, y0,
Δx, Δy, nx, ny, descriptor, files);
offsets = new float[dim][];
- final int size = Math.multiplyExact(nx, ny);
+ final int size = JDK8.multiplyExact(nx, ny);
for (int i=0; i<dim; i++) {
Arrays.fill(offsets[i] = new float[size], java.lang.Float.NaN);
}
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -212,6 +212,17 @@ public final class Equirectangular exten
}
/**
+ * Notifies {@code DefaultMathTransformFactory} that map projections
require
+ * values for the {@code "semi_major"} and {@code "semi_minor"} parameters.
+ *
+ * @return 1, meaning that the operation requires a source ellipsoid.
+ */
+ @Override
+ public final int getEllipsoidsMask() {
+ return 1;
+ }
+
+ /**
* Gets a parameter value identified by the given descriptor and stores it
only if different than zero.
*
* @param source The parameters from which to read the value.
Copied:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
(from r1723735,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java?p2=sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java&p1=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java&r1=1723735&r2=1723780&rev=1723780&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
[UTF-8] Fri Jan 8 18:29:04 2016
@@ -61,7 +61,7 @@ import static java.lang.Float.parseFloat
// Branch-specific imports
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.Files;
+import org.apache.sis.internal.jdk8.JDK8;
/**
@@ -363,7 +363,7 @@ public class FranceGeocentricInterpolati
try {
grid = handler.peek();
if (grid == null) {
- try (final BufferedReader in =
Files.newBufferedReader(resolved)) {
+ try (final BufferedReader in =
JDK8.newBufferedReader(resolved)) {
DatumShiftGridLoader.log(FranceGeocentricInterpolation.class, file);
final DatumShiftGridFile.Float<Angle,Length> g =
load(in, file);
grid = DatumShiftGridCompressed.compress(g, averages,
scale);
@@ -445,8 +445,8 @@ public class FranceGeocentricInterpolati
yf = gridGeometry[3];
Δx = gridGeometry[4];
Δy = gridGeometry[5];
- nx = Math.toIntExact(Math.round((xf - x0) / Δx +
1));
- ny = Math.toIntExact(Math.round((yf - y0) / Δy +
1));
+ nx = JDK8.toIntExact(Math.round((xf - x0) / Δx +
1));
+ ny = JDK8.toIntExact(Math.round((yf - y0) / Δy +
1));
grid = new DatumShiftGridFile.Float<>(3,
NonSI.DEGREE_ANGLE, SI.METRE, false,
x0, y0, Δx, Δy, nx, ny, PARAMETERS, file);
@@ -494,8 +494,8 @@ public class FranceGeocentricInterpolati
t.nextToken(); //
Ignored
final double x = Double.parseDouble(t.nextToken()); //
Longitude in degrees
final double y = Double.parseDouble(t.nextToken()); //
Latitude in degrees
- final int i = Math.toIntExact(Math.round((x - x0) / Δx)); //
Column index
- final int j = Math.toIntExact(Math.round((y - y0) / Δy)); //
Row index
+ final int i = JDK8.toIntExact(Math.round((x - x0) / Δx)); //
Column index
+ final int j = JDK8.toIntExact(Math.round((y - y0) / Δy)); //
Row index
if (i < 0 || i >= nx) {
throw new
FactoryException(Errors.format(Errors.Keys.ValueOutOfRange_4, "x", x, x0, xf));
}
