This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 306866f45d3559b02b732cf95c68a48093572954 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Mar 13 15:46:00 2024 +0100 English grammar fix: "split" is an irregular verb. Replace also a closed bug report by JEP 447. --- .../buildtools/coding/VerifyVersionInJavadoc.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +-- .../apache/sis/coverage/privy/TileOpExecutor.java | 2 +- .../main/org/apache/sis/image/ErrorHandler.java | 2 +- .../org/apache/sis/image/MultiSourceLayout.java | 5 ++- .../main/org/apache/sis/image/ResamplingGrid.java | 4 +-- .../org/apache/sis/image/SourceAlignedImage.java | 8 ++--- .../apache/sis/image/processing/TiledProcess.java | 6 ++-- .../sis/image/processing/isoline/Tracer.java | 2 +- .../sis/metadata/iso/citation/Citations.java | 2 +- .../main/org/apache/sis/util/iso/Names.java | 2 +- .../main/org/apache/sis/xml/Namespaces.java | 2 +- .../org/apache/sis/xml/TransformingReader.java | 2 +- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 2 +- .../transform/ProjectiveTransformTest.java | 3 +- .../apache/sis/storage/landsat/MetadataReader.java | 2 +- .../sis/storage/geotiff/ImageFileDirectory.java | 2 +- .../sis/storage/geotiff/reader/CRSBuilderTest.java | 2 +- .../org/apache/sis/storage/DataStoreException.java | 3 +- .../apache/sis/storage/csv/FeatureIterator.java | 2 +- .../apache/sis/storage/image/WorldFileStore.java | 3 +- .../org/apache/sis/storage/folder/StoreTest.java | 2 +- .../main/org/apache/sis/util/CharSequences.java | 42 +++++++++++----------- .../org/apache/sis/util/collection/RangeSet.java | 6 ++-- .../org/apache/sis/util/collection/TreeTable.java | 2 +- .../sis/util/privy/LocalizedParseException.java | 12 +++---- .../org/apache/sis/util/CharSequencesTest.java | 4 +-- .../org/apache/sis/gui/dataset/WindowHandler.java | 2 +- 28 files changed, 62 insertions(+), 70 deletions(-) diff --git a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java index 90ccbb2ccf..c4cb21c78a 100644 --- a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java +++ b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java @@ -43,7 +43,7 @@ import java.util.Set; * <h2>Rational</h2> * This tool has been created because in all Apache SIS versions from 0.3 to 1.3, the {@code @since} and * {@code @version} Javadoc tags were put on all classes, public or not. It was a little bit misleading - * because non-public classes can be moved, splitted, merged, <i>etc.</i>, making the meaning of "since" + * because non-public classes can be moved, split, merged, <i>etc.</i>, making the meaning of "since" * confusing. The rule is that {@code @since} should tell when a class was first available in public API, * which is not necessarily when it was first created. Finally, with the use of JPMS exporting only some * chosen packages, the presence/absence of those tags is a useful way to remind whether or not a class diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java index 6a7eeea0b5..c284a4d2d2 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java @@ -242,8 +242,8 @@ public class GridCoverage2D extends GridCoverage { */ public GridCoverage2D(GridGeometry domain, final List<? extends SampleDimension> range, RenderedImage data) { /* - * The complex nesting of method calls below is a workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). + * The complex nesting of method calls below is a workaround + * while waiting for JEP 447: Statements before super(…). */ super(domain = addExtentIfAbsent(domain, data = unwrapIfSameSize(data)), defaultIfAbsent(range, data, ImageUtilities.getNumBands(data))); diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/TileOpExecutor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/TileOpExecutor.java index 941f61e64e..c9cea85594 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/TileOpExecutor.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/TileOpExecutor.java @@ -529,7 +529,7 @@ public class TileOpExecutor { /** - * Tile indices of the next tile to process in a multi-threaded computation. When a computation is splitted + * Tile indices of the next tile to process in a multi-threaded computation. When a computation is split * between many threads, all workers will share a reference to the same {@link Cursor} instance for fetching * the indices of the next tile in iteration order no matter if requested by the same or different threads. * We do that on the assumption that if calls to {@link RenderedImage#getTile(int, int)} causes read operations diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorHandler.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorHandler.java index 18ef29dd30..4fd4b90173 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorHandler.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorHandler.java @@ -57,7 +57,7 @@ public interface ErrorHandler { * time after the error occurred, and may aggregate errors that occurred in more than one tile. * * <h4>Multi-threading</h4> - * If the image processing was splitted between many worker threads, this method may be invoked + * If the image processing was split between many worker threads, this method may be invoked * from any of those threads. However, the invocation should happen after all threads terminated, * either successfully or with an error reported in {@code details}. * diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourceLayout.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourceLayout.java index 7629dd11b5..fbf924197e 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourceLayout.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourceLayout.java @@ -118,9 +118,8 @@ final class MultiSourceLayout extends ImageLayout { * or may contain {@code null} elements for selecting all bands of the corresponding image. * An empty array element (i.e. zero band to select) discards the corresponding source image. * - * <p>This static method is a workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). - * This method may become the constructor after JEP 8300786 is available.</p> + * <p>This static method is a workaround while waiting for JEP 447: Statements before super(…). + * This method may become the constructor after JEP 447 is available.</p> * * @param sources images to combine, in order. * @param bandsPerSource bands to use for each source image, in order. May contain {@code null} elements. diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java index 60015ad559..a7b50c770c 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java @@ -117,8 +117,8 @@ final class ResamplingGrid extends AbstractMathTransform2D { /** * Creates a new grid of precomputed values using the given transform applied on the specified region. * The region is subdivided into a number of sub-regions. The number of sub-divisions is specified by - * the {@code depth} argument. A value of 1 means that the region is splitted in two parts. A value of - * 2 means that each part is itself splitted in 2 smaller parts (so the original grid is splitted in 4), + * the {@code depth} argument. A value of 1 means that the region is split in two parts. A value of + * 2 means that each part is itself split in 2 smaller parts (so the original grid is split in 4), * <i>etc.</i> with recursive splits like a QuadTree. * * <p>Determining an optimal value of {@code depth} argument is the most tricky part of this class. diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/SourceAlignedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/SourceAlignedImage.java index 846ed35d94..b789ee896a 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/SourceAlignedImage.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/SourceAlignedImage.java @@ -73,8 +73,8 @@ abstract class SourceAlignedImage extends ComputedImage { } /** - * Gets the sample model, making sure it has the right size. This is a workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). + * Gets the sample model, making sure it has the right size. + * This is a workaround while waiting for JEP 447: Statements before super(…). */ @Workaround(library="JDK", version="1.8") private static SampleModel getSampleModel(final RenderedImage source) { @@ -117,8 +117,8 @@ abstract class SourceAlignedImage extends ComputedImage { } /** - * Creates the sample model. This is a workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). + * Creates the sample model. + * This is a workaround while waiting for JEP 447: Statements before super(…). */ @Workaround(library="JDK", version="1.8") private static SampleModel createSampleModel(final ColorModel colorModel, final SampleModel original) { diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/TiledProcess.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/TiledProcess.java index 6afeaff7c5..b137afc77d 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/TiledProcess.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/TiledProcess.java @@ -35,12 +35,12 @@ import org.apache.sis.pending.jdk.JDK18; * * <ul class="verbose"> * <li>The fork and join processes are presumed relatively costly (i.e. they may need to reconstruct - * geometries splitted in two consecutive tiles). So instead of having many medium tasks waiting + * geometries split in two consecutive tiles). So instead of having many medium tasks waiting * for a thread to take them, it may be more efficient to have fewer tasks processing larger areas. * {@code TiledProcess} tries to create a number of sub-tasks close to the number of processors. * This is a different approach than "work stealing" algorithm applied by JDK {@code ForkJoinPool}, * which is designed for smaller (and more easily separable) non-blocking tasks.</li> - * <li>The main task is splitted in sub-tasks with a single fork step, with two division factors along + * <li>The main task is split in sub-tasks with a single fork step, with two division factors along * <var>x</var> and <var>y</var> axes which can be any integer (not necessarily powers of 2). This * is a different approach than JDK {@code ForkJoinPool} where tasks are forked recursively in two * sub-tasks at each step.</li> @@ -99,7 +99,7 @@ public abstract class TiledProcess<R> { private PixelIterator[] iterators; /** - * Prepares {@link TiledProcess} for execution of a task splitted in different regions. + * Prepares {@link TiledProcess} for execution of a task split in different regions. * This constructor splits the given image in sub-regions ("tiles" but not in the sense * of {@link RenderedImage} tiles), then creates a pixel iterator for each sub-region. * Iterators are created with the given {@link org.apache.sis.image.PixelIterator.Builder}, diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Tracer.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Tracer.java index 091227ee2f..7e3e8a682b 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Tracer.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Tracer.java @@ -654,7 +654,7 @@ final class Tracer { /** * Flushes any pending {@link #partialPaths} to {@link #path}. This method is invoked after * {@link #finish()} has been invoked for all sub-regions (many sub-regions may exist if - * isoline generation has been splitted for parallel computation). + * isoline generation has been split for parallel computation). * * @throws TransformException if an error occurred during polylines creation. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java index 6396c4da44..46dfd1afd1 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java @@ -747,7 +747,7 @@ public final class Citations extends Static { /* * Before to give up, maybe the given code argument is actually written using a "codeSpace:code" syntax. * Try to parse that syntax only if no Identifier argument were specified (otherwise we require the code - * and code space to be splitted as defined in the identifier). + * and code space to be split as defined in the identifier). */ if (identifier == null) { int s = 0; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Names.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Names.java index d81c7aa343..80709bb95a 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Names.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Names.java @@ -116,7 +116,7 @@ public final class Names extends Static { /** * Creates a local or scoped name in the given namespace. * The character sequences can be either {@link String} or {@link InternationalString} instances. - * The {@code namespace} character sequences is taken verbatim, while {@code scopedName} is splitted + * The {@code namespace} character sequences is taken verbatim, while {@code scopedName} is split * around the {@linkplain DefaultNameSpace#DEFAULT_SEPARATOR default separator}, which is {@code ":"}. * * @param namespace the namespace, or {@code null} for the global namespace. diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java index 5a21accd2c..41aaea7d3f 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java @@ -458,7 +458,7 @@ public final class Namespaces extends Static { * * @category ISO * - * @deprecated as of ISO 19115-3, splitted in many different namespaces. + * @deprecated as of ISO 19115-3, split in many different namespaces. */ @Deprecated(since="1.0") public static final String GMD = LegacyNamespaces.GMD; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingReader.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingReader.java index e9046220c1..7b49ab1e0b 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingReader.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingReader.java @@ -40,7 +40,7 @@ import org.apache.sis.util.collection.BackingStoreException; * A XML reader replacing the namespaces found in XML documents by the namespaces expected by SIS at unmarshalling time. * This class forwards every method calls to the wrapped {@link XMLEventReader}, but with some {@code namespaceURI} * modified before being transferred. This class uses a dictionary for identifying the XML namespaces expected by JAXB - * implementation. This is needed when a single namespace in a legacy schema has been splitted into many namespaces + * implementation. This is needed when a single namespace in a legacy schema has been split into many namespaces * in the newer schema. This happen for example in the upgrade from ISO 19139:2007 to ISO 19115-3. * In such cases, we need to check which attribute is being mapped in order to determine the new namespace. * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java index ee07baf12a..d64321c788 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java @@ -693,7 +693,7 @@ public class WKTDictionary extends GeodeticAuthorityFactory { /** * Adds definitions of CRS (or other geodetic objects) from Well-Known Texts. Blank strings are ignored. * Each non-blank {@link String} shall contain the complete definition of exactly one geodetic object. - * A geodetic object cannot have its definition splitted in two or more {@link String}s. + * A geodetic object cannot have its definition split in two or more {@link String}s. * * <p>The key associated to each object is given by the {@code ID[…]} or {@code AUTHORITY[…]} element, * which is typically the last element of a WKT string and is mandatory. WKT strings can contain line diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java index f47f2e016c..8f737b500b 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java @@ -58,8 +58,7 @@ import org.opengis.test.referencing.AffineTransformTest; public class ProjectiveTransformTest extends AffineTransformTest { /** * A math transform factory which delegates instantiations to the enclosing test class. - * This is a workaround for RFE #4093999 ("Relax constraint on placement of this()/super() - * call in constructors"). + * This is a workaround while waiting for JEP 447: Statements before super(…). */ private static final class Proxy extends MathTransformFactoryBase { /** The enclosing test class. */ diff --git a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java index fe4ad01870..4f942e6d54 100644 --- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java +++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java @@ -905,7 +905,7 @@ final class MetadataReader extends MetadataBuilder { /* * At this point we are done configuring he metadata builder. Creates the ISO 19115 metadata instance, * then continue adding some more specific metadata elements by ourself. For example, information about - * bands are splitted in 3 different AttributeGroups based on their grid size. + * bands are split in 3 different AttributeGroups based on their grid size. */ setISOStandards(true); final DefaultMetadata result = build(); diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java index 991ad49443..960d1b7f3c 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java @@ -855,7 +855,7 @@ final class ImageFileDirectory extends DataCube { } /* * Stores all the characters referenced by the GeoKeyDirectory. Should contain exactly one string - * which will be splitted by CRSBuilder, but we allow an arbitrary amount as a paranoiac check. + * which will be split by CRSBuilder, but we allow an arbitrary amount as a paranoiac check. * Note that TIFF files use 0 as the end delimiter in strings (C/C++ convention). */ case (short) TAG_GEO_ASCII_PARAMS: { diff --git a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/reader/CRSBuilderTest.java b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/reader/CRSBuilderTest.java index 9951124cd0..de09479f71 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/reader/CRSBuilderTest.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/reader/CRSBuilderTest.java @@ -50,7 +50,7 @@ public final class CRSBuilderTest extends TestCase { } /** - * Tests {@link CRSBuilder#splitName(String)} on a string that should not be splitted. + * Tests {@link CRSBuilder#splitName(String)} on a string that should not be split. */ @Test public void testNoSplit() { diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreException.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreException.java index 9492aaa8ff..fecd731d94 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreException.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreException.java @@ -122,8 +122,7 @@ public class DataStoreException extends Exception implements LocalizedException } /** - * Workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). + * Workaround while waiting for JEP 447: Statements before super(…). */ @Workaround(library="JDK", version="1.8") private DataStoreException(final Locale locale, final Object[] params) { diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FeatureIterator.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FeatureIterator.java index 8516f431c7..b3044e709d 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FeatureIterator.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FeatureIterator.java @@ -35,7 +35,7 @@ import org.opengis.feature.AttributeType; /** * Base implementation of iterators returned by {@link Store#features(boolean)}. This base class returns one feature * per line. For example, iteration over the following file will produce 4 {@code Feature} instances, even if there is - * actually only three distinct instances because the feature "a" is splitted on 2 lines: + * actually only three distinct instances because the feature "a" is split on 2 lines: * * {@snippet lang="csv" : * a, 10, 150, 11.0 2.0 12.0 3.0 diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java index a1e0729de8..3c79c3822d 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java @@ -249,8 +249,7 @@ public class WorldFileStore extends PRJDataStore { * * @param format information about the storage (URL, stream, <i>etc</i>) and the reader/writer to use. * @param readOnly {@code true} if the store should be open in read-only mode, ignoring {@code format}. - * This is a workaround for RFE #4093999 in Sun's bug database, for allowing us to invoke - * {@link FormatFinder#cleanup()} when invoked from the public constructor. + * This is a workaround while waiting for JEP 447: Statements before super(…). * @throws DataStoreException if an error occurred while opening the stream. * @throws IOException if an error occurred while creating the image reader instance. */ diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/StoreTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/StoreTest.java index 263304b846..efe8f74a50 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/StoreTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/StoreTest.java @@ -83,7 +83,7 @@ public final class StoreTest extends TestCaseWithLogs { fail("Missing resources: " + identifiers); } loggings.skipNextLogIfContains("ucar.unidata"); - loggings.skipNextLogIfContains("ucar.unidata"); // Logs emitted by UCAR. There is two files to skip. + loggings.skipNextLogIfContains("ucar.unidata"); // Logs emitted by UCAR. There are two files to skip. loggings.assertNoUnexpectedLog(); } diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java index 1590b22095..8e307a8d12 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java @@ -595,7 +595,7 @@ search: for (; fromIndex <= toIndex; fromIndex++) { * <p>Note that this is a undocumented SIS features. There is currently no commitment that this implementation * details will not change in future version.</p> * - * @param text the text to be splitted. + * @param text the text to be split. * @return an array where to store the result of splitting the given {@code text}. */ private static CharSequence[] createSplitArray(final CharSequence text) { @@ -636,37 +636,37 @@ search: for (; fromIndex <= toIndex; fromIndex++) { return EMPTY_ARRAY; } if (separator == '\n' || separator == '\r') { - final CharSequence[] splitted = splitOnEOL(text); - for (int i=0; i < splitted.length; i++) { + final CharSequence[] split = splitOnEOL(text); + for (int i=0; i < split.length; i++) { // For consistency with the rest of this method. - splitted[i] = trimWhitespaces(splitted[i]); + split[i] = trimWhitespaces(split[i]); } - return splitted; + return split; } // 'excludeEmpty' must use the same criterion as trimWhitespaces(…). final boolean excludeEmpty = isWhitespace(separator); - CharSequence[] splitted = createSplitArray(text); + CharSequence[] split = createSplitArray(text); final int length = text.length(); int count = 0, last = 0, i = 0; while ((i = indexOf(text, separator, i, length)) >= 0) { final CharSequence item = trimWhitespaces(text, last, i); if (!excludeEmpty || item.length() != 0) { - if (count == splitted.length) { - splitted = Arrays.copyOf(splitted, count << 1); + if (count == split.length) { + split = Arrays.copyOf(split, count << 1); } - splitted[count++] = item; + split[count++] = item; } last = ++i; } // Add the last element. final CharSequence item = trimWhitespaces(text, last, length); if (!excludeEmpty || item.length() != 0) { - if (count == splitted.length) { - splitted = Arrays.copyOf(splitted, count + 1); + if (count == split.length) { + split = Arrays.copyOf(split, count + 1); } - splitted[count++] = item; + split[count++] = item; } - return ArraysExt.resize(splitted, count); + return ArraysExt.resize(split, count); } /** @@ -715,7 +715,7 @@ search: for (; fromIndex <= toIndex; fromIndex++) { }; } int count = 0; - CharSequence[] splitted = createSplitArray(text); + CharSequence[] split = createSplitArray(text); int last = 0; boolean hasMore; do { @@ -748,20 +748,20 @@ search: for (; fromIndex <= toIndex; fromIndex++) { hasMore = true; // Because there is lf. } } - if (count >= splitted.length) { - splitted = Arrays.copyOf(splitted, count*2); + if (count >= split.length) { + split = Arrays.copyOf(split, count*2); } - splitted[count++] = text.subSequence(last, splitAt); + split[count++] = text.subSequence(last, splitAt); last = splitAt + skip; } while (hasMore); /* * Add the remaining string and we are done. */ - if (count >= splitted.length) { - splitted = Arrays.copyOf(splitted, count+1); + if (count >= split.length) { + split = Arrays.copyOf(split, count+1); } - splitted[count++] = text.subSequence(last, text.length()); - return ArraysExt.resize(splitted, count); + split[count++] = text.subSequence(last, text.length()); + return ArraysExt.resize(split, count); } /** diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/RangeSet.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/RangeSet.java index 2c5d0f893f..08773a57c9 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/RangeSet.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/RangeSet.java @@ -51,7 +51,7 @@ import static org.apache.sis.util.Numbers.*; * circumstances <strong>reduce</strong> the {@linkplain #size() size} of this set.</li> * <li>Conversely, when a range is {@linkplain #remove(Object) removed}, {@code RangeSet} first * looks if that range is in the middle of an existing range. If such range is found, then - * the enclosing range is splitted as of {@link Range#subtract(Range)}. Consequently, removing + * the enclosing range is split as of {@link Range#subtract(Range)}. Consequently, removing * ranges may in some circumstances <strong>increase</strong> the size of this set.</li> * </ul> * @@ -592,7 +592,7 @@ public class RangeSet<E extends Comparable<? super E>> extends AbstractSet<Range /** * Removes a range from this set. If the specified range is inside an existing range, then the - * existing range may be splitted in two smaller ranges as of {@link Range#subtract(Range)}. + * existing range may be split in two smaller ranges as of {@link Range#subtract(Range)}. * In other words, invoking this method may <strong>increase</strong> the * {@linkplain #size() size} of this set. * @@ -636,7 +636,7 @@ public class RangeSet<E extends Comparable<? super E>> extends AbstractSet<Range /** * Removes a range of values to this set. If the specified range in inside an existing ranges, - * then the existing range may be splitted in two smaller ranges. This may result in greater + * then the existing range may be split in two smaller ranges. This may result in greater * {@linkplain #size() size} of this set. * * @param minValue the minimal value. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTable.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTable.java index 91cf4bcd66..adb5b5b44e 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTable.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTable.java @@ -221,7 +221,7 @@ public interface TreeTable { /** * Returns the user object associated to this node. * The user object is for information purpose only and does not appear in the rendered tree. - * It is typically a Java object whose content is splitted into the various table columns. + * It is typically a Java object whose content is split into the various table columns. * * <h4>Example</h4> * If a {@code CityLocation} class is defined as a (<var>city name</var>, <var>latitude</var>, diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/LocalizedParseException.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/LocalizedParseException.java index bed4ff2246..750d3c33a1 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/LocalizedParseException.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/LocalizedParseException.java @@ -93,8 +93,7 @@ public final class LocalizedParseException extends ParseException implements Loc } /** - * Workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). + * Workaround while waiting for JEP 447: Statements before super(…). */ @Workaround(library="JDK", version="1.8") private LocalizedParseException(final Locale locale, final Class<?> type, @@ -104,8 +103,7 @@ public final class LocalizedParseException extends ParseException implements Loc } /** - * Workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). + * Workaround while waiting for JEP 447: Statements before super(…). */ @Workaround(library="JDK", version="1.8") private LocalizedParseException(final Locale locale, final Object[] parameters, final int errorOffset) { @@ -113,8 +111,7 @@ public final class LocalizedParseException extends ParseException implements Loc } /** - * Workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). + * Workaround while waiting for JEP 447: Statements before super(…). * * @param type the type of objects parsed by the {@link java.text.Format}. * @param text the text that {@code Format} failed to parse. @@ -136,8 +133,7 @@ public final class LocalizedParseException extends ParseException implements Loc } /** - * Workaround for RFE #4093999 - * ("Relax constraint on placement of this()/super() call in constructors"). + * Workaround while waiting for JEP 447: Statements before super(…). */ @Workaround(library="JDK", version="1.8") private static short key(final Object[] parameters) { diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/CharSequencesTest.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/CharSequencesTest.java index 6ef4169a96..b019636934 100644 --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/CharSequencesTest.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/CharSequencesTest.java @@ -166,8 +166,8 @@ public final class CharSequencesTest extends TestCase { */ @Test public void testSplitOnEOL() { - final CharSequence[] splitted = splitOnEOL("\nOne\r\nTwo\rThree \rFour\n Five\n\r Six \n"); - assertArrayEquals(new String[] {"", "One", "Two", "Three ", "Four", " Five", "", " Six ", ""}, splitted); + final CharSequence[] split = splitOnEOL("\nOne\r\nTwo\rThree \rFour\n Five\n\r Six \n"); + assertArrayEquals(new String[] {"", "One", "Two", "Three ", "Four", " Five", "", " Six ", ""}, split); assertArrayEquals(new String[] {""}, splitOnEOL("")); assertArrayEquals(new String[] {}, splitOnEOL(null)); } diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowHandler.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowHandler.java index 3cd9cdca73..9b2cb5a22e 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowHandler.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowHandler.java @@ -374,7 +374,7 @@ public abstract class WindowHandler { /** * Returns the window which is showing the resource. We avoid the call to {@link #getView()} * because in the particular case of {@link CoverageExplorer}, it causes the initialization - * of a splitted pane which is not the one used by the main window. + * of a split pane which is not the one used by the main window. */ @Override Window getWindow() {
