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 9bb1d80d200826cc73e15463fbe421c23d640968 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Sat Dec 10 14:30:00 2022 +0100 Post-release: remove deprecated methods. --- .../apache/sis/gui/coverage/CoverageExplorer.java | 19 +------ .../org/apache/sis/gui/coverage/package-info.java | 2 +- .../java/org/apache/sis/gui/map/StatusBar.java | 63 +--------------------- .../java/org/apache/sis/gui/map/package-info.java | 2 +- .../gui/referencing/RecentReferenceSystems.java | 20 +------ .../apache/sis/gui/referencing/package-info.java | 2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 27 +--------- .../org/apache/sis/coverage/grid/GridGeometry.java | 31 +---------- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/util/iso/DefaultTypeName.java | 17 +----- .../java/org/apache/sis/util/iso/package-info.java | 2 +- .../main/java/org/apache/sis/referencing/CRS.java | 20 +------ .../transform/DefaultMathTransformFactory.java | 42 +-------------- .../operation/transform/package-info.java | 2 +- .../org/apache/sis/referencing/package-info.java | 2 +- .../apache/sis/util/logging/PerformanceLevel.java | 8 +-- .../org/apache/sis/util/logging/package-info.java | 2 +- .../apache/sis/storage/event/StoreListeners.java | 21 +------- .../org/apache/sis/storage/event/package-info.java | 2 +- 19 files changed, 20 insertions(+), 266 deletions(-) diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java index 2c45e8b46f..afcf1f213c 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java @@ -71,7 +71,7 @@ import org.apache.sis.gui.Widget; * implementation may generalize to {@link org.opengis.coverage.Coverage} instances. * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * * @see CoverageCanvas * @see GridView @@ -221,23 +221,6 @@ public class CoverageExplorer extends Widget { */ private WindowHandler window; - /** - * Creates an initially empty explorer with default view type. - * By default {@code CoverageExplorer} will show a coverage as a table of values, - * i.e. the default view type is {@link View#TABLE}. - * - * <div class="note"><b>API note:</b> - * the reason for setting default value to tabular data is because it requires loading much less data with - * {@link java.awt.image.RenderedImage}s supporting deferred tile loading. By contrast {@link View#IMAGE} - * may require loading the full image.</div> - * - * @deprecated Use {@link #CoverageExplorer(View)}. - */ - @Deprecated - public CoverageExplorer() { - this(View.TABLE); - } - /** * Creates an initially empty explorer with the specified view type. * diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/package-info.java index 15aaa4ab0c..94bab9bdcb 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/package-info.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/package-info.java @@ -19,7 +19,7 @@ * Widgets showing {@link org.apache.sis.coverage.grid.GridCoverage} images or sample values. * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * @since 1.1 * @module */ diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java index f1cb16d175..798c860f07 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java @@ -124,7 +124,7 @@ import org.apache.sis.referencing.gazetteer.ReferencingByIdentifiers; * {@link #setLocalCoordinates(double, double)} explicitly instead. * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * @since 1.1 * @module */ @@ -568,20 +568,6 @@ public class StatusBar extends Widget implements EventHandler<MouseEvent> { }); } - /** - * @deprecated Replaced by {@link #StatusBar(RecentReferenceSystems)} followed by {@link #track(MapCanvas)}. - * - * @param systemChooser the manager of reference systems chosen by user, or {@code null} if none. - * @param toTrack the canvas that this status bar is tracking. - */ - @Deprecated - public StatusBar(final RecentReferenceSystems systemChooser, final MapCanvas... toTrack) { - this(systemChooser); - for (final MapCanvas canvas : toTrack) { - track(canvas); - } - } - /** * Registers listeners on the specified canvas for tracking mouse movements. * After this method call, this {@code StatusBar} will show coordinates (usually geographic or projected) @@ -1300,41 +1286,6 @@ public class StatusBar extends Widget implements EventHandler<MouseEvent> { return new int[] {xDimension, yDimension}; } - /** - * Returns the lowest value appended as "± <var>accuracy</var>" after the coordinate values. - * This is the last value specified to {@link #setLowestAccuracy(Quantity)}. - * - * @return the lowest accuracy to append after the coordinate values, or {@code null} if none. - * - * @see CoordinateFormat#getGroundAccuracy() - * - * @deprecated Replaced by {@link #lowestAccuracy}. - */ - @Deprecated - public Quantity<Length> getLowestAccuracy() { - return lowestAccuracy.get(); - } - - /** - * Specifies an uncertainty to append as "± <var>accuracy</var>" after the coordinate values. - * If user has selected (e.g. by contextual menu) a CRS causing the use of a coordinate transformation, - * then the accuracy actually shown by {@code StatusBar} will be the greatest value between the accuracy - * specified to this method and the coordinate transformation accuracy. - * - * <p>Note that the "± <var>accuracy</var>" text may be shown or hidden depending on the zoom level. - * If pixels on screen are larger than the accuracy, then the accuracy text is hidden.</p> - * - * @param accuracy the lowest accuracy to append after the coordinate values, or {@code null} if none. - * - * @see CoordinateFormat#setGroundAccuracy(Quantity) - * - * @deprecated Replaced by {@link #lowestAccuracy}. - */ - @Deprecated - public void setLowestAccuracy(final Quantity<Length> accuracy) { - lowestAccuracy.set(accuracy); - } - /** * Returns the coordinates given to the last call to {@link #setLocalCoordinates(double, double)}, * or an empty value if those coordinates are not visible. @@ -1635,18 +1586,6 @@ public class StatusBar extends Widget implements EventHandler<MouseEvent> { return Optional.ofNullable(message.getText()); } - /** - * Returns the error message currently shown. - * - * @return the current error message, or an empty value if none. - * - * @deprecated Renamed {@link #getMessage()}. - */ - @Deprecated - public Optional<String> getErrorMessage() { - return Optional.ofNullable(message.getText()); - } - /** * Shows or hides an informative message on the status bar. * The message should be temporary, for example for telling that a loading is in progress. diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java index 4ddaa18730..798eba1fc9 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java @@ -22,7 +22,7 @@ * {@link org.apache.sis.gui.map.MapCanvasAWT} is a specialization for painting the map using Java2D. * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * @since 1.1 * @module */ diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/RecentReferenceSystems.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/RecentReferenceSystems.java index 4aa54d5348..0225ca9f14 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/RecentReferenceSystems.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/RecentReferenceSystems.java @@ -83,7 +83,7 @@ import static java.util.logging.Logger.getLogger; * </ul> * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * @since 1.1 * @module */ @@ -1047,23 +1047,7 @@ next: for (int i=0; i<count; i++) { } /** - * @deprecated Replaced by {@link #createChoiceBox(boolean, ChangeListener)}. - */ - @Deprecated - public ChoiceBox<ReferenceSystem> createChoiceBox(final ChangeListener<ReferenceSystem> action) { - return createChoiceBox(true, action); - } - - /** - * @deprecated Replaced by {@link #createMenuItems(boolean, ChangeListener)}. - */ - @Deprecated - public Menu createMenuItems(final ChangeListener<ReferenceSystem> action) { - return createMenuItems(true, action); - } - - /** - * Returns the property for the selected value in a menu created by {@link #createMenuItems(ChangeListener)}. + * Returns the property for the selected value in a menu created by {@link #createMenuItems(boolean, ChangeListener)}. * * @param menu the menu, or {@code null} if none. * @return the property for the selected value, or {@code null} if none. diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/package-info.java index c8566efa33..3b9b9019ff 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/package-info.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/package-info.java @@ -20,7 +20,7 @@ * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.1 + * @version 1.4 * @since 1.1 * @module */ diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java index c9a7e25070..16a8e1b5bd 100644 --- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java +++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java @@ -93,7 +93,7 @@ import org.opengis.coverage.PointOutsideCoverageException; * @author Martin Desruisseaux (IRD, Geomatys) * @author Alexis Manin (Geomatys) * @author Johann Sorel (Geomatys) - * @version 1.3 + * @version 1.4 * @since 1.0 * @module */ @@ -825,16 +825,6 @@ public class GridExtent implements GridEnvelope, LenientComparable, Serializable return Numerics.toUnsignedDouble(size); } - /** - * @deprecated Replaced by {@link #getPointOfInterest(PixelInCell)}. - * - * @return the grid coordinates of a representative point. - */ - @Deprecated - public double[] getPointOfInterest() { - return getPointOfInterest(PixelInCell.CELL_CORNER); - } - /** * Returns the grid coordinates of a representative point. * This point may be used for estimating a {@linkplain GridGeometry#getResolution(boolean) grid resolution}. @@ -1299,21 +1289,6 @@ public class GridExtent implements GridEnvelope, LenientComparable, Serializable return (dimensions != null) ? reorder(dimensions) : this; } - /** - * Returns a grid extent that encompass only some dimensions of this grid extent. - * - * @param dimensions the dimensions to select, in strictly increasing order. - * @return the sub-envelope, or {@code this} if the given array contains all dimensions of this grid extent. - * - * @since 1.1 - * - * @deprecated Renamed {@link #selectDimensions(int...)} for clarity. - */ - @Deprecated - public GridExtent reduceDimension(int... dimensions) { - return selectDimensions(dimensions); - } - /** * Verifies the validity of a given {@code dimensions} argument. * diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java index 81bbfd9a4e..f6a3c507de 100644 --- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java +++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java @@ -134,7 +134,7 @@ import static org.apache.sis.referencing.CRS.findOperation; * * @author Martin Desruisseaux (IRD, Geomatys) * @author Johann Sorel (Geomatys) - * @version 1.3 + * @version 1.4 * @since 1.0 * @module */ @@ -1491,22 +1491,6 @@ public class GridGeometry implements LenientComparable, Serializable { return new GridGeometry(newExtent, t1, t2, envelope, resolution, nonLinears); } - /** - * Returns a grid geometry translated by the given amount of cells compared to this grid. - * - * @param translation translation to apply on each grid axis in order. - * @return a grid geometry whose coordinates and the "grid to CRS" transforms have been translated by given amounts. - * - * @since 1.1 - * - * @deprecated Renamed {@link #shiftGrid(long...)} for making clearer that this method changes - * grid coordinates without changing "real world" coordinates. - */ - @Deprecated - public GridGeometry translate(final long... translation) { - return shiftGrid(translation); - } - /** * Returns a grid geometry with the given grid extent, which implies a new "real world" computation. * The "grid to CRS" transforms and the resolution stay the same than this {@code GridGeometry}. @@ -1569,19 +1553,6 @@ public class GridGeometry implements LenientComparable, Serializable { return this; } - /** - * Returns a grid geometry that encompass only some dimensions of this grid geometry. - * - * @param dimensions the grid (not CRS) dimensions to select, in strictly increasing order. - * @return the sub-grid geometry, or {@code this} if the given array contains all dimensions of this grid geometry. - * - * @deprecated Renamed {@link #selectDimensions(int...)} for clarity and consistency with {@link GridExtent}. - */ - @Deprecated - public GridGeometry reduce(int... dimensions) { - return selectDimensions(dimensions); - } - /** * Creates a one-, two- or three-dimensional coordinate reference system for cell indices in the grid. * This method returns a CRS which is derived from the "real world" CRS or a subset of it. diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java index c97ab867d7..e746986cdf 100644 --- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java +++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java @@ -41,7 +41,7 @@ * @author Martin Desruisseaux (Geomatys) * @author Johann Sorel (Geomatys) * @author Alexis Manin (Geomatys) - * @version 1.3 + * @version 1.4 * @since 1.0 * @module */ diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java index 55c894610d..ceebb7e042 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java @@ -128,7 +128,7 @@ import org.apache.sis.util.UnknownNameException; * @author Guilhem Legal (Geomatys) * @author Cédric Briançon (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * * @see DefaultMemberName * @see DefaultNameFactory @@ -263,21 +263,6 @@ public class DefaultTypeName extends DefaultLocalName implements TypeName { return Optional.ofNullable(javaType); } - /** - * Returns the Java class associated to this type name. - * - * @deprecated Replaced by {@link #toJavaType()}. - * - * @return the Java class associated to this {@code TypeName}, - * or {@code null} if there is no mapping from this name to a Java class. - * - * @since 0.5 - */ - @Deprecated - public Class<?> toClass() { - return (javaType instanceof Class<?>) ? (Class<?>) javaType : null; - } - /** * Compares this type name with the specified object for equality. * diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java index 105afcdbb4..12359b7ae1 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java @@ -99,7 +99,7 @@ * </table> * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.3 + * @version 1.4 * @since 0.3 * @module */ diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java index 6d50ab6fff..b576e8d34a 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java @@ -142,7 +142,7 @@ import org.opengis.geometry.Geometry; * * @author Martin Desruisseaux (IRD, Geomatys) * @author Alexis Manin (Geomatys) - * @version 1.3 + * @version 1.4 * @since 0.3 * @module */ @@ -988,24 +988,6 @@ public final class CRS extends Static { return compound(components.toArray(new CoordinateReferenceSystem[components.size()])); } - /** - * Gets or creates a coordinate reference system with a subset of the dimensions of the given CRS. - * - * @param crs the CRS to reduce the dimensionality. - * @param dimensions the dimensions to retain. - * @return a coordinate reference system for the given dimensions. - * @throws FactoryException if the geodetic factory failed to create a compound CRS. - * - * @since 1.0 - * - * @deprecated Renamed {@link #selectDimensions(CoordinateReferenceSystem, int...)} for clarity and consistency with - * {@link org.apache.sis.coverage.grid.GridExtent} and {@link org.apache.sis.coverage.grid.GridGeometry}. - */ - @Deprecated - public static CoordinateReferenceSystem reduce(final CoordinateReferenceSystem crs, final int... dimensions) throws FactoryException { - return selectDimensions(crs, dimensions); - } - /** * Adds the components of reduced CRS into the given list. * This method may invoke itself recursively for walking through compound CRS. diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java index f04b6a54c5..3c941a2cd0 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java @@ -170,7 +170,7 @@ import static java.util.logging.Logger.getLogger; * There is typically only one {@code MathTransformFactory} instance for the whole application. * * @author Martin Desruisseaux (Geomatys, IRD) - * @version 1.3 + * @version 1.4 * * @see MathTransformProvider * @see AbstractMathTransform @@ -620,29 +620,6 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math sourceEllipsoid = null; } - /** - * Sets the source coordinate system and its associated ellipsoid to the given value. - * - * <div class="note"><b>Design note:</b> - * ellipsoidal coordinate systems and ellipsoids are associated indirectly, through a geodetic CRS. - * However, this method expects those two components to be given explicitly instead of inferring - * them from a {@code CoordinateReferenceSystem} for making clear that {@code MathTransformFactory} - * does not perform any {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic - * datum} analysis. For coordinate operations that take datum changes in account (including change - * of prime meridian), see {@link org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory}. - * This policy helps to enforce a separation of concerns.</div> - * - * @param cs the coordinate system to set as the source, or {@code null}. - * @param ellipsoid the ellipsoid associated to the given coordinate system, or {@code null}. - * - * @deprecated Replaced by {@link #setSource(GeodeticCRS)}. - */ - @Deprecated - public void setSource(final EllipsoidalCS cs, final Ellipsoid ellipsoid) { - sourceCS = cs; - sourceEllipsoid = ellipsoid; - } - /** * Sets the source coordinate system and related ellipsoid to the components of given CRS. * The {@link Ellipsoid}, fetched from the geodetic datum, is often used together with an {@link EllipsoidalCS}, @@ -677,23 +654,6 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math targetEllipsoid = null; } - /** - * Sets the target coordinate system and its associated ellipsoid to the given value. - * - * <div class="note"><b>Design note:</b> - * see {@link #setSource(EllipsoidalCS, Ellipsoid)}.</div> - * - * @param cs the coordinate system to set as the source, or {@code null}. - * @param ellipsoid the ellipsoid associated to the given coordinate system, or {@code null}. - * - * @deprecated Replaced by {@link #setTarget(GeodeticCRS)}. - */ - @Deprecated - public void setTarget(final EllipsoidalCS cs, final Ellipsoid ellipsoid) { - targetCS = cs; - targetEllipsoid = ellipsoid; - } - /** * Sets the target coordinate system and related ellipsoid to the components of given CRS. * The {@link Ellipsoid}, fetched from the geodetic datum, is often used together with an {@link EllipsoidalCS}, diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/package-info.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/package-info.java index f542790cb2..c74a54f84e 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/package-info.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/package-info.java @@ -61,7 +61,7 @@ * * @author Martin Desruisseaux (IRD, Geomatys) * @author Adrian Custer (Geomatys) - * @version 1.3 + * @version 1.4 * @since 0.5 * @module */ diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java index a5a1b17e80..2a78db869e 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java @@ -94,7 +94,7 @@ * * @author Martin Desruisseaux (IRD, Geomatys) * @author Guilhem Legal (Geomatys) - * @version 1.3 + * @version 1.4 * @since 0.4 * @module */ diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java b/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java index a912f08279..d084c55486 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java +++ b/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java @@ -51,7 +51,7 @@ import org.apache.sis.util.resources.Vocabulary; * </ul> * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * @since 0.3 * @module */ @@ -78,12 +78,6 @@ public final class PerformanceLevel extends Level { */ public static final PerformanceLevel SLOWER = new PerformanceLevel("SLOWER", Vocabulary.Keys.Slower, 630, 10_000_000_000L); - /** - * @deprecated Renamed {@link #SLOWNESS}. - */ - @Deprecated - public static final PerformanceLevel SLOW = SLOWNESS; - /** * The minimal duration (in nanoseconds) for logging the record. */ diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java b/core/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java index c440863cc8..e165fe3a5e 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java +++ b/core/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java @@ -35,7 +35,7 @@ * {@code jul-to-slf4j.jar} dependency to a project is sufficient for redirecting Java logging to SLF4J. * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * * @see <a href="https://docs.oracle.com/en/java/javase/18/core/java-logging-overview.html">Java Logging Overview</a> * diff --git a/storage/sis-storage/src/main/java/org/apache/sis/storage/event/StoreListeners.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/event/StoreListeners.java index 3202bfa7d5..8e89dbae11 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/storage/event/StoreListeners.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/event/StoreListeners.java @@ -84,7 +84,7 @@ import org.apache.sis.storage.Resource; * from multiple threads. * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * @since 1.0 * @module */ @@ -420,16 +420,6 @@ public class StoreListeners implements Localized { return Logging.getLogger(src.getClass()); } - /** - * @deprecated Renamed {@link #useReadOnlyEvents()}. - * - * @since 1.2 - */ - @Deprecated - public void useWarningEventsOnly() { - useReadOnlyEvents(); - } - /** * Reports a warning described by the given message. * @@ -617,15 +607,6 @@ public class StoreListeners implements Localized { Logging.unexpectedException(Logger.getLogger(Modules.STORAGE), StoreListeners.class, method, error); } - /** - * @deprecated Replaced by {@link #fire(Class, StoreEvent)} for consistency with the argument order - * in all other methods of this class. - */ - @Deprecated - public <E extends StoreEvent> boolean fire(final E event, final Class<E> eventType) { - return fire(eventType, event); - } - /** * Sends the given event to all listeners registered for the given type or for a super-type. * This method first notifies the listeners registered in this {@code StoreListeners}, then diff --git a/storage/sis-storage/src/main/java/org/apache/sis/storage/event/package-info.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/event/package-info.java index eb549691b7..83ccdc7756 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/storage/event/package-info.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/event/package-info.java @@ -35,7 +35,7 @@ * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @since 1.3 + * @since 1.4 * @version 1.0 * @module */