8273102: Delete deprecated for removal the empty finalize() in java.d…

…esktop module Reviewed-by: pbansal, aivanov, iris, prr
openjdk · Oct 6, 2021 · 9561fea · 9561fea · openjdk-notifier · Oct 6, 2021
1 parent 9945f7a
commit 9561fea
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 57 deletions.
diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
@@ -767,24 +767,6 @@ private interface BuiltInProfile {
         deferralInfo = pdi;
     }
 
-    /**
-     * Frees the resources associated with an {@code ICC_Profile} object.
-     *
-     * @deprecated The {@code finalize} method has been deprecated. Subclasses
-     *         that override {@code finalize} in order to perform cleanup should
-     *         be modified to use alternative cleanup mechanisms and to remove
-     *         the overriding {@code finalize} method. When overriding the
-     *         {@code finalize} method, its implementation must explicitly
-     *         ensure that {@code super.finalize()} is invoked as described in
-     *         {@link Object#finalize}. See the specification for {@link
-     *         Object#finalize()} for further information about migration
-     *         options.
-     */
-    @Deprecated(since = "9", forRemoval = true)
-    @SuppressWarnings("removal")
-    protected void finalize() {
-    }
-
     /**
      * Constructs an {@code ICC_Profile} object corresponding to the data in a
      * byte array.

diff --git a/src/java.desktop/share/classes/java/awt/image/ColorModel.java b/src/java.desktop/share/classes/java/awt/image/ColorModel.java
@@ -1617,26 +1617,6 @@ public boolean isCompatibleSampleModel(SampleModel sm) {
             ("This method is not supported by this color model");
     }
 
-    /**
-     * Disposes of system resources associated with this
-     * {@code ColorModel} once this {@code ColorModel} is no
-     * longer referenced.
-     *
-     * @deprecated The {@code finalize} method has been deprecated.
-     *     Subclasses that override {@code finalize} in order to perform cleanup
-     *     should be modified to use alternative cleanup mechanisms and
-     *     to remove the overriding {@code finalize} method.
-     *     When overriding the {@code finalize} method, its implementation must explicitly
-     *     ensure that {@code super.finalize()} is invoked as described in {@link Object#finalize}.
-     *     See the specification for {@link Object#finalize()} for further
-     *     information about migration options.
-     */
-    @Deprecated(since = "9", forRemoval = true)
-    @SuppressWarnings("removal")
-    public void finalize() {
-    }
-
-
     /**
      * Returns a {@code Raster} representing the alpha channel of an
      * image, extracted from the input {@code Raster}, provided that

diff --git a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
@@ -1510,25 +1510,6 @@ public BigInteger getValidPixels() {
         }
     }
 
-    /**
-     * Disposes of system resources associated with this
-     * {@code ColorModel} once this {@code ColorModel} is no
-     * longer referenced.
-     *
-     * @deprecated The {@code finalize} method has been deprecated.
-     *     Subclasses that override {@code finalize} in order to perform cleanup
-     *     should be modified to use alternative cleanup mechanisms and
-     *     to remove the overriding {@code finalize} method.
-     *     When overriding the {@code finalize} method, its implementation must explicitly
-     *     ensure that {@code super.finalize()} is invoked as described in {@link Object#finalize}.
-     *     See the specification for {@link Object#finalize()} for further
-     *     information about migration options.
-     */
-    @Deprecated(since = "9", forRemoval = true)
-    @SuppressWarnings("removal")
-    public void finalize() {
-    }
-
     /**
      * Returns the {@code String} representation of the contents of
      * this {@code ColorModel} object.