From 1c86878cdaae62b0a5d4ef7e027cd87efdbffcea Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Wed, 14 Oct 2020 15:47:05 -0700 Subject: [PATCH 1/2] Initial fix --- .../sun/media/sound/AbstractMidiDevice.java | 8 +------ .../classes/java/awt/color/ICC_Profile.java | 2 +- .../classes/java/awt/image/ColorModel.java | 4 ++-- .../java/awt/image/IndexColorModel.java | 4 ++-- .../java2d/pipe/RegionClipSpanIterator.java | 13 +---------- .../sun/java2d/pipe/RegionSpanIterator.java | 23 +------------------ 6 files changed, 8 insertions(+), 46 deletions(-) diff --git a/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java b/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java index 1a6021b56bc62..52588387a7881 100644 --- a/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java +++ b/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -478,12 +478,6 @@ public final MidiDevice getMidiDevice() { final boolean isOpen() { return open; } - - //$$fb is that a good idea? - //protected void finalize() { - // close(); - //} - } // class AbstractReceiver 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 index 21a1f9c682416..220e871bffd9d 100644 --- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java +++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java @@ -759,7 +759,7 @@ public void activate() throws ProfileDataException { * Object#finalize()} for further information about migration * options. */ - @Deprecated(since="9") + @Deprecated(since = "9", forRemoval = true) protected void finalize () { } diff --git a/src/java.desktop/share/classes/java/awt/image/ColorModel.java b/src/java.desktop/share/classes/java/awt/image/ColorModel.java index 83f6ca7b22b3f..a5bc61051b229 100644 --- a/src/java.desktop/share/classes/java/awt/image/ColorModel.java +++ b/src/java.desktop/share/classes/java/awt/image/ColorModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1630,7 +1630,7 @@ public boolean isCompatibleSampleModel(SampleModel sm) { * See the specification for {@link Object#finalize()} for further * information about migration options. */ - @Deprecated(since="9") + @Deprecated(since = "9", forRemoval = true) public void finalize() { } diff --git a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java index f8745919c044f..a857ec93d9def 100644 --- a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java +++ b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1524,7 +1524,7 @@ public BigInteger getValidPixels() { * See the specification for {@link Object#finalize()} for further * information about migration options. */ - @Deprecated(since="9") + @Deprecated(since = "9", forRemoval = true) public void finalize() { } diff --git a/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java b/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java index 40ff927d30108..c409ae1b98d18 100644 --- a/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java +++ b/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -377,15 +377,4 @@ public void skipDownTo(int y) { public long getNativeIterator() { return 0; } - - /* - * Cleans out all internal data structures. - */ - //public native void dispose(); - - @SuppressWarnings("deprecation") - protected void finalize() { - //dispose(); - } - } diff --git a/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java b/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java index 47f1ee1fa39ac..9741b14ee2383 100644 --- a/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java +++ b/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,17 +47,6 @@ public class RegionSpanIterator implements SpanIterator { // Is the associated Region rectangular? boolean isrect; -/* - REMIND: For native implementation - long pData; // Private storage of rect info - - static { - initIDs(); - } - - public static native void initIDs(); -*/ - /** * Constructs an instance based on the given Region */ @@ -197,14 +186,4 @@ public void skipDownTo(int y) { public long getNativeIterator() { return 0; } - - /* - * Cleans out all internal data structures. - * REMIND: Native implementation - public native void dispose(); - - protected void finalize() { - dispose(); - } - */ } From 4903668382224c8e38e3086f5d9ac9ea3a85a32a Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Wed, 14 Oct 2020 17:23:32 -0700 Subject: [PATCH 2/2] @SuppressWarnings("removal") --- src/java.desktop/share/classes/java/awt/color/ICC_Profile.java | 1 + src/java.desktop/share/classes/java/awt/image/ColorModel.java | 1 + .../share/classes/java/awt/image/IndexColorModel.java | 1 + 3 files changed, 3 insertions(+) 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 index 220e871bffd9d..1ccfa05818eae 100644 --- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java +++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java @@ -760,6 +760,7 @@ public void activate() throws ProfileDataException { * options. */ @Deprecated(since = "9", forRemoval = true) + @SuppressWarnings("removal") protected void finalize () { } diff --git a/src/java.desktop/share/classes/java/awt/image/ColorModel.java b/src/java.desktop/share/classes/java/awt/image/ColorModel.java index a5bc61051b229..c4c8f80af7a70 100644 --- a/src/java.desktop/share/classes/java/awt/image/ColorModel.java +++ b/src/java.desktop/share/classes/java/awt/image/ColorModel.java @@ -1631,6 +1631,7 @@ public boolean isCompatibleSampleModel(SampleModel sm) { * information about migration options. */ @Deprecated(since = "9", forRemoval = true) + @SuppressWarnings("removal") public void finalize() { } diff --git a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java index a857ec93d9def..51b5504de649e 100644 --- a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java +++ b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java @@ -1525,6 +1525,7 @@ public BigInteger getValidPixels() { * information about migration options. */ @Deprecated(since = "9", forRemoval = true) + @SuppressWarnings("removal") public void finalize() { }