sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1767577 [1/15] - in /sis/trunk: ./ application/ application/sis-console/src/main/java/org/apache/sis/console/ application/sis-openoffice/ application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ core/ core/sis-feature/src/main/j...
Date Tue, 01 Nov 2016 21:03:08 GMT
Author: desruisseaux
Date: Tue Nov  1 21:03:06 2016
New Revision: 1767577

URL: http://svn.apache.org/viewvc?rev=1767577&view=rev
Log:
Merge the replacement of JSR-275 by JSR-363 from the JDK7 branch.
In this commit, we change the GeoAPI dependency version from 3.0.0 to 3.0.1-RC1.
This dependency will need to be changed to 3.0.1 before SIS 0.8 release.

Added:
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FractionConverter.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FractionConverter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractConverter.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractConverter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractUnit.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractUnit.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/ConcatenatedConverter.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ConcatenatedConverter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/ConventionalUnit.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ConventionalUnit.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitRegistry.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitRegistry.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
    sis/trunk/core/sis-utility/src/main/resources/META-INF/services/javax.measure.spi.ServiceProvider
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/main/resources/META-INF/services/javax.measure.spi.ServiceProvider
    sis/trunk/core/sis-utility/src/main/resources/org/apache/sis/measure/
      - copied from r1767562, sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
      - copied unchanged from r1767562, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
Removed:
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/PatchedUnitFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitsMap.java
Modified:
    sis/trunk/   (props changed)
    sis/trunk/application/pom.xml
    sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
    sis/trunk/application/sis-openoffice/pom.xml
    sis/trunk/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
    sis/trunk/core/pom.xml
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationMethod.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameter.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGParameterDomain.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/GeodeticObjectBuilder.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Legacy.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/WKTUtilities.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterTableRow.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValue.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/package-info.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/TableInfo.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/InverseOperationMethod.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/MathTransformContext.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameter.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DatumShiftTransform.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform2D.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/AxisDirectionsTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PoleRotationMock.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TopocentricConversionMock.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/MeasureList.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/XPaths.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/MeasurementRange.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Static.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java
    sis/trunk/core/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java
    sis/trunk/ide-project/NetBeans/build.xml
    sis/trunk/ide-project/NetBeans/nbproject/project.properties
    sis/trunk/ide-project/eclipse/classpath
    sis/trunk/pom.xml
    sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
    sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
    sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
    sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
    sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
    sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 21:03:06 2016
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394364-1758914
-/sis/branches/JDK7:1394913-1764107
-/sis/branches/JDK8:1584960-1763833
+/sis/branches/JDK7:1394913-1767562
+/sis/branches/JDK8:1584960-1767556

Modified: sis/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/application/pom.xml?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/application/pom.xml (original)
+++ sis/trunk/application/pom.xml Tue Nov  1 21:03:06 2016
@@ -116,6 +116,7 @@
   <modules>
     <module>sis-webapp</module>
     <module>sis-console</module>
+<!--<module>sis-openoffice</module>     Omitted for now because of the numerous warnings emitted by Pack200. -->
   </modules>
 
 </project>

Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java [UTF-8] (original)
+++ sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -26,10 +26,8 @@ import java.io.FileInputStream;
 import java.io.LineNumberReader;
 import java.io.InputStreamReader;
 import java.text.NumberFormat;
-import javax.measure.unit.Unit;
-import javax.measure.unit.NonSI;
-import javax.measure.unit.SI;
-import javax.measure.converter.ConversionException;
+import javax.measure.Unit;
+import javax.measure.IncommensurableException;
 import org.opengis.metadata.Metadata;
 import org.opengis.metadata.extent.Extent;
 import org.opengis.metadata.extent.GeographicBoundingBox;
@@ -54,7 +52,6 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.internal.referencing.DirectPositionView;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
 import org.apache.sis.internal.storage.CodeType;
-import org.apache.sis.internal.util.PatchedUnitFormat;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.internal.util.X364;
@@ -478,8 +475,8 @@ final class TransformCommand extends Met
             final CoordinateSystemAxis axis = cs.getAxis(i);
             String name =  axis.getName().getCode();
             name = Transliterator.DEFAULT.toShortAxisName(cs, axis.getDirection(), name);
-            final String unit = PatchedUnitFormat.toString(axis.getUnit());
-            if (unit != null && !unit.isEmpty()) {
+            final String unit = axis.getUnit().toString();
+            if (!unit.isEmpty()) {
                 name = name + " (" + unit + ')';
             }
             printQuotedText(name, ordinateWidth, X364.FOREGROUND_CYAN);
@@ -489,9 +486,9 @@ final class TransformCommand extends Met
     /**
      * Computes the suggested precision for printing values in the given units.
      *
-     * @throws ConversionException should never happen.
+     * @throws IncommensurableException should never happen.
      */
-    private void computeNumFractionDigits(final CoordinateSystem cs) throws ConversionException {
+    private void computeNumFractionDigits(final CoordinateSystem cs) throws IncommensurableException {
         final int dimension = cs.getDimension();
         numFractionDigits = new int[dimension];
         thresholdForScientificNotation = new double[dimension];
@@ -501,10 +498,10 @@ final class TransformCommand extends Met
             double precision;
             if (Units.isLinear(unit)) {
                 precision = Formulas.LINEAR_TOLERANCE;
-                source = SI.METRE;
+                source = Units.METRE;
             } else if (Units.isAngular(unit)) {
                 precision = Formulas.ANGULAR_TOLERANCE;
-                source = NonSI.DEGREE_ANGLE;
+                source = Units.DEGREE;
             } else {
                 precision = 0.001;
                 source = unit;

Modified: sis/trunk/application/sis-openoffice/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-openoffice/pom.xml?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/application/sis-openoffice/pom.xml (original)
+++ sis/trunk/application/sis-openoffice/pom.xml Tue Nov  1 21:03:06 2016
@@ -91,10 +91,6 @@
       <artifactId>geoapi</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.measure</groupId>
-      <artifactId>jsr-275</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.sis.core</groupId>
       <artifactId>sis-referencing</artifactId>
       <version>${project.version}</version>

Modified: sis/trunk/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java [UTF-8] (original)
+++ sis/trunk/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -40,7 +40,6 @@ import org.apache.sis.util.Classes;
 import org.apache.sis.util.Locales;
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.PatchedUnitFormat;
 import org.apache.sis.internal.storage.CodeType;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.DataStores;
@@ -232,7 +231,7 @@ public class ReferencingFunctions extend
                             return Errors.getResources(getJavaLocale()).getString(Errors.Keys.IndexOutOfBounds_1, dimension);
                         }
                     }
-                    final String unit = PatchedUnitFormat.toString(axis.getUnit());
+                    final String unit = axis.getUnit().toString();
                     name = Transliterator.DEFAULT.toShortAxisName(cs, axis.getDirection(), axis.getName().getCode());
                     if (unit != null && !unit.isEmpty()) {
                         name = name + " (" + unit + ')';

Modified: sis/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/pom.xml?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/pom.xml (original)
+++ sis/trunk/core/pom.xml Tue Nov  1 21:03:06 2016
@@ -166,6 +166,10 @@
        =========================================================== -->
   <dependencies>
     <dependency>
+      <groupId>javax.measure</groupId>
+      <artifactId>unit-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.opengis</groupId>
       <artifactId>geoapi</artifactId>
     </dependency>

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -447,7 +447,7 @@ public final class AttributeTypeBuilder<
      *
      * <p>Usage example:</p>
      * {@preformat java
-     *     attribute.addCharacteristic(Unit.class).setName("Unit of measurement").setDefaultValue(SI.CELSIUS);
+     *     attribute.addCharacteristic(Unit.class).setName("Unit of measurement").setDefaultValue(Units.CELSIUS);
      * }
      *
      * The default characteristic name is the name of the given type, but callers should invoke one

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.TypeName;
 import org.opengis.util.MemberName;
 import org.opengis.util.GenericName;

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -18,13 +18,12 @@ package org.apache.sis.internal.metadata
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.measure.quantity.Angle;
 import org.opengis.annotation.UML;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
-import org.apache.sis.internal.util.PatchedUnitFormat;
 import org.apache.sis.util.Characters;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.iso.Types;
@@ -41,7 +40,7 @@ import static org.apache.sis.util.CharSe
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 public final class AxisDirections extends Static {
@@ -188,8 +187,8 @@ public final class AxisDirections extend
      *   <tr align="center"><td>{@code OTHER}</td><td>{@code OTHER}</td></tr>
      * </table>
      *
-     * @param  dir The direction for which to return the absolute direction, or {@code null}.
-     * @return The direction from the above table, or {@code null} if the given direction was null.
+     * @param  dir  the direction for which to return the absolute direction, or {@code null}.
+     * @return the direction from the above table, or {@code null} if the given direction was null.
      */
     public static AxisDirection absolute(AxisDirection dir) {
         final AxisDirection opposite = opposite(dir);
@@ -212,8 +211,8 @@ public final class AxisDirections extend
      * The same applies to {@code EAST}-{@code WEST}, {@code UP}-{@code DOWN} and {@code FUTURE}-{@code PAST},
      * <i>etc.</i> If the given axis direction has no opposite, then this method returns {@code null}.
      *
-     * @param  dir The direction for which to return the opposite direction, or {@code null}.
-     * @return The opposite direction, or {@code null} if none or unknown.
+     * @param  dir  the direction for which to return the opposite direction, or {@code null}.
+     * @return the opposite direction, or {@code null} if none or unknown.
      */
     public static AxisDirection opposite(AxisDirection dir) {
         return OPPOSITES.get(dir);
@@ -224,7 +223,7 @@ public final class AxisDirections extend
      * If the given argument is {@code null} or is not a known direction, then
      * this method conservatively returns {@code false}.
      *
-     * @param  dir The direction to test, or {@code null}.
+     * @param  dir  the direction to test, or {@code null}.
      * @return {@code true} if the given direction is an "opposite".
      */
     public static boolean isOpposite(final AxisDirection dir) {
@@ -236,7 +235,7 @@ public final class AxisDirections extend
      * Returns {@code true} if the specified direction is a compass direction.
      * Compass directions are {@code NORTH}, {@code EAST}, {@code NORTH_EAST}, etc.
      *
-     * @param  dir The direction to test, or {@code null}.
+     * @param  dir  the direction to test, or {@code null}.
      * @return {@code true} if the given direction is a compass direction.
      *
      * @see #angleForCompass(AxisDirection, AxisDirection)
@@ -251,7 +250,7 @@ public final class AxisDirections extend
      * Returns {@code true} if the specified direction is an inter-cardinal direction.
      * Inter-cardinal directions are {@code NORTH_EAST}, {@code SOUTH_SOUTH_EAST}, etc.
      *
-     * @param  dir The direction to test, or {@code null}.
+     * @param  dir  the direction to test, or {@code null}.
      * @return {@code true} if the given direction is an inter-cardinal direction.
      */
     public static boolean isIntercardinal(final AxisDirection dir) {
@@ -263,7 +262,7 @@ public final class AxisDirections extend
     /**
      * Returns {@code true} if the given direction is {@code UP} or {@code DOWN}.
      *
-     * @param  dir The direction to test, or {@code null}.
+     * @param  dir  the direction to test, or {@code null}.
      * @return {@code true} if the direction is vertical, or {@code false} otherwise.
      */
     public static boolean isVertical(final AxisDirection dir) {
@@ -275,7 +274,7 @@ public final class AxisDirections extend
      * Returns {@code true} if the given direction is {@code GEOCENTRIC_X}, {@code GEOCENTRIC_Y}
      * or {@code GEOCENTRIC_Z}.
      *
-     * @param  dir The direction to test, or {@code null}.
+     * @param  dir  the direction to test, or {@code null}.
      * @return {@code true} if the given direction is one of geocentric directions.
      */
     public static boolean isGeocentric(final AxisDirection dir) {
@@ -295,8 +294,8 @@ public final class AxisDirections extend
      *
      * <p>The rules implemented by this method may change in any future SIS version.</p>
      *
-     * @param  dir The direction to test, or {@code null}.
-     * @param  image {@code true} for accepting grid and image axis directions in addition to spatial ones.
+     * @param  dir    the direction to test, or {@code null}.
+     * @param  image  {@code true} for accepting grid and image axis directions in addition to spatial ones.
      * @return {@code true} if the given direction is presumed for spatial CS.
      */
     public static boolean isSpatialOrUserDefined(final AxisDirection dir, final boolean image) {
@@ -308,7 +307,7 @@ public final class AxisDirections extend
     /**
      * Returns {@code true} if the given direction is a user-defined direction (i.e. is not defined by GeoAPI).
      *
-     * @param  dir The direction to test, or {@code null}.
+     * @param  dir  the direction to test, or {@code null}.
      * @return {@code true} if the given direction is user-defined.
      */
     public static boolean isUserDefined(final AxisDirection dir) {
@@ -319,7 +318,7 @@ public final class AxisDirections extend
      * Returns {@code true} if the given direction is {@code COLUMN_POSITIVE}, {@code COLUMN_NEGATICE},
      * {@code ROW_POSITIVE} or {@code ROW_NEGATIVE}.
      *
-     * @param  dir The direction to test, or {@code null}.
+     * @param  dir  the direction to test, or {@code null}.
      * @return {@code true} if the given direction is presumed for grid CS.
      */
     public static boolean isGrid(final AxisDirection dir) {
@@ -331,9 +330,9 @@ public final class AxisDirections extend
     /**
      * Angle between geocentric directions only.
      *
-     * @param  source The start direction.
-     * @param  target The final direction.
-     * @return The angle as a multiple of 90°, or {@link Integer#MIN_VALUE} if none.
+     * @param  source  the start direction.
+     * @param  target  the final direction.
+     * @return the angle as a multiple of 90°, or {@link Integer#MIN_VALUE} if none.
      */
     public static int angleForGeocentric(final AxisDirection source, final AxisDirection target) {
         final int base = GEOCENTRIC_X.ordinal();
@@ -352,9 +351,9 @@ public final class AxisDirections extend
     /**
      * Angle between compass directions only (not for angle between direction along meridians).
      *
-     * @param  source The start direction.
-     * @param  target The final direction.
-     * @return The arithmetic angle as a multiple of 360/{@link #COMPASS_COUNT}, or {@link Integer#MIN_VALUE} if none.
+     * @param  source  the start direction.
+     * @param  target  the final direction.
+     * @return the arithmetic angle as a multiple of 360/{@link #COMPASS_COUNT}, or {@link Integer#MIN_VALUE} if none.
      *
      * @see #isCompass(AxisDirection)
      */
@@ -379,9 +378,9 @@ public final class AxisDirections extend
     /**
      * Angle between display directions only.
      *
-     * @param  source The start direction.
-     * @param  target The final direction.
-     * @return The arithmetic angle as a multiple of 360/{@link #DISPLAY_COUNT}, or {@link Integer#MIN_VALUE} if none.
+     * @param  source  the start direction.
+     * @param  target  the final direction.
+     * @return the arithmetic angle as a multiple of 360/{@link #DISPLAY_COUNT}, or {@link Integer#MIN_VALUE} if none.
      */
     public static int angleForDisplay(final AxisDirection source, final AxisDirection target) {
         final int base = DISPLAY_RIGHT.ordinal();
@@ -415,9 +414,9 @@ public final class AxisDirections extend
      * Returns the angular unit of the specified coordinate system.
      * The preference will be given to the longitude axis, if found.
      *
-     * @param  cs The coordinate system from which to get the angular unit, or {@code null}.
-     * @param  unit The default unit to return if no angular unit is found.
-     * @return The angular unit, of {@code unit} if no angular unit was found.
+     * @param  cs    the coordinate system from which to get the angular unit, or {@code null}.
+     * @param  unit  the default unit to return if no angular unit is found.
+     * @return the angular unit, of {@code unit} if no angular unit was found.
      *
      * @since 0.6
      *
@@ -447,9 +446,9 @@ public final class AxisDirections extend
      * If both the given direction and its opposite exist, then the dimension for the given
      * direction has precedence over the opposite direction.
      *
-     * @param  cs The coordinate system to inspect, or {@code null}.
-     * @param  direction The direction of the axis to search.
-     * @return The dimension of the axis using the given direction or its opposite, or -1 if none.
+     * @param  cs         the coordinate system to inspect, or {@code null}.
+     * @param  direction  the direction of the axis to search.
+     * @return the dimension of the axis using the given direction or its opposite, or -1 if none.
      */
     public static int indexOfColinear(final CoordinateSystem cs, final AxisDirection direction) {
         int fallback = -1;
@@ -472,9 +471,9 @@ public final class AxisDirections extend
      * Returns the index of the first dimension in {@code cs} where axes are colinear with the {@code subCS} axes.
      * If no such dimension is found, returns -1.
      *
-     * @param  cs    The coordinate system which contains all axes.
-     * @param  subCS The coordinate system to search into {@code cs}.
-     * @return The first dimension of a sequence of axes colinear with {@code subCS} axes, or {@code -1} if none.
+     * @param  cs     the coordinate system which contains all axes.
+     * @param  subCS  the coordinate system to search into {@code cs}.
+     * @return the first dimension of a sequence of axes colinear with {@code subCS} axes, or {@code -1} if none.
      *
      * @since 0.5
      */
@@ -508,9 +507,9 @@ public final class AxisDirections extend
      *       then it will be considered equivalent to {@code "WEST"}.</li>
      * </ul>
      *
-     * @param  name The name of the axis direction to search.
-     * @param  directions The list of axis directions in which to search.
-     * @return The first axis direction having a name matching the given one, or {@code null} if none.
+     * @param  name        the name of the axis direction to search.
+     * @param  directions  the list of axis directions in which to search.
+     * @return the first axis direction having a name matching the given one, or {@code null} if none.
      */
     public static AxisDirection find(final String name, final AxisDirection[] directions) {
         for (final AxisDirection candidate : directions) {
@@ -533,8 +532,8 @@ public final class AxisDirections extend
      * The later is a parser which may create new directions, while this method searches only in a set
      * of predefined directions and never create new ones.</p>
      *
-     * @param  name The name of the axis direction to search.
-     * @return The first axis direction having a name matching the given one, or {@code null} if none.
+     * @param  name  the name of the axis direction to search.
+     * @return the first axis direction having a name matching the given one, or {@code null} if none.
      */
     public static AxisDirection valueOf(String name) {
         name = trimWhitespaces(name.replace('_', ' '));
@@ -615,10 +614,10 @@ public final class AxisDirections extend
      * for resolving some ambiguities like whether {@link AxisDirection#EAST} is for "x" (Easting)
      * or "λ" (Longitude).
      *
-     * @param name      The axis name for which to suggest an abbreviation.
-     * @param direction The axis direction for which to suggest an abbreviation.
-     * @param unit      The axis unit of measurement, for disambiguation.
-     * @return A suggested abbreviation.
+     * @param  name       the axis name for which to suggest an abbreviation.
+     * @param  direction  the axis direction for which to suggest an abbreviation.
+     * @param  unit       the axis unit of measurement, for disambiguation.
+     * @return a suggested abbreviation.
      *
      * @since 0.6
      */
@@ -686,9 +685,9 @@ public final class AxisDirections extend
      *   <li>Compound CS: East (km), North (km), Up (m).</li>
      * </ul>
      *
-     * @param  buffer A buffer pre-filled with the name header.
-     * @param  axes The axes to append in the given buffer.
-     * @return A name for the given coordinate system type and axes.
+     * @param  buffer  a buffer pre-filled with the name header.
+     * @param  axes    the axes to append in the given buffer.
+     * @return a name for the given coordinate system type and axes.
      *
      * @since 0.6
      */
@@ -697,9 +696,12 @@ public final class AxisDirections extend
         for (final CoordinateSystemAxis axis : axes) {
             buffer.append(separator).append(Types.getCodeLabel(axis.getDirection()));
             separator = ", ";
-            final String symbol = PatchedUnitFormat.toString(axis.getUnit());
-            if (symbol != null && !symbol.isEmpty()) {
-                buffer.append(" (").append(symbol).append(')');
+            final Unit<?> unit = axis.getUnit();
+            if (unit != null) {
+                final String symbol = unit.toString();
+                if (symbol != null && !symbol.isEmpty()) {
+                    buffer.append(" (").append(symbol).append(')');
+                }
             }
         }
         return buffer.append('.').toString();

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -46,8 +46,8 @@ public final class MetadataUtilities ext
      * Returns the milliseconds value of the given date, or {@link Long#MIN_VALUE}
      * if the date us null.
      *
-     * @param  value The date, or {@code null}.
-     * @return The time in milliseconds, or {@code Long.MIN_VALUE} if none.
+     * @param  value  the date, or {@code null}.
+     * @return the time in milliseconds, or {@code Long.MIN_VALUE} if none.
      */
     public static long toMilliseconds(final Date value) {
         return (value != null) ? value.getTime() : Long.MIN_VALUE;
@@ -57,8 +57,8 @@ public final class MetadataUtilities ext
      * Returns the given milliseconds time to a date object, or returns null
      * if the given time is {@link Long#MIN_VALUE}.
      *
-     * @param  value The time in milliseconds.
-     * @return The date for the given milliseconds value, or {@code null}.
+     * @param  value  the time in milliseconds.
+     * @return the date for the given milliseconds value, or {@code null}.
      */
     public static Date toDate(final long value) {
         return (value != Long.MIN_VALUE) ? new Date(value) : null;
@@ -69,10 +69,10 @@ public final class MetadataUtilities ext
      * then this method logs a warning if we are in process of (un)marshalling a XML document or throw an exception
      * otherwise.
      *
-     * @param  classe   The class which invoke this method.
-     * @param  property The property name. Method name will be inferred by the usual Java bean convention.
-     * @param  strict   {@code true} if the value was expected to be strictly positive, or {@code false} if 0 is accepted.
-     * @param  newValue The argument value to verify.
+     * @param  classe    the class which invoke this method.
+     * @param  property  the property name. Method name will be inferred by the usual Java bean convention.
+     * @param  strict    {@code true} if the value was expected to be strictly positive, or {@code false} if 0 is accepted.
+     * @param  newValue  the argument value to verify.
      * @return {@code true} if the value is valid.
      * @throws IllegalArgumentException if the given value is negative and the problem has not been logged.
      */
@@ -81,7 +81,7 @@ public final class MetadataUtilities ext
     {
         if (newValue != null) {
             final double value = newValue.doubleValue();
-            if (!(strict ? value > 0 : value >= 0)) {   // Use '!' for catching NaN.
+            if (!(strict ? value > 0 : value >= 0)) {                               // Use '!' for catching NaN.
                 if (NilReason.forObject(newValue) == null) {
                     final String msg = logOrFormat(classe, property, strict
                             ? Errors.Keys.ValueNotGreaterThanZero_2
@@ -101,11 +101,11 @@ public final class MetadataUtilities ext
      * If the user argument is outside the expected range of values, then this method logs a warning
      * if we are in process of (un)marshalling a XML document or throw an exception otherwise.
      *
-     * @param  classe   The class which invoke this method.
-     * @param  property Name of the property to check.
-     * @param  minimum  The minimal legal value.
-     * @param  maximum  The maximal legal value.
-     * @param  newValue The value given by the user.
+     * @param  classe    the class which invoke this method.
+     * @param  property  name of the property to check.
+     * @param  minimum   the minimal legal value.
+     * @param  maximum   the maximal legal value.
+     * @param  newValue  the value given by the user.
      * @return {@code true} if the value is valid.
      * @throws IllegalArgumentException if the given value is out of range and the problem has not been logged.
      */
@@ -115,7 +115,7 @@ public final class MetadataUtilities ext
     {
         if (newValue != null) {
             final double value = newValue.doubleValue();
-            if (!(value >= minimum.doubleValue() && value <= maximum.doubleValue())) {  // Use '!' for catching NaN.
+            if (!(value >= minimum.doubleValue() && value <= maximum.doubleValue())) {      // Use '!' for catching NaN.
                 if (NilReason.forObject(newValue) == null) {
                     final String msg = logOrFormat(classe, property,
                             Errors.Keys.ValueOutOfRange_4, property, minimum, maximum, newValue);
@@ -133,10 +133,10 @@ public final class MetadataUtilities ext
      * Formats an error message and logs it if we are (un)marshalling a document, or return the message otherwise.
      * In the later case, it is caller's responsibility to use the message for throwing an exception.
      *
-     * @param  classe    The caller class, used only in case of warning message to log.
-     * @param  property  The property name. Method name will be inferred by the usual Java bean convention.
-     * @param  key       A {@code Errors.Keys} value.
-     * @param  arguments The argument to use for formatting the error message.
+     * @param  classe     the caller class, used only in case of warning message to log.
+     * @param  property   the property name. Method name will be inferred by the usual Java bean convention.
+     * @param  key        a {@code Errors.Keys} value.
+     * @param  arguments  the argument to use for formatting the error message.
      * @return {@code null} if the message has been logged, or the message to put in an exception otherwise.
      */
     private static String logOrFormat(final Class<?> classe, final String property, final short key, final Object... arguments) {
@@ -164,9 +164,9 @@ public final class MetadataUtilities ext
      *       warning or error messages in future SIS versions.</li>
      * </ul>
      *
-     * @param  classe The caller class, used only in case of warning message to log.
-     * @param  method The caller method, used only in case of warning message to log.
-     * @param  name   The property name, used only in case of error message to format.
+     * @param  classe  the caller class, used only in case of warning message to log.
+     * @param  method  the caller method, used only in case of warning message to log.
+     * @param  name    the property name, used only in case of error message to format.
      * @throws IllegalStateException if {@code isDefined} is {@code true} and we are not unmarshalling an object.
      *
      * @since 0.7
@@ -186,8 +186,8 @@ public final class MetadataUtilities ext
      * Returns the {@code gco:id} or {@code gml:id} value to use for the given object.
      * The returned identifier will be unique in the current XML document.
      *
-     * @param  object The object for which to get the unique identifier.
-     * @return The unique XML identifier, or {@code null} if none.
+     * @param  object  the object for which to get the unique identifier.
+     * @return the unique XML identifier, or {@code null} if none.
      *
      * @since 0.7
      */
@@ -206,7 +206,7 @@ public final class MetadataUtilities ext
                     final int s = buffer.append('-').length();
                     int n = 0;
                     do {
-                        if (++n == 100) return null;    //  Arbitrary limit.
+                        if (++n == 100) return null;                        //  Arbitrary limit.
                         id = buffer.append(n).toString();
                         buffer.setLength(s);
                     } while (!Context.setObjectForID(context, object, id));
@@ -220,8 +220,8 @@ public final class MetadataUtilities ext
      * Invoked by {@code setID(String)} method implementations for assigning an identifier to an object
      * at unmarshalling time.
      *
-     * @param object The object for which to assign an identifier.
-     * @param id The {@code gco:id} or {@code gml:id} value.
+     * @param object  the object for which to assign an identifier.
+     * @param id      the {@code gco:id} or {@code gml:id} value.
      *
      * @since 0.7
      */

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -19,7 +19,7 @@ package org.apache.sis.internal.metadata
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.parameter.*;
 import org.opengis.referencing.*;
 import org.opengis.referencing.cs.*;

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -19,7 +19,7 @@ package org.apache.sis.internal.metadata
 import java.util.Map;
 import java.util.Collections;
 import java.util.Locale;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.measure.quantity.Length;
 import org.opengis.geometry.Envelope;
 import org.opengis.parameter.ParameterDescriptor;

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -17,11 +17,11 @@
 package org.apache.sis.internal.metadata;
 
 import java.util.Collections;
-import javax.measure.unit.SI;
 import org.opengis.util.RecordType;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.quality.PositionalAccuracy;
 import org.opengis.metadata.quality.EvaluationMethodType;
+import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.iso.quality.DefaultQuantitativeResult;
 import org.apache.sis.metadata.iso.quality.DefaultAbsoluteExternalPositionalAccuracy;
 import org.apache.sis.util.collection.WeakValueHashMap;
@@ -35,7 +35,7 @@ import org.apache.sis.util.Static;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 public final class TransformationAccuracy extends Static {
@@ -78,7 +78,7 @@ public final class TransformationAccurac
 
             final DefaultQuantitativeResult result = new DefaultQuantitativeResult();
             result.setValues(Collections.singletonList(record));
-            result.setValueUnit(SI.METRE);              // In metres by definition in the EPSG database.
+            result.setValueUnit(Units.METRE);              // In metres by definition in the EPSG database.
             result.setValueType(TYPE);
 
             final DefaultAbsoluteExternalPositionalAccuracy element =

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -17,7 +17,7 @@
 package org.apache.sis.internal.metadata;
 
 import java.util.Collection;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.CodeList;
 import org.opengis.util.GenericName;
 import org.opengis.referencing.datum.VerticalDatumType;

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -29,14 +29,15 @@ import java.text.ParseException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.LogRecord;
-import javax.measure.unit.Unit;
-import javax.measure.unit.UnitFormat;
+import javax.measure.Unit;
+import javax.measure.format.ParserException;
 import org.opengis.util.FactoryException;
 import org.opengis.util.InternationalString;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.internal.util.LocalizedParseException;
 import org.apache.sis.internal.util.StandardDateFormat;
 import org.apache.sis.measure.Units;
+import org.apache.sis.measure.UnitFormat;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.logging.Logging;
@@ -58,7 +59,7 @@ import static org.apache.sis.util.Argume
  * @author  Rémi Eve (IRD)
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.6
- * @version 0.7
+ * @version 0.8
  * @module
  */
 abstract class AbstractParser implements Parser {
@@ -142,12 +143,12 @@ abstract class AbstractParser implements
     /**
      * Constructs a parser using the specified set of symbols.
      *
-     * @param symbols       The set of symbols to use.
-     * @param fragments     Reference to the {@link WKTFormat#fragments} map, or an empty map if none.
-     * @param numberFormat  The number format provided by {@link WKTFormat}, or {@code null} for a default format.
-     * @param dateFormat    The date format provided by {@link WKTFormat}, or {@code null} for a default format.
-     * @param unitFormat    The unit format provided by {@link WKTFormat}, or {@code null} for a default format.
-     * @param errorLocale   The locale for error messages (not for parsing), or {@code null} for the system default.
+     * @param  symbols       the set of symbols to use.
+     * @param  fragments     reference to the {@link WKTFormat#fragments} map, or an empty map if none.
+     * @param  numberFormat  the number format provided by {@link WKTFormat}, or {@code null} for a default format.
+     * @param  dateFormat    the date format provided by {@link WKTFormat}, or {@code null} for a default format.
+     * @param  unitFormat    the unit format provided by {@link WKTFormat}, or {@code null} for a default format.
+     * @param  errorLocale   the locale for error messages (not for parsing), or {@code null} for the system default.
      */
     AbstractParser(final Symbols symbols, final Map<String,Element> fragments, NumberFormat numberFormat,
             final DateFormat dateFormat, final UnitFormat unitFormat, final Locale errorLocale)
@@ -200,8 +201,8 @@ abstract class AbstractParser implements
      * Creates the object from a string. This method is for implementation of {@code createFromWKT(String)}
      * method is SIS factories only.
      *
-     * @param  text Coordinate system encoded in Well-Known Text format (version 1 or 2).
-     * @return The result of parsing the given text.
+     * @param  text  coordinate system encoded in Well-Known Text format (version 1 or 2).
+     * @return the result of parsing the given text.
      * @throws FactoryException if the object creation failed.
      *
      * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createFromWKT(String)
@@ -255,9 +256,9 @@ abstract class AbstractParser implements
     /**
      * Parses a <cite>Well Know Text</cite> (WKT).
      *
-     * @param  text The text to be parsed.
-     * @param  position The position to start parsing from.
-     * @return The parsed object.
+     * @param  text      the text to be parsed.
+     * @param  position  the position to start parsing from.
+     * @return the parsed object.
      * @throws ParseException if the string can not be parsed.
      */
     public Object parseObject(final String text, final ParsePosition position) throws ParseException {
@@ -288,8 +289,8 @@ abstract class AbstractParser implements
     /**
      * Parses the next element in the specified <cite>Well Know Text</cite> (WKT) tree.
      *
-     * @param  element The element to be parsed.
-     * @return The parsed object.
+     * @param  element  the element to be parsed.
+     * @return the parsed object.
      * @throws ParseException if the element can not be parsed.
      */
     abstract Object parseObject(final Element element) throws ParseException;
@@ -332,35 +333,25 @@ abstract class AbstractParser implements
     /**
      * Parses the given unit symbol.
      */
-    final Unit<?> parseUnit(final String text) throws ParseException, IllegalArgumentException {
+    final Unit<?> parseUnit(final String text) throws ParserException {
         if (unitFormat == null) {
-            if (symbols.getLocale() == Locale.ROOT) {
-                return Units.valueOf(text);             // Most common case, avoid the convolved code below.
-            }
-            unitFormat = UnitFormat.getInstance(symbols.getLocale());
-        }
-        /*
-         * This convolved code tries to workaround JSR-275 limitations.
-         */
-        try {
-            return (Unit<?>) unitFormat.parseObject(text);
-        } catch (ParseException e) {
-            try {
-                return Units.valueOf(text);
-            } catch (IllegalArgumentException e2) {
-                e.addSuppressed(e2);
-                throw e;
+            final Locale locale = symbols.getLocale();
+            if (locale == Locale.ROOT) {
+                return Units.valueOf(text);             // Most common case.
             }
+            unitFormat = new UnitFormat(locale);
+            unitFormat.setStyle(UnitFormat.Style.NAME);
         }
+        return unitFormat.parse(text);
     }
 
     /**
      * Reports a non-fatal warning that occurred while parsing a WKT.
      *
-     * @param parent  The parent element, or {@code null} if unknown.
-     * @param element The element that we can not parse, or {@code null} if unknown.
-     * @param message The message. Can be {@code null} only if {@code ex} is non-null.
-     * @param ex      The non-fatal exception that occurred while parsing the element, or {@code null}.
+     * @param  parent   the parent element, or {@code null} if unknown.
+     * @param  element  the element that we can not parse, or {@code null} if unknown.
+     * @param  message  the message. Can be {@code null} only if {@code ex} is non-null.
+     * @param  ex       the non-fatal exception that occurred while parsing the element, or {@code null}.
      */
     final void warning(final Element parent, final Element element, final InternationalString message, final Exception ex) {
         warning(parent, (element != null) ? element.keyword : null, message, ex);
@@ -369,10 +360,10 @@ abstract class AbstractParser implements
     /**
      * Reports a non-fatal warning that occurred while parsing a WKT.
      *
-     * @param parent  The parent element, or {@code null} if unknown.
-     * @param element The name of the element that we can not parse, or {@code null} if unknown.
-     * @param message The message. Can be {@code null} only if {@code ex} is non-null.
-     * @param ex      The non-fatal exception that occurred while parsing the element, or {@code null}.
+     * @param  parent   the parent element, or {@code null} if unknown.
+     * @param  element  the name of the element that we can not parse, or {@code null} if unknown.
+     * @param  message  the message. Can be {@code null} only if {@code ex} is non-null.
+     * @param  ex       the non-fatal exception that occurred while parsing the element, or {@code null}.
      */
     final void warning(final Element parent, final String element, final InternationalString message, final Exception ex) {
         if (warnings == null) {
@@ -389,7 +380,7 @@ abstract class AbstractParser implements
      * <p>The returned object is valid only before a new parsing starts. If a longer lifetime is desired,
      * then the caller <strong>must</strong> invokes {@link Warnings#publish()}.</p>
      *
-     * @param object The object that resulted from the parsing operation, or {@code null}.
+     * @param  object  the object that resulted from the parsing operation, or {@code null}.
      */
     final Warnings getAndClearWarnings(final Object object) {
         Warnings w = warnings;

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -84,7 +84,7 @@ public enum Convention {
      *   <li>{@code Axis} element omits the {@code Order} sub-element.</li>
      *   <li>{@code Unit} elements are less verbose:<ul>
      *     <li>{@code Ellipsoid} and {@code VerticalExtent} elements omit the {@code LengthUnit} sub-element
-     *         if that unit is {@link javax.measure.unit.SI#METRE}.</li>
+     *         if that unit is {@link org.apache.sis.measure.Units#METRE}.</li>
      *     <li>{@code Parameter} elements omit the {@code LengthUnit} sub-element
      *         if that unit is the same than the unit of the {@code ProjectedCRS} axes.</li>
      *     <li>{@code Parameter} and {@code PrimeMeridian} elements omit the {@code AngleUnit} sub-element

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java?rev=1767577&r1=1767576&r2=1767577&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] Tue Nov  1 21:03:06 2016
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.io.wkt;
 
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.CodeList;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
@@ -59,7 +59,7 @@ public enum ElementKind {
     INTEGER,
 
     /**
-     * {@linkplain javax.measure.unit.Unit Units of measurement},
+     * {@linkplain javax.measure.Unit Units of measurement},
      * often represented by {@code UNIT[…]} elements.
      */
     UNIT,



Mime
View raw message