Author: desruisseaux
Date: Sat Feb 24 15:44:08 2018
New Revision: 1825252
URL: http://svn.apache.org/viewvc?rev=1825252&view=rev
Log:
Merge from JDK8 branch.
Added:
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/description.txt
- copied unchanged from r1825250,
sis/branches/JDK8/application/sis-openoffice/src/main/unopkg/description.txt
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/license.txt
- copied unchanged from r1825250,
sis/branches/JDK8/application/sis-openoffice/src/main/unopkg/license.txt
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/FoliationRepresentation.java
- copied unchanged from r1825250,
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FoliationRepresentation.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ResourceOnFileSystem.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ResourceOnFileSystem.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ResourceTransaction.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ResourceTransaction.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreMetadata.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreMetadata.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreUtilities.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreUtilities.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TransactionalResource.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TransactionalResource.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/WritableStore.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/WritableStore.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/DataOptionKey.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataOptionKey.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableAggregate.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableAggregate.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableFeatureSet.java
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableFeatureSet.java
sis/branches/JDK9/storage/sis-storage/src/test/resources/org/apache/sis/internal/storage/folder/test-data/crs.prj
- copied unchanged from r1825250,
sis/branches/JDK8/storage/sis-storage/src/test/resources/org/apache/sis/internal/storage/folder/test-data/crs.prj
Removed:
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Capabilities.java
Modified:
sis/branches/JDK9/ (props changed)
sis/branches/JDK9/NOTICE
sis/branches/JDK9/README
sis/branches/JDK9/application/pom.xml
sis/branches/JDK9/application/sis-console/src/main/artifact/README
sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java
sis/branches/JDK9/application/sis-openoffice/pom.xml
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/Referencing.xcu
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/build-instruction.html
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/description.xml
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/org/apache/sis/openoffice/XReferencing.class
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/sis.rdb
sis/branches/JDK9/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
sis/branches/JDK9/core/sis-build-helper/src/main/ant/prepare-release.xml
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/builder/OperationWrapper.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
sis/branches/JDK9/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
sis/branches/JDK9/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
sis/branches/JDK9/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/CoordinateFormat.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/GeodeticObjectBuilder.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/WKTUtilities.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/LinearTransform2D.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ZonedTransverseMercator.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/AuthorityFactories.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/SQLTranslator.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameter.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/system/Threads.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractUnit.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/package-info.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/logging/WarningListenersTest.java
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
sis/branches/JDK9/ide-project/NetBeans/build.xml
sis/branches/JDK9/pom.xml
sis/branches/JDK9/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
sis/branches/JDK9/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStoreProvider.java
sis/branches/JDK9/storage/sis-gdal/src/main/resources/native/linux/libproj-binding.so
(props changed)
sis/branches/JDK9/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
sis/branches/JDK9/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
sis/branches/JDK9/storage/sis-netcdf/pom.xml
sis/branches/JDK9/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
sis/branches/JDK9/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
sis/branches/JDK9/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java
sis/branches/JDK9/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
sis/branches/JDK9/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
sis/branches/JDK9/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
sis/branches/JDK9/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Capability.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/DocumentedStoreProvider.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.properties
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources_fr.properties
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/URIDataStore.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/StoreProvider.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/FolderStoreProvider.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/package-info.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/package-info.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/StoreProvider.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/StoreProvider.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/ReadOnlyStorageException.java
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/package-info.java
sis/branches/JDK9/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
sis/branches/JDK9/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java
sis/branches/JDK9/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/GroupAsPolylineOperation.java
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Link.java
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Reader.java
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/StoreProvider.java
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
sis/branches/JDK9/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
sis/branches/JDK9/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
Propchange: sis/branches/JDK9/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 24 15:44:08 2018
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1773327-1813747
+/sis/branches/JDK8:1773327-1825250
/sis/trunk:1394364-1508466,1519089-1519674
Modified: sis/branches/JDK9/NOTICE
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/NOTICE?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
--- sis/branches/JDK9/NOTICE (original)
+++ sis/branches/JDK9/NOTICE Sat Feb 24 15:44:08 2018
@@ -1,5 +1,5 @@
Apache Spatial Information System (SIS)
-Copyright 2010-2015 The Apache Software Foundation
+Copyright 2010-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -8,11 +8,28 @@ The Javadoc contains documentation from
(OGC®) specifications (http://www.opengeospatial.org/standards/), also
known as OpenGIS.
-The matrix package contains code adapted from JAMA Java Matrix Package
-(http://math.nist.gov/javanumerics/jama/)
+Apache SIS depends on GeoAPI published by OGC under BSD-style license.
+http://www.opengeospatial.org/ogc/software
-Some modules use the Esri Geometry API developed by ESRI
-(http://github.com/Esri/geometry-api-java/)
+Apache SIS depends on JSR-363 (API only) published under BSD license.
+https://www.jcp.org/aboutJava/communityprocess/final/jsr363/index.html
+
+The 'org.apache.sis.referencing.operation.matrix' package contains code
+adapted from JAMA Java Matrix Package in public domain.
+http://math.nist.gov/javanumerics/jama/
+
+The 'sis-feature' module can optionally use the Esri Geometry API
+developed by ESRI under Apache license 2.
+http://github.com/Esri/geometry-api-java/
+
+The 'sis-netcdf' module can optionally use the UCAR netCDF library
+developed by Unidata under MIT-style license.
+http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/
The test suite uses software developed by the JUnit community
-(http://github.com/junit-team/junit.contrib/)
+under Eclipse public license version 2.
+http://junit.org/junit4/
+
+The 'non-free' group of modules contain geodetic data collected
+by the International Association of Oil and Gas Producers.
+http://www.epsg.org/TermsOfUse
Modified: sis/branches/JDK9/README
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/README?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
--- sis/branches/JDK9/README (original)
+++ sis/branches/JDK9/README Sat Feb 24 15:44:08 2018
@@ -2,20 +2,17 @@
Welcome to Apache SIS <http://sis.apache.org>
=============================================
-SIS is a free software, Java language library for developing geospatial
-applications. The library can be used for desktop or server applications.
-SIS is an implementation of GeoAPI 3.0 interfaces. SIS provides data structures
-for geographic data and associated metadata along with methods to manipulate
-those data structures. The SIS metadata module forms the base of the library
-and enables the creation of metadata objects which comply with the ISO 19115
-metadata model and which can be read from or written to ISO 19139 compliant
-XML documents. The SIS referencing module will enable the construction of
-geodetic data structures for geospatial referencing based on the ISO 19111
-model such as axis, projection and coordinate reference system definitions,
-along with the associated operations which enable the mathematical conversion
-of coordinates between different systems of reference. The SIS storage modules
-will provide a common approach to the reading and writing of grid coverages
-applicable to simple imagery as to many dimensional data structures.
+SIS provides data structures for geographic data and associated metadata
+along with methods to manipulate those data structures. The SIS metadata
+module forms the base of the library and enables the creation of metadata
+objects which comply with the model of ISO 19115 series of standards.
+The SIS referencing module enable the construction of geodetic data structures
+for geospatial referencing such as axis, projection and coordinate reference
+system definitions, along with the associated operations which enable the
+mathematical conversion of coordinates between different systems of reference.
+The SIS storage modules will provide a common approach to the reading and
+writing of grid coverages applicable to simple imagery as to many dimensional
+data structures.
SIS is a project of the Apache Software Foundation <http://www.apache.org/>.
@@ -29,7 +26,7 @@ Getting Started
SIS requires Java 7 and uses the Maven 3 <http://maven.apache.org/>
build system. To build SIS, use the following command in this directory:
- mvn clean install
+ mvn install
Information for running a command-line tool can be found on the web site:
(<http://sis.apache.org/command-line.html>)
@@ -55,9 +52,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-Apache SIS includes a number of subcomponents with separate copyright
-notices and license terms. Your use of these subcomponents is subject to
-the terms and conditions of the licenses listed in the LICENSE file.
+Some Apache SIS subcomponents have dependencies subject to different
+license terms. All those dependencies except GeoAPI and JSR-363 are
+optional. Your use of those dependencies is subject to the terms and
+conditions of the licenses listed in the NOTICE file.
Mailing Lists
Modified: sis/branches/JDK9/application/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/pom.xml?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
--- sis/branches/JDK9/application/pom.xml (original)
+++ sis/branches/JDK9/application/pom.xml Sat Feb 24 15:44:08 2018
@@ -118,7 +118,16 @@
<module>sis-console</module>
<module>sis-javafx</module>
<!--<module>sis-webapp</module> Omitted until maven-war-plugin is made
compatible with JDK9. -->
-<!--<module>sis-openoffice</module> Omitted for now because of the
numerous warnings emitted by Pack200. -->
</modules>
+ <!-- Following module is omitted for now (unless doing a release)
+ because of the numerous warnings emitted by Pack200. -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <modules>
+ <module>sis-openoffice</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: sis/branches/JDK9/application/sis-console/src/main/artifact/README
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-console/src/main/artifact/README?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
--- sis/branches/JDK9/application/sis-console/src/main/artifact/README [UTF-8]
(original)
+++ sis/branches/JDK9/application/sis-console/src/main/artifact/README [UTF-8]
Sat Feb 24 15:44:08 2018
@@ -17,8 +17,8 @@ SIS is based on Java 7 and provided as a
Unix
----
-1) Unzip 'apache-sis-0.8-bin.zip' in any directory.
-2) Add the 'apache-sis-0.8/bin' directory to the path.
+1) Unzip 'apache-sis-1.0-bin.zip' in any directory.
+2) Add the 'apache-sis-1.0/bin' directory to the path.
3) Invoke 'sis' on the command line.
Windows
@@ -26,8 +26,8 @@ Windows
There is not yet 'sis.bat' file for Windows.
The following steps need to be done manually:
-1) Unzip 'apache-sis-0.8-bin.zip' in any directory.
-2) In the 'apache-sis-0.8/lib' directory, execute:
+1) Unzip 'apache-sis-1.0-bin.zip' in any directory.
+2) In the 'apache-sis-1.0/lib' directory, execute:
unpack200 --remove-pack-file sis.pack.gz sis.jar
Modified:
sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -39,6 +39,7 @@ import org.apache.sis.util.collection.Ta
import org.apache.sis.internal.system.Loggers;
import org.apache.sis.internal.system.Supervisor;
import org.apache.sis.internal.system.SupervisorMBean;
+import org.apache.sis.internal.system.DataDirectory;
import org.apache.sis.internal.util.StandardDateFormat;
import org.apache.sis.internal.util.X364;
@@ -84,6 +85,7 @@ final class AboutCommand extends Command
*/
@Override
public int run() throws Exception {
+ DataDirectory.quiet();
/*
* Check the number of arguments, which can be 0 or 1. If present,
* the argument is the name and port number of a remote machine.
Modified: sis/branches/JDK9/application/sis-openoffice/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/pom.xml?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
--- sis/branches/JDK9/application/sis-openoffice/pom.xml (original)
+++ sis/branches/JDK9/application/sis-openoffice/pom.xml Sat Feb 24 15:44:08
2018
@@ -133,6 +133,21 @@
</dependency>
</dependencies>
+ <!-- Because the EPSG database is not free, require the user to ask it
explicitely. -->
+ <profiles>
+ <profile>
+ <id>non-free</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sis.non-free</groupId>
+ <artifactId>sis-embedded-data</artifactId>
+ <version>${sis.non-free.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!-- ===========================================================
Build Configuration
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -65,7 +65,7 @@ final class AnglePattern {
/**
* Converts the given argument to a pattern valid for {@link AngleFormat}.
*
- * @param patternOrVoid the optional pattern argument from the OpenOffice
formula.
+ * @param patternOrVoid the optional pattern argument from the
OpenOffice formula.
* @throws IllegalArgumentException if {@code patternOrVoid} is not a
string value or void.
*/
AnglePattern(final Object patternOrVoid) throws IllegalArgumentException {
@@ -90,7 +90,7 @@ final class AnglePattern {
* Returns the angle format to use for this pattern. The formatter is
cached on the assumption
* that the same pattern will be used for formatting more than once.
*
- * @param locale the locale.
+ * @param locale the locale.
* @return the angle format for this pattern and the given locale.
*/
private AngleFormat getAngleFormat(final Locale locale) {
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -17,10 +17,8 @@
package org.apache.sis.openoffice;
import java.util.Arrays;
-import org.apache.sis.util.collection.Cache;
-
-// Branch-dependent imports
import java.util.Objects;
+import org.apache.sis.util.collection.Cache;
/**
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -30,6 +30,7 @@ import com.sun.star.lib.uno.helper.WeakB
import org.apache.sis.util.Classes;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.logging.Logging;
+import org.apache.sis.util.resources.Vocabulary;
/**
@@ -148,10 +149,9 @@ public abstract class CalcAddins extends
* The string to returns when a formula does not have any value to return.
*
* @return the string with a message for missing values.
- * @todo localize.
*/
- static String noResultString() {
- return "(none)";
+ final String noResultString() {
+ return
Vocabulary.getResources(getJavaLocale()).getString(Vocabulary.Keys.Unknown);
}
/**
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -183,6 +183,89 @@ public class ReferencingFunctions extend
}
/**
+ * Returns the identified object scope from an authority code.
+ *
+ * @param codeOrPath the code allocated by an authority, or the path to
a file.
+ * @return the object scope.
+ */
+ @Override
+ public String getScope(final String codeOrPath) {
+ final Object value;
+ try {
+ final IdentifiedObject object = getIdentifiedObject(codeOrPath,
null);
+ value =
IdentifiedObjects.getProperties(object).get(ReferenceSystem.SCOPE_KEY);
+ } catch (Exception exception) {
+ return getLocalizedMessage(exception);
+ }
+ return (value instanceof InternationalString)
+ ? ((InternationalString) value).toString(getJavaLocale()) :
noResultString();
+ }
+
+ /**
+ * Returns the domain of validity from an authority code.
+ *
+ * @param codeOrPath the code allocated by an authority, or the path to
a file.
+ * @return the domain of validity.
+ */
+ @Override
+ public String getDomainOfValidity(final String codeOrPath) {
+ final Object domain;
+ try {
+ final IdentifiedObject object = getIdentifiedObject(codeOrPath,
null);
+ domain =
IdentifiedObjects.getProperties(object).get(ReferenceSystem.DOMAIN_OF_VALIDITY_KEY);
+ } catch (Exception exception) {
+ return getLocalizedMessage(exception);
+ }
+ if (domain instanceof Extent) {
+ final InternationalString description = ((Extent)
domain).getDescription();
+ if (description != null) {
+ return description.toString(getJavaLocale());
+ }
+ }
+ return noResultString();
+ }
+
+ /**
+ * Returns the domain of validity as a geographic bounding box for an
identified object.
+ * This method returns a 2×2 matrix:
+ * the first row contains the latitude and longitude of upper left corner,
+ * and the second row contains the latitude and longitude of bottom right
corner.
+ * Units are degrees.
+ *
+ * @param codeOrPath the code allocated by an authority, or the path to
a file.
+ * @return the object bounding box.
+ */
+ @Override
+ public double[][] getGeographicArea(final String codeOrPath) {
+ final CacheKey<GeographicBoundingBox> key = new
CacheKey<>(GeographicBoundingBox.class, codeOrPath, null, null);
+ GeographicBoundingBox area = key.peek();
+ if (area == null) {
+ final Cache.Handler<GeographicBoundingBox> handler = key.lock();
+ try {
+ area = handler.peek();
+ if (area == null) try {
+ final IdentifiedObject object =
getIdentifiedObject(codeOrPath, null);
+ final Object domain =
IdentifiedObjects.getProperties(object).get(ReferenceSystem.DOMAIN_OF_VALIDITY_KEY);
+ if (domain instanceof Extent) {
+ area = Extents.getGeographicBoundingBox((Extent)
domain);
+ }
+ } catch (Exception exception) {
+ reportException("getGeographicArea", exception);
+ }
+ } finally {
+ handler.putAndUnlock(area);
+ }
+ }
+ if (area == null) {
+ return new double[][] {};
+ }
+ return new double[][] {
+ new double[] {area.getNorthBoundLatitude(),
area.getWestBoundLongitude()},
+ new double[] {area.getSouthBoundLatitude(),
area.getEastBoundLongitude()}
+ };
+ }
+
+ /**
* Returns the axis name and units for the specified dimension in a
coordinate reference system or coordinate system.
* This method returns a short axis name as used in Well Known Text (WKT)
format, for example <cite>"Latitude"</cite>
* instead of <cite>"Geodetic latitude"</cite>.
@@ -245,46 +328,6 @@ public class ReferencingFunctions extend
}
/**
- * Returns the domain of validity as a geographic bounding box for an
identified object.
- * This method returns a 2×2 matrix:
- * the first row contains the latitude and longitude of upper left corner,
- * and the second row contains the latitude and longitude of bottom right
corner.
- * Units are degrees.
- *
- * @param codeOrPath the code allocated by an authority, or the path to
a file.
- * @return the object bounding box.
- */
- @Override
- public double[][] getGeographicArea(final String codeOrPath) {
- final CacheKey<GeographicBoundingBox> key = new
CacheKey<>(GeographicBoundingBox.class, codeOrPath, null, null);
- GeographicBoundingBox area = key.peek();
- if (area == null) {
- final Cache.Handler<GeographicBoundingBox> handler = key.lock();
- try {
- area = handler.peek();
- if (area == null) try {
- final IdentifiedObject object =
getIdentifiedObject(codeOrPath, null);
- final Object domain =
IdentifiedObjects.getProperties(object).get(ReferenceSystem.DOMAIN_OF_VALIDITY_KEY);
- if (domain instanceof Extent) {
- area = Extents.getGeographicBoundingBox((Extent)
domain);
- }
- } catch (Exception exception) {
- reportException("getGeographicArea", exception);
- }
- } finally {
- handler.putAndUnlock(area);
- }
- }
- if (area == null) {
- return new double[][] {};
- }
- return new double[][] {
- new double[] {area.getNorthBoundLatitude(),
area.getWestBoundLongitude()},
- new double[] {area.getSouthBoundLatitude(),
area.getEastBoundLongitude()}
- };
- }
-
- /**
* Gets the {@code IdentifiedObject} for the given code as a {@code
CoordinateReferenceSystem}.
*
* @param codeOrPath the code allocated by an authority, or the path to
a file.
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -62,7 +62,12 @@ public final class Registration implemen
static final String LOGGER = "org.apache.sis.openoffice";
/**
- * Whether to force EPSG database startup early.
+ * Whether to force EPSG database startup early, for example in order to
force database creation from SQL scripts.
+ * The SQL scripts may be used if this module depends on {@code sis-epsg}
module, or if {@code SIS_DATA} directory
+ * contains a {@code "Databases/ExternalSources"} sub-directory. When such
database creation is necessary, it may
+ * be less surprising for users to perform this lengthly task at add-in
installation time instead than when the
+ * formulas are first used. However if the add-in depend on {@code
sis-embedded-data} instead, then early startup
+ * is less useful since there is no database to create.
*/
private static final boolean FORCE_EPSG_STARTUP = false;
@@ -182,8 +187,8 @@ public final class Registration implemen
/**
* Filters a directory content in order to retain only the {@code
"*.pack"} files.
*
- * @param directory the add-in installation directory.
- * @param name the name of a file in the given directory.
+ * @param directory the add-in installation directory.
+ * @param name the name of a file in the given directory.
*/
@Override
public boolean accept(final File directory, final String name) {
@@ -194,7 +199,7 @@ public final class Registration implemen
* Returns a factory for creating the service.
* This method is called by the {@code
com.sun.star.comp.loader.JavaLoader}; do not rename!
*
- * @param implementation the name of the implementation for which a
service is desired.
+ * @param implementation the name of the implementation for which a
service is desired.
* @return a factory for creating the component.
*/
public static XSingleComponentFactory __getComponentFactory(final String
implementation) {
@@ -214,7 +219,7 @@ public final class Registration implemen
* Writes the service information into the given registry key.
* This method is called by the {@code
com.sun.star.comp.loader.JavaLoader}; do not rename!
*
- * @param registry the registry key.
+ * @param registry the registry key.
* @return {@code true} if the operation succeeded.
*/
public static boolean __writeRegistryServiceInfo(final XRegistryKey
registry) {
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -44,12 +44,16 @@ module org {
[in] string codeOrPath
);
- /// Returns the axis name for the specified dimension in an
identified object.
- string getAxis(
+ /// Returns the scope of an identified object.
+ string getScope(
/// The authority code (e.g. "EPSG:4326").
- [in] string codeOrPath,
- /// The dimension (1, 2, ...).
- [in] long dimension
+ [in] string codeOrPath
+ );
+
+ /// Returns the domain of validity as country or region names for an
identified object.
+ string getDomainOfValidity(
+ /// The authority code (e.g. "EPSG:4326").
+ [in] string codeOrPath
);
/// Returns the domain of validity as a geographic bounding box for
an identified object.
@@ -68,6 +72,14 @@ module org {
[in] any areaOfInterest
) raises (com::sun::star::lang::IllegalArgumentException);
+ /// Returns the axis name for the specified dimension in an
identified object.
+ string getAxis(
+ /// The authority code (e.g. "EPSG:4326").
+ [in] string codeOrPath,
+ /// The dimension (1, 2, ...).
+ [in] long dimension
+ );
+
/// Transforms a list of coordinates from source CRS to target CRS.
sequence< sequence< double > > transformPoints(
/// Authority code of the source coordinate reference system.
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -46,15 +46,20 @@ public interface XReferencing extends XI
String getName(String codeOrPath);
/**
- * Returns the axis name and units for the specified dimension in a
coordinate reference system or coordinate system.
- * This method returns a short axis name as used in Well Known Text (WKT)
format, for example <cite>"Latitude"</cite>
- * instead of <cite>"Geodetic latitude"</cite>.
+ * Returns the scope of an identified object.
*
* @param codeOrPath the code allocated by an authority, or the path to
a file.
- * @param dimension the dimension (1, 2, …).
- * @return the name of the requested axis.
+ * @return the object scope.
*/
- String getAxis(String codeOrPath, int dimension);
+ String getScope(String codeOrPath);
+
+ /**
+ * Returns the domain of validity as country or region names for an
identified object.
+ *
+ * @param codeOrPath the code allocated by an authority, or the path to
a file.
+ * @return the domain of validity.
+ */
+ String getDomainOfValidity(String codeOrPath);
/**
* Returns the domain of validity as a geographic bounding box for an
identified object.
@@ -80,6 +85,17 @@ public interface XReferencing extends XI
double getAccuracy(String sourceCRS, String targetCRS, Object
areaOfInterest) throws IllegalArgumentException;
/**
+ * Returns the axis name and units for the specified dimension in a
coordinate reference system or coordinate system.
+ * This method returns a short axis name as used in Well Known Text (WKT)
format, for example <cite>"Latitude"</cite>
+ * instead of <cite>"Geodetic latitude"</cite>.
+ *
+ * @param codeOrPath the code allocated by an authority, or the path to
a file.
+ * @param dimension the dimension (1, 2, …).
+ * @return the name of the requested axis.
+ */
+ String getAxis(String codeOrPath, int dimension);
+
+ /**
* Transforms coordinates from the specified source CRS to the specified
target CRS.
*
* @param sourceCRS the authority code for the source coordinate
reference system.
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/Referencing.xcu
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/Referencing.xcu?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/Referencing.xcu
(original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/Referencing.xcu
Sat Feb 24 15:44:08 2018
@@ -51,14 +51,14 @@
</node>
</node>
- <node oor:name="getAxis" oor:op="replace">
+ <node oor:name="getScope" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="en">CRS.AXIS</value>
- <value xml:lang="fr">AXE.SRS</value>
+ <value xml:lang="en">CRS.USAGE</value>
+ <value xml:lang="fr">USAGE.SRS</value>
</prop>
<prop oor:name="Description">
- <value xml:lang="en">Returns the axis name for the specified
dimension in a Coordinate Reference System (CRS) identified by the given
code.</value>
- <value xml:lang="fr">Retourne le nom de lâaxe à la dimension
spécifiée dans un Système de Références Spatiales (SRS) identifié par le
code donné.</value>
+ <value xml:lang="en">Returns the usage scope of an object
identified by the given code. The object is usually, but not necessarily, a
Coordinate Reference System (CRS).</value>
+ <value xml:lang="fr">Retourne le domaine dâutilisation dâun
objet identifié par le code donné. Lâobjet est habituellement, mais pas
obligatoirement, un Système de Références Spatiales (SRS).</value>
</prop>
<prop oor:name="Category">
<value>Add-In</value>
@@ -74,14 +74,30 @@
<value xml:lang="fr">Le code alloué par une autorité ou le
chemin vers un fichier.</value>
</prop>
</node>
- <node oor:name="dimension" oor:op="replace">
+ </node>
+ </node>
+
+ <node oor:name="getDomainOfValidity" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en">REGION.NAME</value>
+ <value xml:lang="fr">NOM.REGION</value>
+ </prop>
+ <prop oor:name="Description">
+ <value xml:lang="en">Returns the domain of validity as country or
region name(s) for an object identified by the given code.</value>
+ <value xml:lang="fr">Retourne sous forme de nom(s) de pays ou de
région(s) le domaine de validité dâun objet identifié par le code
donné.</value>
+ </prop>
+ <prop oor:name="Category">
+ <value>Add-In</value>
+ </prop>
+ <node oor:name="Parameters">
+ <node oor:name="codeOrPath" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="en">dimension</value>
- <value xml:lang="fr">dimension</value>
+ <value xml:lang="en">identifier</value>
+ <value xml:lang="fr">identifiant</value>
</prop>
<prop oor:name="Description">
- <value xml:lang="en">The dimension (1, 2, â¦) of axis to
describe.</value>
- <value xml:lang="fr">La dimension (1, 2, â¦) de lâaxe Ã
décrire.</value>
+ <value xml:lang="en">The code allocated by authority or the
path to a file.</value>
+ <value xml:lang="fr">Le code alloué par une autorité ou le
chemin vers un fichier.</value>
</prop>
</node>
</node>
@@ -157,6 +173,42 @@
</prop>
</node>
</node>
+ </node>
+
+ <node oor:name="getAxis" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en">CRS.AXIS</value>
+ <value xml:lang="fr">AXE.SRS</value>
+ </prop>
+ <prop oor:name="Description">
+ <value xml:lang="en">Returns the axis name for the specified
dimension in a Coordinate Reference System (CRS) identified by the given
code.</value>
+ <value xml:lang="fr">Retourne le nom de lâaxe à la dimension
spécifiée dans un Système de Références Spatiales (SRS) identifié par le
code donné.</value>
+ </prop>
+ <prop oor:name="Category">
+ <value>Add-In</value>
+ </prop>
+ <node oor:name="Parameters">
+ <node oor:name="codeOrPath" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en">identifier</value>
+ <value xml:lang="fr">identifiant</value>
+ </prop>
+ <prop oor:name="Description">
+ <value xml:lang="en">The code allocated by authority or the
path to a file.</value>
+ <value xml:lang="fr">Le code alloué par une autorité ou le
chemin vers un fichier.</value>
+ </prop>
+ </node>
+ <node oor:name="dimension" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en">dimension</value>
+ <value xml:lang="fr">dimension</value>
+ </prop>
+ <prop oor:name="Description">
+ <value xml:lang="en">The dimension (1, 2, â¦) of axis to
describe.</value>
+ <value xml:lang="fr">La dimension (1, 2, â¦) de lâaxe Ã
décrire.</value>
+ </prop>
+ </node>
+ </node>
</node>
<node oor:name="transformPoints" oor:op="replace">
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/build-instruction.html
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/build-instruction.html?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/build-instruction.html
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/build-instruction.html
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -102,7 +102,7 @@ mvn install</pre></blockquote>
<h2>Test in Apache OpenOffice:</h2>
<blockquote><pre>cd target
-unopkg add apache-sis-0.8-SNAPSHOT.oxt --log-file log.txt
+unopkg add apache-sis-1.0-SNAPSHOT.oxt --log-file log.txt
scalc -Xdebug -env:RTL_LOGFILE=log.txt</pre></blockquote>
</body>
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/description.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/description.xml?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/description.xml
(original)
+++
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/description.xml
Sat Feb 24 15:44:08 2018
@@ -28,7 +28,7 @@
<platform value="all"/>
<publisher>
- <name lang="en" xlink:href="http://sis.apache.org/openoffice/";>Apache
SIS</name>
+ <name lang="en"
xlink:href="http://sis.apache.org/openoffice/index.html";>Apache SIS</name>
</publisher>
<display-name>
@@ -40,14 +40,26 @@
<default xlink:href="sis.png" />
</icon>
+ <extension-description>
+ <src lang="en" xlink:href="description.txt"/>
+ </extension-description>
+
+ <registration>
+ <simple-license accept-by="admin" suppress-on-update="true"
suppress-if-required="true">
+ <license-text lang="en" xlink:href="license.txt"/>
+ </simple-license>
+ </registration>
+
+ <dependencies>
+ <OpenOffice.org-minimal-version value="3.3" d:name="OpenOffice.org 3.3"/>
+ </dependencies>
+
<release-notes>
- <src lang="en" xlink:href="http://sis.apache.org/openoffice/"/>
+ <src lang="en" xlink:href="http://sis.apache.org/openoffice/index.html"/>
</release-notes>
-<!--
<update-information>
<src xlink:href="http://sis.apache.org/openoffice/update.xml"/>
</update-information>
--->
</description>
Modified:
sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/org/apache/sis/openoffice/XReferencing.class
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/org/apache/sis/openoffice/XReferencing.class?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
Binary files - no diff available.
Modified: sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/sis.rdb
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/main/unopkg/sis.rdb?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
Binary files - no diff available.
Modified:
sis/branches/JDK9/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
[UTF-8] (original)
+++
sis/branches/JDK9/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -84,6 +84,15 @@ public final strictfp class ReferencingF
}
/**
+ * Tests {@link ReferencingFunctions#getScope(String)}.
+ */
+ @Test
+ public void testGetScope() {
+ final String scope = instance.getScope("EPSG:4326");
+ assertTrue(scope, scope.contains("Horizontal component of 3D system"));
+ }
+
+ /**
* Tests {@link ReferencingFunctions#getAxis(String, int)}.
*/
@Test
@@ -96,13 +105,22 @@ public final strictfp class ReferencingF
}
/**
+ * Tests {@link ReferencingFunctions#getDomainOfValidity(String)}.
+ */
+ @Test
+ public void testGetDomainOfValidity() {
+ final String domain = instance.getDomainOfValidity("EPSG:4326");
+ assertTrue(domain, domain.contains("World"));
+ }
+
+ /**
* Tests {@link ReferencingFunctions#getGeographicArea(String)}.
*/
@Test
public void testGetGeographicArea() {
final double[][] bbox = instance.getGeographicArea("EPSG:32620");
// UTM zone 20
- assertEquals(2, bbox.length);
- assumeFalse(Double.isNaN(bbox[0][0])); // NaN if EPSG dataset is
not installed.
+ assumeFalse(bbox.length == 0); // Empty if EPSG dataset is
not installed.
+ assertEquals("bbox.length", 2, bbox.length);
assertArrayEquals("Upper left corner", new double[] {84, -66},
bbox[0], STRICT);
assertArrayEquals("Lower right corner", new double[] { 0, -60},
bbox[1], STRICT);
}
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/ant/prepare-release.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
--- sis/branches/JDK9/core/sis-build-helper/src/main/ant/prepare-release.xml
(original)
+++ sis/branches/JDK9/core/sis-build-helper/src/main/ant/prepare-release.xml
Sat Feb 24 15:44:08 2018
@@ -29,12 +29,6 @@
<!-- Invoked after a branch has been created from the trunk. -->
<target name="branch">
- <!-- Ensure that the "sis-build-helper" plugin used by the build is the
released version. -->
- <replaceregexp file = "${user.dir}/pom.xml"
- match =
"<sis\.plugin\.version>.+</sis\.plugin\.version>"
- replace =
"<sis.plugin.version>${branch.version}-SNAPSHOT</sis.plugin.version>"/>
- <!-- The -SNAPSHOT part will be removed later, at tag
creation. -->
-
<!-- Replace the version number in Java code. -->
<replaceregexp file =
"${user.dir}/core/sis-utility/src/main/java/org/apache/sis/util/Version.java"
match = "MINOR_VERSION\s*\+\s*"-SNAPSHOT""
@@ -69,8 +63,6 @@
<include name="**/pom.xml"/>
<replacefilter
token="<version>${branch.version}-SNAPSHOT</version>"
value="<version>${sis.version}</version>"/>
- <replacefilter
token="<sis.plugin.version>${branch.version}-SNAPSHOT</sis.plugin.version>"
-
value="<sis.plugin.version>${sis.version}</sis.plugin.version>"/>
</replace>
</target>
</project>
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -63,6 +63,8 @@ import static org.apache.sis.internal.bo
* <li>Generate below {@code <h1>} elements the navigation bar with links to
the previous and next chapters.</li>
* </ul>
*
+ * See package javadoc for usage example.
+ *
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
* @since 0.7
@@ -389,7 +391,9 @@ public final class Assembler {
tableOfChapterContent =
document.createElement("ul");
tableOfChapterContent.setAttribute("class", "toc");
final Node nav =
document.createElement("nav");
-
nav.appendChild(document.createTextNode(resources.getString("this-chapter")));
+ final Node p =
document.createElement("p");
+
p.appendChild(document.createTextNode(resources.getString("this-chapter")));
+ nav.appendChild(p);
nav.appendChild(tableOfChapterContent);
Node insertionPoint =
node.getParentNode(); // The <header> element.
do insertionPoint =
insertionPoint.getNextSibling(); // The first paragraph.
@@ -595,6 +599,7 @@ public final class Assembler {
* Generates the {@code "content/book/en|fr/developer-guide.html"} file
from {@code "book/en|fr/index.html"}.
* The only argument expected by this method is the language: {@code "en"}
or {@code "fr"}.
* The current directory shall be the parent directory of {@code "book"}
and {@code "content"}.
+ * See package javadoc for usage example.
*
* @param args command-line arguments. Should contain exactly on value,
which is the language.
* @throws Exception if an I/O error, a XML parsing error or other kinds
of error occurred.
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -182,6 +182,17 @@ public final class CodeColorizer {
}
break;
}
+ default: {
+ int upper = word.length();
+ while (upper > 0) {
+ final int c = word.codePointBefore(upper);
+ if (Character.isUnicodeIdentifierPart(c)) {
+ word = word.substring(0, upper);
+ break;
+ }
+ upper -= Character.charCount(c);
+ }
+ }
}
/*
* Check if the keyword is a known one. The 'identifierOrigins' map
contains only simple name
@@ -322,7 +333,9 @@ public final class CodeColorizer {
nextSubstringStart = lower;
lower = text.indexOf(stopCondition, lower+1);
if (lower >= 0) {
- lower += stopCondition.length();
+ if (!stopCondition.equals("\n")) {
+ lower += stopCondition.length();
+ }
stopCondition = null;
} else {
lower = text.length();
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -21,7 +21,22 @@
* {@code http://svn.apache.org/repos/asf/sis/site/trunk/content/book/}
directory.
*
* <p>The main class in this package is {@link
org.apache.sis.internal.book.Assembler}.
- * Other classes are helper classes that should be ignored.</p>
+ * Other classes are helper classes that should be ignored. Assuming the
following directory layout:</p>
+ *
+ * <pre><current directory>
+ * ├─ trunk
+ * └─ site
+ * ├─ book
+ * └─ content
+ * </pre>
+ *
+ * Then the command can be used as below on Unix systems:
+ *
+ * <pre>cd site
+ * java -classpath ../trunk/core/sis-build-helper/target/classes
org.apache.sis.internal.book.Assembler en
+ * </pre>
+ *
+ * Replace {@code en} by {@code fr} for generating the French version.
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -36,7 +36,7 @@ import java.io.Writer;
* <li>Between any Java identifiers separated by a {@code '.'} character,
insert a zero-width space before the dot.</li>
* </ul>
*
- * The intend is to avoid large amount of white spaces in Javadoc when a line
content long code.
+ * The intent is to avoid large amount of white spaces in Javadoc when a line
content long code.
*
* <p>Current version does not try to extends the standard doclet because the
later is under revision in JDK 9.
* We may revisit when JDK 9 become available, if their new standard doclet
API is public.</p>
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -133,6 +133,7 @@ public final class UnoPkg extends Abstra
name.endsWith(".rdb") || name.endsWith(".RDB") ||
name.endsWith(".xml") || name.endsWith(".XML") ||
name.endsWith(".xcu") || name.endsWith(".XCU") ||
+ name.endsWith(".txt") || name.endsWith(".TXT") ||
name.endsWith(".png") || name.endsWith(".PNG");
}
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -64,6 +64,7 @@ Ellipsoid
EllipsoidalCS
EngineeringCRS
EngineeringDatum
+Envelope
EnvironmentalRecord
EvaluationMethodType
Event
@@ -233,3 +234,4 @@ VerticalCS
VerticalDatum
VerticalDatumType
VerticalExtent
+createGeodeticDatum
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -233,4 +233,6 @@ SV_OperationChainMetadata
SV_OperationMetadata
SV_ParameterDirection
SV_ServiceIdentification
+AXIS
+ORDER
TOWGS84
Modified:
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -1,15 +1,37 @@
+AbstractCRS
AbstractMathTransform
AngleFormat
+AxesConvention
+Citations
+CommonCRS
+DataStore
+DataStores
DefaultEllipsoid
+DefaultExtent
DefaultGeodeticDatum
DefaultMetadata
DefaultProjectedCRS
+DirectPosition2D
+Envelope2D
Envelopes
+Extents
GeneralEnvelope
GridGeometry
IdentifierSpace
+KeyNamePolicy
Localized
+MathTransforms
+Matrices
+MetadataStandard
NilObject
NilReason
NumberRange
+ObjectConverter
Range
+ValueExistencePolicy
+JAVABEANS_PROPERTY
+NON_EMPTY
+RIGHT_HANDED
+asValueMap
+castOrCopy
+forConvention
Modified:
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -415,7 +415,7 @@ public abstract class AbstractAttribute<
* {@linkplain
org.apache.sis.metadata.iso.quality.DefaultConformanceResult#getExplanation()
explanation}
* set to the error message.</p>
*
- * <div class="warning"><b>Note:</b> this is a departure from ISO
intend, since {@code explanation}
+ * <div class="warning"><b>Note:</b> this is a departure from ISO
intent, since {@code explanation}
* should be a statement about what a successful conformance
means. This point may be reformulated
* in a future SIS version.</div>
* </li>
Modified:
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -21,7 +21,9 @@ import java.util.Set;
import java.util.Objects;
import java.util.Collections;
import java.util.HashMap;
+import java.util.function.BiFunction;
import java.io.IOException;
+import java.io.UncheckedIOException;
import org.opengis.util.GenericName;
import org.opengis.metadata.Identifier;
import org.opengis.parameter.GeneralParameterDescriptor;
@@ -31,8 +33,6 @@ import org.apache.sis.util.Classes;
import org.apache.sis.util.Debug;
// Branch-dependent imports
-import java.util.function.BiFunction;
-import java.io.UncheckedIOException;
import org.opengis.feature.Attribute;
import org.opengis.feature.AttributeType;
import org.opengis.feature.Feature;
Modified:
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -63,7 +63,7 @@ final class DenseFeature extends Abstrac
*
* Conceptually, values in this array are {@link Property} instances.
However at first we will store only
* the property <em>values</em>, and convert to an array of type {@code
Property[]} only when at least one
- * property is requested. The intend is to reduce the amount of allocated
objects as much as possible,
+ * property is requested. The intent is to reduce the amount of allocated
objects as much as possible,
* because typical SIS applications may create a very large amount of
features.
*/
private Object[] properties;
Modified:
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -131,7 +131,7 @@ final class EnvelopeOperation extends Ab
/*
* Get all property names without duplicated values. If a property is
a link to an attribute,
* then the key will be the name of the referenced attribute instead
than the operation name.
- * The intend is to avoid querying the same geometry twice if the
attribute is also specified
+ * The intent is to avoid querying the same geometry twice if the
attribute is also specified
* explicitely in the array of properties.
*
* The map values will be the default Coordinate Reference System, or
null if none.
Modified:
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -25,6 +25,7 @@ import java.util.Collection;
import java.util.Locale;
import java.util.TimeZone;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.text.Format;
import java.text.FieldPosition;
import java.text.ParsePosition;
@@ -49,7 +50,6 @@ import org.apache.sis.referencing.Identi
import org.apache.sis.math.MathFunctions;
// Branch-dependent imports
-import java.io.UncheckedIOException;
import org.opengis.feature.IdentifiedType;
import org.opengis.feature.Property;
import org.opengis.feature.PropertyType;
Modified:
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java?rev=1825252&r1=1825251&r2=1825252&view=diff
==============================================================================
---
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
[UTF-8] (original)
+++
sis/branches/JDK9/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
[UTF-8] Sat Feb 24 15:44:08 2018
@@ -85,7 +85,7 @@ final class SparseFeature extends Abstra
*
* Conceptually, values in this map are {@link Property} instances.
However at first we will store
* only the property <em>values</em>, and build the full {@code Property}
objects only if they are
- * requested. The intend is to reduce the amount of allocated objects as
much as possible, because
+ * requested. The intent is to reduce the amount of allocated objects as
much as possible, because
* typical SIS applications may create a very large amount of features.
*
* @see #valuesKind
