Skip to content

8254798: Deprecate for removal an empty finalize() methods in java.desktop module #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

8254798: Deprecate for removal an empty finalize() methods in java.desktop module #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c86878
Initial fix
Oct 14, 2020
4903668
@SuppressWarnings("removal")
Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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


Expand Down
3 changes: 2 additions & 1 deletion src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,8 @@ public void activate() throws ProfileDataException {
* Object#finalize()} for further information about migration
* options.
*/
@Deprecated(since="9")
@Deprecated(since = "9", forRemoval = true)
@SuppressWarnings("removal")
protected void finalize () {
}

Expand Down
5 changes: 3 additions & 2 deletions src/java.desktop/share/classes/java/awt/image/ColorModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -1630,7 +1630,8 @@ 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)
@SuppressWarnings("removal")
public void finalize() {
}

Expand Down
5 changes: 3 additions & 2 deletions src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -1524,7 +1524,8 @@ public BigInteger getValidPixels() {
* See the specification for {@link Object#finalize()} for further
* information about migration options.
*/
@Deprecated(since="9")
@Deprecated(since = "9", forRemoval = true)
@SuppressWarnings("removal")
public void finalize() {
}

Expand Down
13 changes: 1 addition & 12 deletions src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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();
}

}
23 changes: 1 addition & 22 deletions src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -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();
}
*/
}