infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-03 10:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

8259522: Apply java.io.Serial annotations in java.desktop

Browse Source 
Reviewed-by: aivanov, psadhukhan
This commit is contained in:
Sergey Bylokhov 2021-01-15 00:28:08 +00:00
parent bf28f92555
commit 978bed6c7f
343 changed files with 3135 additions and 1158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -25,10 +25,24 @@
package com.sun.beans.editors;
import java.awt.*;
import java.beans.*;
import java.awt.Canvas;
import java.awt.Choice;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Event;
import java.awt.Panel;
import java.awt.TextField;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import java.io.Serial;
public class ColorEditor extends Panel implements PropertyEditor {
/**
* Use serialVersionUID from JDK 1.7 for interoperability.
*/
@Serial
private static final long serialVersionUID = 1781257185164716054L;
@SuppressWarnings("deprecation")

21
src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -25,10 +25,25 @@
package com.sun.beans.editors;
import java.awt.*;
import java.beans.*;
import java.awt.Choice;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Event;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Label;
import java.awt.Panel;
import java.awt.Toolkit;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.Serial;
public class FontEditor extends Panel implements java.beans.PropertyEditor {
/**
* Use serialVersionUID from JDK 1.7 for interoperability.
*/
@Serial
private static final long serialVersionUID = 6732704486002715933L;
@SuppressWarnings("deprecation")

10
src/java.desktop/share/classes/com/sun/beans/finder/SignatureException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2021, 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
@ -22,9 +22,17 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.sun.beans.finder;
import java.io.Serial;
final class SignatureException extends RuntimeException {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4536098341586118473L;
SignatureException(Throwable cause) {

9
src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2021, 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
@ -22,15 +22,22 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.sun.imageio.plugins.common;
import java.awt.color.ColorSpace;
import java.io.Serial;
/**
* Singleton class representing a simple, mathematically defined CMYK
* color space.
*/
public final class SimpleCMYKColorSpace extends ColorSpace {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5387117338644522424L;
private static ColorSpace theInstance = null;

7
src/java.desktop/share/classes/com/sun/media/sound/InvalidDataException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2021, 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
@ -26,6 +26,7 @@
package com.sun.media.sound;
import java.io.IOException;
import java.io.Serial;
/**
* This exception is used when a file contains illegal or unexpected data.
@ -34,6 +35,10 @@ import java.io.IOException;
*/
public class InvalidDataException extends IOException {
/**
* Use serialVersionUID from JDK 1.7 for interoperability.
*/
@Serial
private static final long serialVersionUID = 1L;
public InvalidDataException() {

8
src/java.desktop/share/classes/com/sun/media/sound/InvalidFormatException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2021, 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
@ -25,6 +25,8 @@
package com.sun.media.sound;
import java.io.Serial;
/**
* This exception is used when a reader is used to read file of a format
* it doesn't unterstand or support.
@ -33,6 +35,10 @@ package com.sun.media.sound;
*/
public class InvalidFormatException extends InvalidDataException {
/**
* Use serialVersionUID from JDK 1.7 for interoperability.
*/
@Serial
private static final long serialVersionUID = 1L;
public InvalidFormatException() {

8
src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidDataException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2021, 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
@ -25,6 +25,8 @@
package com.sun.media.sound;
import java.io.Serial;
/**
* This exception is used when a RIFF file contains illegal or unexpected data.
*
@ -32,6 +34,10 @@ package com.sun.media.sound;
*/
public final class RIFFInvalidDataException extends InvalidDataException {
/**
* Use serialVersionUID from JDK 1.7 for interoperability.
*/
@Serial
private static final long serialVersionUID = 1L;
public RIFFInvalidDataException() {

8
src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2021, 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
@ -25,6 +25,8 @@
package com.sun.media.sound;
import java.io.Serial;
/**
* This exception is used when a reader is used to read RIFF file of a format it
* doesn't unterstand or support.
@ -33,6 +35,10 @@ package com.sun.media.sound;
*/
public final class RIFFInvalidFormatException extends InvalidFormatException {
/**
* Use serialVersionUID from JDK 1.7 for interoperability.
*/
@Serial
private static final long serialVersionUID = 1L;
public RIFFInvalidFormatException() {

6
src/java.desktop/share/classes/java/applet/Applet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -34,6 +34,7 @@ import java.awt.Panel;
import java.awt.event.ComponentEvent;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Locale;
@ -94,6 +95,7 @@ public class Applet extends Panel {
/**
* Use serialVersionUID from JDK 1.0 for interoperability.
*/
@Serial
private static final long serialVersionUID = -5836846270535785031L;
/**
@ -109,6 +111,7 @@ public class Applet extends Panel {
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.4
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException {
if (GraphicsEnvironment.isHeadless()) {
@ -579,6 +582,7 @@ public class Applet extends Panel {
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 8127374778187708896L;
/**

9
src/java.desktop/share/classes/java/awt/AWTError.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -25,6 +25,8 @@
package java.awt;
import java.io.Serial;
/**
* Thrown when a serious Abstract Window Toolkit error has occurred.
*
@ -32,9 +34,10 @@ package java.awt;
*/
public class AWTError extends Error {
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -1819846354050686206L;
/**

8
src/java.desktop/share/classes/java/awt/AWTEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -38,6 +38,7 @@ import java.awt.event.TextEvent;
import java.awt.event.WindowEvent;
import java.awt.peer.ComponentPeer;
import java.awt.peer.LightweightPeer;
import java.io.Serial;
import java.security.AccessControlContext;
import java.security.AccessController;
import java.util.EventObject;
@ -252,9 +253,10 @@ public abstract class AWTEvent extends EventObject {
*/
public static final int RESERVED_ID_MAX = 1999;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -1825314779160409405L;
static {

9
src/java.desktop/share/classes/java/awt/AWTException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -22,8 +22,10 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.io.Serial;
/**
* Signals that an Abstract Window Toolkit exception has occurred.
@ -32,9 +34,10 @@ package java.awt;
*/
public class AWTException extends Exception {
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -1900414231151323879L;
/**

11
src/java.desktop/share/classes/java/awt/AWTKeyStroke.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -27,6 +27,7 @@ package java.awt;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.io.Serial;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@ -64,7 +65,12 @@ import sun.swing.SwingAccessor;
* @since 1.4
*/
public class AWTKeyStroke implements Serializable {
static final long serialVersionUID = -6430539691155161871L;
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = -6430539691155161871L;
private static Map<String, Integer> modifierKeywords;
/**
@ -725,6 +731,7 @@ public class AWTKeyStroke implements Serializable {
* @return a cached instance which is equal to this instance
* @throws java.io.ObjectStreamException if a serialization problem occurs
*/
@Serial
protected Object readResolve() throws java.io.ObjectStreamException {
synchronized (AWTKeyStroke.class) {

8
src/java.desktop/share/classes/java/awt/AWTPermission.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -25,6 +25,7 @@
package java.awt;
import java.io.Serial;
import java.security.BasicPermission;
/**
@ -172,7 +173,10 @@ import java.security.BasicPermission;
*/
public final class AWTPermission extends BasicPermission {
/** use serialVersionUID from the Java 2 platform for interoperability */
/**
* Use serialVersionUID from JDK 1.2 for interoperability.
*/
@Serial
private static final long serialVersionUID = 8890392402588814465L;
/**

9
src/java.desktop/share/classes/java/awt/BorderLayout.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -25,7 +25,7 @@
package java.awt;
import java.util.Hashtable;
import java.io.Serial;
/**
* A border layout lays out a container, arranging and resizing
@ -338,9 +338,10 @@ public class BorderLayout implements LayoutManager2,
*/
public static final String LINE_END = AFTER_LINE_ENDS;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -8658291919501921765L;
/**

15
src/java.desktop/share/classes/java/awt/Button.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -32,6 +32,7 @@ import java.beans.BeanProperty;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.EventListener;
import javax.accessibility.Accessible;
@ -115,9 +116,10 @@ public class Button extends Component implements Accessible {
private static final String base = "button";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -8774683716313001058L;
@ -460,6 +462,7 @@ public class Button extends Component implements Accessible {
* @see java.awt.Component#actionListenerK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -487,6 +490,7 @@ public class Button extends Component implements Accessible {
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -540,9 +544,10 @@ public class Button extends Component implements Accessible {
protected class AccessibleAWTButton extends AccessibleAWTComponent
implements AccessibleAction, AccessibleValue
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -5932203980244017102L;
/**

18
src/java.desktop/share/classes/java/awt/Canvas.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -22,11 +22,16 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.awt.image.BufferStrategy;
import java.awt.peer.CanvasPeer;
import javax.accessibility.*;
import java.io.Serial;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
/**
* A {@code Canvas} component represents a blank rectangular
@ -46,9 +51,10 @@ public class Canvas extends Component implements Accessible {
private static final String base = "canvas";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -2284879212465893870L;
/**
@ -238,6 +244,10 @@ public class Canvas extends Component implements Accessible {
*/
protected class AccessibleAWTCanvas extends AccessibleAWTComponent
{
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -6325592262103146699L;
/**

18
src/java.desktop/share/classes/java/awt/CardLayout.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -29,6 +29,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamField;
import java.io.Serial;
import java.io.Serializable;
import java.util.Enumeration;
import java.util.Hashtable;
@ -57,7 +58,10 @@ import java.util.Vector;
public class CardLayout implements LayoutManager2,
Serializable {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4328196481005934313L;
/*
@ -71,7 +75,12 @@ public class CardLayout implements LayoutManager2,
* A pair of component and string that represents its name.
*/
class Card implements Serializable {
static final long serialVersionUID = 6640330810709497518L;
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = 6640330810709497518L;
public String name;
public Component comp;
public Card(String cardName, Component cardComponent) {
@ -114,6 +123,7 @@ public class CardLayout implements LayoutManager2,
* @serialField vector Vector the pairs of components and their names
* @serialField currentCard int the index of Component currently displayed
*/
@Serial
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("tab", Hashtable.class),
new ObjectStreamField("hgap", Integer.TYPE),
@ -564,6 +574,7 @@ public class CardLayout implements LayoutManager2,
* not be found
* @throws IOException if an I/O error occurs
*/
@Serial
@SuppressWarnings("unchecked")
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
@ -599,6 +610,7 @@ public class CardLayout implements LayoutManager2,
* @param s the {@code ObjectOutputStream} to write
* @throws IOException if an I/O error occurs
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{

15
src/java.desktop/share/classes/java/awt/Checkbox.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -31,6 +31,7 @@ import java.awt.peer.CheckboxPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.EventListener;
import javax.accessibility.Accessible;
@ -123,9 +124,10 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
private static final String base = "checkbox";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 7270714317450821763L;
/**
@ -636,6 +638,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
* @see java.awt.Component#itemListenerK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws java.io.IOException
{
@ -663,6 +666,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -718,9 +722,10 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
protected class AccessibleAWTCheckbox extends AccessibleAWTComponent
implements ItemListener, AccessibleAction, AccessibleValue
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 7881579233144754107L;
/**

10
src/java.desktop/share/classes/java/awt/CheckboxGroup.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -22,8 +22,11 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.io.Serial;
/**
* The {@code CheckboxGroup} class is used to group together
* a set of {@code Checkbox} buttons.
@ -63,9 +66,10 @@ public class CheckboxGroup implements java.io.Serializable {
*/
Checkbox selectedCheckbox = null;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 3729780091441768983L;
/**

15
src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -32,6 +32,7 @@ import java.awt.peer.CheckboxMenuItemPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.EventListener;
import javax.accessibility.Accessible;
@ -100,9 +101,10 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
private static final String base = "chkmenuitem";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 6190621106981774043L;
/**
@ -453,6 +455,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
* @see java.awt.Component#itemListenerK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws java.io.IOException
{
@ -477,6 +480,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
* @see #addActionListener(ActionListener)
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{
@ -536,9 +540,10 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
protected class AccessibleAWTCheckboxMenuItem extends AccessibleAWTMenuItem
implements AccessibleAction, AccessibleValue
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -1122642964303476L;
/**

15
src/java.desktop/share/classes/java/awt/Choice.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -31,6 +31,7 @@ import java.awt.peer.ChoicePeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.EventListener;
import java.util.Vector;
@ -102,9 +103,10 @@ public class Choice extends Component implements ItemSelectable, Accessible {
private static final String base = "choice";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4075310674757313071L;
static {
@ -684,6 +686,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
* @see java.awt.Component#itemListenerK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws java.io.IOException
{
@ -711,6 +714,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -766,9 +770,10 @@ public class Choice extends Component implements ItemSelectable, Accessible {
protected class AccessibleAWTChoice extends AccessibleAWTComponent
implements AccessibleAction
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 7175603582428509322L;
/**

14
src/java.desktop/share/classes/java/awt/Color.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -25,11 +25,12 @@
package java.awt;
import java.beans.ConstructorProperties;
import java.awt.image.ColorModel;
import java.awt.color.ColorSpace;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import java.awt.color.ColorSpace;
import java.awt.image.ColorModel;
import java.beans.ConstructorProperties;
import java.io.Serial;
/**
* The {@code Color} class is used to encapsulate colors in the default
@ -253,9 +254,10 @@ public class Color implements Paint, java.io.Serializable {
*/
private ColorSpace cs = null;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 118526816881161077L;
/**

24
src/java.desktop/share/classes/java/awt/Component.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -67,6 +67,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Serial;
import java.io.Serializable;
import java.security.AccessControlContext;
import java.security.AccessController;
@ -671,9 +672,10 @@ public abstract class Component implements ImageObserver, MenuContainer,
*/
public static final float RIGHT_ALIGNMENT = 1.0f;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -7644114512714619750L;
/**
@ -8945,6 +8947,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @see #mouseWheelListenerK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -8984,6 +8987,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @throws IOException if an I/O error occurs
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{
@ -9310,6 +9314,10 @@ public abstract class Component implements ImageObserver, MenuContainer,
protected abstract class AccessibleAWTComponent extends AccessibleContext
implements Serializable, AccessibleComponent {
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 642321655757800191L;
/**
@ -9346,6 +9354,11 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @since 1.3
*/
protected class AccessibleAWTComponentHandler implements ComponentListener, Serializable {
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -1009684107426231869L;
/**
@ -9383,6 +9396,11 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @since 1.3
*/
protected class AccessibleAWTFocusHandler implements FocusListener, Serializable {
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 3150908257351582233L;
/**

8
src/java.desktop/share/classes/java/awt/ComponentOrientation.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021, 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
@ -36,6 +36,7 @@
package java.awt;
import java.io.Serial;
import java.util.Locale;
import java.util.ResourceBundle;
@ -90,9 +91,10 @@ import java.util.ResourceBundle;
*/
public final class ComponentOrientation implements java.io.Serializable
{
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4113291392143563828L;
// Internal constants used in the implementation

22
src/java.desktop/share/classes/java/awt/Container.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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,6 +47,7 @@ import java.io.ObjectOutputStream;
import java.io.ObjectStreamField;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Serial;
import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.security.AccessController;
@ -181,8 +182,9 @@ public class Container extends Component {
transient Color preserveBackgroundColor = null;
/**
* JDK 1.1 serialVersionUID
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4613797578919906343L;
/**
@ -240,6 +242,7 @@ public class Container extends Component {
* @serialField focusTraversalPolicyProvider boolean
* Stores the value of focusTraversalPolicyProvider property.
*/
@Serial
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("ncomponents", Integer.TYPE),
new ObjectStreamField("component", Component[].class),
@ -3682,6 +3685,7 @@ public class Container extends Component {
* @see Container#containerListenerK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s) throws IOException {
ObjectOutputStream.PutField f = s.putFields();
f.put("ncomponents", component.size());
@ -3723,6 +3727,7 @@ public class Container extends Component {
* @see #addContainerListener
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{
@ -3807,8 +3812,9 @@ public class Container extends Component {
protected class AccessibleAWTContainer extends AccessibleAWTComponent {
/**
* JDK1.3 serialVersionUID
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5081320404842566097L;
/**
@ -3871,6 +3877,11 @@ public class Container extends Component {
*/
protected class AccessibleContainerHandler
implements ContainerListener, Serializable {
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -480855353991814677L;
/**
@ -4427,9 +4438,10 @@ public class Container extends Component {
*/
class LightweightDispatcher implements java.io.Serializable, AWTEventListener {
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5184291520170872969L;
/*
* Our own mouse event for when we're dragged over from another hw

8
src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -25,6 +25,7 @@
package java.awt;
import java.io.Serial;
import java.util.ArrayList;
import java.util.List;
@ -74,9 +75,10 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
*/
private final int BACKWARD_TRAVERSAL = 1;
/*
* JDK 1.4 serialVersionUID
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = 486933713763926351L;
/**

9
src/java.desktop/share/classes/java/awt/Cursor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -22,10 +22,12 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.beans.ConstructorProperties;
import java.io.InputStream;
import java.io.Serial;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
@ -173,9 +175,10 @@ public class Cursor implements java.io.Serializable {
private static final String DOT_HOTSPOT_SUFFIX = ".HotSpot";
private static final String DOT_NAME_SUFFIX = ".Name";
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 8028237497568985504L;
private static final PlatformLogger log = PlatformLogger.getLogger("java.awt.Cursor");

10
src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -22,10 +22,11 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.awt.peer.ComponentPeer;
import java.io.Serial;
/**
* A FocusTraversalPolicy that determines traversal order based on the order
@ -70,9 +71,10 @@ import java.awt.peer.ComponentPeer;
public class DefaultFocusTraversalPolicy
extends ContainerOrderFocusTraversalPolicy
{
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = 8876966522510157497L;
/**

9
src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.awt.event.FocusEvent;
@ -29,6 +30,7 @@ import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
import java.awt.peer.ComponentPeer;
import java.awt.peer.LightweightPeer;
import java.io.Serial;
import java.lang.ref.WeakReference;
import java.security.AccessController;
import java.security.PrivilegedAction;
@ -227,9 +229,10 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
private static class DefaultKeyboardFocusManagerSentEvent
extends SentEvent
{
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = -2924743257508701758L;
public DefaultKeyboardFocusManagerSentEvent(AWTEvent nested,

14
src/java.desktop/share/classes/java/awt/Dialog.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -32,6 +32,7 @@ import java.awt.event.WindowEvent;
import java.awt.peer.DialogPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
import java.security.AccessControlException;
import java.security.AccessController;
import java.security.PrivilegedAction;
@ -316,9 +317,10 @@ public class Dialog extends Window {
private static final String base = "dialog";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5920926903803293709L;
/**
@ -1602,6 +1604,7 @@ public class Dialog extends Window {
* @throws HeadlessException if {@code GraphicsEnvironment.isHeadless()}
* returns {@code true}
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -1668,9 +1671,10 @@ public class Dialog extends Window {
*/
protected class AccessibleAWTDialog extends AccessibleAWTWindow
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4837230331833941201L;
/**

8
src/java.desktop/share/classes/java/awt/Dimension.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -27,6 +27,7 @@ package java.awt;
import java.awt.geom.Dimension2D;
import java.beans.Transient;
import java.io.Serial;
/**
* The {@code Dimension} class encapsulates the width and
@ -73,9 +74,10 @@ public class Dimension extends Dimension2D implements java.io.Serializable {
*/
public int height;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4723952579491349524L;
/**

9
src/java.desktop/share/classes/java/awt/Event.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -22,9 +22,11 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.awt.event.KeyEvent;
import java.io.Serial;
/**
* <b>NOTE:</b> The {@code Event} class is obsolete and is
@ -592,9 +594,10 @@ public class Event implements java.io.Serializable {
*/
private boolean consumed = false;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5488922509400504703L;
static {

9
src/java.desktop/share/classes/java/awt/FileDialog.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -30,6 +30,7 @@ import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
import sun.awt.AWTAccessor;
@ -133,9 +134,10 @@ public class FileDialog extends Dialog {
private static final String base = "filedlg";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5035145889651310422L;
@ -605,6 +607,7 @@ public class FileDialog extends Dialog {
* not be found
* @throws IOException if an I/O error occurs
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{

9
src/java.desktop/share/classes/java/awt/FlowLayout.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -27,6 +27,7 @@ package java.awt;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
/**
* A flow layout arranges components in a directional flow, much
@ -191,9 +192,10 @@ public class FlowLayout implements LayoutManager, java.io.Serializable {
*/
private boolean alignOnBaseline;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -7262534875583282631L;
/**
@ -669,6 +671,7 @@ public class FlowLayout implements LayoutManager, java.io.Serializable {
* not be found
* @throws IOException if an I/O error occurs
*/
@Serial
private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException
{

10
src/java.desktop/share/classes/java/awt/Font.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -41,6 +41,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.io.Serial;
import java.lang.ref.SoftReference;
import java.nio.file.Files;
import java.security.AccessController;
@ -469,9 +470,10 @@ public class Font implements java.io.Serializable
*/
private static final AffineTransform identityTx = new AffineTransform();
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4206021311591459213L;
/**
@ -1916,6 +1918,7 @@ public class Font implements java.io.Serializable
* @see AWTEventMulticaster#save(ObjectOutputStream, String, EventListener)
* @see #readObject(java.io.ObjectInputStream)
*/
@Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException
{
@ -1942,6 +1945,7 @@ public class Font implements java.io.Serializable
* @serial
* @see #writeObject(java.io.ObjectOutputStream)
*/
@Serial
private void readObject(java.io.ObjectInputStream s)
throws java.lang.ClassNotFoundException,
java.io.IOException

10
src/java.desktop/share/classes/java/awt/FontFormatException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2021, 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
@ -25,6 +25,8 @@
package java.awt;
import java.io.Serial;
/**
* Thrown by method createFont in the {@code Font} class to indicate
* that the specified font is bad.
@ -35,9 +37,11 @@ package java.awt;
*/
public
class FontFormatException extends Exception {
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4481290147811361272L;
/**

9
src/java.desktop/share/classes/java/awt/FontMetrics.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -25,10 +25,10 @@
package java.awt;
import java.awt.Graphics2D;
import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
import java.awt.geom.Rectangle2D;
import java.io.Serial;
import java.text.CharacterIterator;
/**
@ -119,9 +119,10 @@ public abstract class FontMetrics implements java.io.Serializable {
*/
protected Font font;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 1681126225205050147L;
/**

15
src/java.desktop/share/classes/java/awt/Frame.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -31,6 +31,7 @@ import java.awt.peer.FramePeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Vector;
@ -364,9 +365,10 @@ public class Frame extends Window implements MenuContainer {
private static final String base = "frame";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 2673458971256075116L;
static {
@ -1187,6 +1189,7 @@ public class Frame extends Window implements MenuContainer {
* @see #setIconImage(Image)
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -1223,6 +1226,7 @@ public class Frame extends Window implements MenuContainer {
* @see #setIconImage(Image)
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -1296,9 +1300,10 @@ public class Frame extends Window implements MenuContainer {
*/
protected class AccessibleAWTFrame extends AccessibleAWTWindow
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -6172960752956030250L;
/**

11
src/java.desktop/share/classes/java/awt/GraphicsConfigTemplate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -25,7 +25,8 @@
package java.awt;
import java.io.*;
import java.io.Serial;
import java.io.Serializable;
/**
* The {@code GraphicsConfigTemplate} class is used to obtain a valid
@ -42,9 +43,11 @@ import java.io.*;
* @since 1.2
*/
public abstract class GraphicsConfigTemplate implements Serializable {
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = -8061369279557787079L;
/**

10
src/java.desktop/share/classes/java/awt/GridBagConstraints.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -22,8 +22,11 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.io.Serial;
/**
* The {@code GridBagConstraints} class specifies constraints
* for components that are laid out using the
@ -565,9 +568,10 @@ public class GridBagConstraints implements Cloneable, java.io.Serializable {
// Where the baseline lands relative to the center of the component.
transient int centerOffset;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -1000070633030801713L;
/**

13
src/java.desktop/share/classes/java/awt/GridBagLayout.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -22,10 +22,12 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.util.Hashtable;
import java.io.Serial;
import java.util.Arrays;
import java.util.Hashtable;
/**
* The {@code GridBagLayout} class is a flexible layout
@ -2230,6 +2232,9 @@ java.io.Serializable {
}
}
// Added for serial backwards compatibility (4348425)
static final long serialVersionUID = 8838754796412211005L;
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = 8838754796412211005L;
}

9
src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2021, 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
@ -25,6 +25,8 @@
package java.awt;
import java.io.Serial;
/**
* The {@code GridBagLayoutInfo} is an utility class for
* {@code GridBagLayout} layout manager.
@ -36,9 +38,10 @@ package java.awt;
*/
public class GridBagLayoutInfo implements java.io.Serializable {
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4899416460737170217L;
/**

10
src/java.desktop/share/classes/java/awt/GridLayout.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -25,6 +25,8 @@
package java.awt;
import java.io.Serial;
/**
* The {@code GridLayout} class is a layout manager that
* lays out a container's components in a rectangular grid.
@ -87,9 +89,11 @@ package java.awt;
* @since 1.0
*/
public class GridLayout implements LayoutManager, java.io.Serializable {
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = -7411804673224730901L;
/**

10
src/java.desktop/share/classes/java/awt/HeadlessException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -25,6 +25,8 @@
package java.awt;
import java.io.Serial;
/**
* Thrown when code that is dependent on a keyboard, display, or mouse
* is called in an environment that does not support a keyboard, display,
@ -38,9 +40,11 @@ package java.awt;
* @see GraphicsEnvironment#isHeadless
*/
public class HeadlessException extends UnsupportedOperationException {
/*
* JDK 1.4 serialVersionUID
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = 167183644944358563L;
/**

10
src/java.desktop/share/classes/java/awt/IllegalComponentStateException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 1997, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -25,6 +25,8 @@
package java.awt;
import java.io.Serial;
/**
* Signals that an AWT component is not in an appropriate state for
* the requested operation.
@ -32,9 +34,11 @@ package java.awt;
* @author Jonni Kanerva
*/
public class IllegalComponentStateException extends IllegalStateException {
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -1889339587208144238L;
/**

9
src/java.desktop/share/classes/java/awt/Insets.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -25,6 +25,8 @@
package java.awt;
import java.io.Serial;
/**
* An {@code Insets} object is a representation of the borders
* of a container. It specifies the space that a container must leave
@ -79,9 +81,10 @@ public class Insets implements Cloneable, java.io.Serializable {
*/
public int right;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -2272572637695466749L;
static {

14
src/java.desktop/share/classes/java/awt/Label.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -28,6 +28,7 @@ package java.awt;
import java.awt.peer.LabelPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
@ -104,9 +105,10 @@ public class Label extends Component implements Accessible {
private static final String base = "label";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 3094126758329070636L;
/**
@ -168,6 +170,7 @@ public class Label extends Component implements Accessible {
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.4
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException {
GraphicsEnvironment.checkHeadless();
@ -325,9 +328,10 @@ public class Label extends Component implements Accessible {
*/
protected class AccessibleAWTLabel extends AccessibleAWTComponent
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -3568967560160480438L;
/**

20
src/java.desktop/share/classes/java/awt/List.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -34,6 +34,7 @@ import java.awt.peer.ListPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.EventListener;
import java.util.Locale;
import java.util.Vector;
@ -180,9 +181,10 @@ public class List extends Component implements ItemSelectable, Accessible {
private static final String base = "list";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -3304312411574666869L;
/**
@ -1251,6 +1253,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* @see java.awt.Component#actionListenerK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -1286,6 +1289,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -1339,9 +1343,10 @@ public class List extends Component implements ItemSelectable, Accessible {
protected class AccessibleAWTList extends AccessibleAWTComponent
implements AccessibleSelection, ItemListener, ActionListener
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 7924617370136012829L;
/**
@ -1538,9 +1543,10 @@ public class List extends Component implements ItemSelectable, Accessible {
protected class AccessibleAWTListChild extends AccessibleAWTComponent
implements Accessible
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4412022926028300317L;
// [[[FIXME]]] need to finish implementing this!!!

13
src/java.desktop/share/classes/java/awt/MediaTracker.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -26,6 +26,7 @@
package java.awt;
import java.awt.image.ImageObserver;
import java.io.Serial;
import sun.awt.image.MultiResolutionToolkitImage;
@ -187,9 +188,10 @@ public class MediaTracker implements java.io.Serializable {
@SuppressWarnings("serial") // Not statically typed as Serializable
MediaEntry head;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -483174189758638095L;
/**
@ -934,9 +936,10 @@ java.io.Serializable {
int width;
int height;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4739377000350280650L;
ImageMediaEntry(MediaTracker mt, Image img, int c, int w, int h) {

15
src/java.desktop/share/classes/java/awt/Menu.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -30,6 +30,7 @@ import java.awt.peer.MenuPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.Vector;
@ -114,9 +115,10 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
private static final String base = "menu";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -8809584163345499784L;
/**
@ -531,6 +533,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
* @see AWTEventMulticaster#save(ObjectOutputStream, String, EventListener)
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException
{
@ -550,6 +553,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException, HeadlessException
{
@ -622,9 +626,10 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
*/
protected class AccessibleAWTMenu extends AccessibleAWTMenuItem
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5228160894980069094L;
/**

15
src/java.desktop/share/classes/java/awt/MenuBar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -30,6 +30,7 @@ import java.awt.peer.MenuBarPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.Vector;
@ -118,9 +119,10 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
private static final String base = "menubar";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4930327919388951260L;
/**
@ -432,6 +434,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
* @see AWTEventMulticaster#save(ObjectOutputStream, String, EventListener)
* @see #readObject(java.io.ObjectInputStream)
*/
@Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException
{
@ -451,6 +454,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #writeObject(java.io.ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -509,9 +513,10 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
*/
protected class AccessibleAWTMenuBar extends AccessibleAWTMenuComponent
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -8577604491830083815L;
/**

14
src/java.desktop/share/classes/java/awt/MenuComponent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -29,6 +29,7 @@ import java.awt.event.ActionEvent;
import java.awt.peer.MenuComponentPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
import java.security.AccessControlContext;
import java.security.AccessController;
@ -133,9 +134,10 @@ public abstract class MenuComponent implements java.io.Serializable {
static final String actionListenerK = Component.actionListenerK;
static final String itemListenerK = Component.itemListenerK;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4536902356223894379L;
static {
@ -447,6 +449,7 @@ public abstract class MenuComponent implements java.io.Serializable {
* @serial
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -507,9 +510,10 @@ public abstract class MenuComponent implements java.io.Serializable {
implements java.io.Serializable, AccessibleComponent,
AccessibleSelection
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4269533416223798698L;
/**

15
src/java.desktop/share/classes/java/awt/MenuItem.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -33,6 +33,7 @@ import java.awt.peer.MenuItemPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.EventListener;
import javax.accessibility.Accessible;
@ -175,9 +176,10 @@ public class MenuItem extends MenuComponent implements Accessible {
private static final String base = "menuitem";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -21757335363267194L;
/**
@ -737,6 +739,7 @@ public class MenuItem extends MenuComponent implements Accessible {
* @see AWTEventMulticaster#save(ObjectOutputStream, String, EventListener)
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -762,6 +765,7 @@ public class MenuItem extends MenuComponent implements Accessible {
* @see #addActionListener(ActionListener)
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -821,9 +825,10 @@ public class MenuItem extends MenuComponent implements Accessible {
protected class AccessibleAWTMenuItem extends AccessibleAWTMenuComponent
implements AccessibleAction, AccessibleValue
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -217847831945965825L;
/**

9
src/java.desktop/share/classes/java/awt/MenuShortcut.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -22,10 +22,12 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.io.Serial;
/**
* The {@code MenuShortcut} class represents a keyboard accelerator
@ -87,9 +89,10 @@ public class MenuShortcut implements java.io.Serializable
*/
boolean usesShift;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 143448358473180225L;
/**

18
src/java.desktop/share/classes/java/awt/Panel.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -22,9 +22,14 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import javax.accessibility.*;
import java.io.Serial;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
/**
* {@code Panel} is the simplest container class. A panel
@ -42,9 +47,10 @@ public class Panel extends Container implements Accessible {
private static final String base = "panel";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -2728009084054400034L;
/**
@ -117,6 +123,10 @@ public class Panel extends Container implements Accessible {
*/
protected class AccessibleAWTPanel extends AccessibleAWTContainer {
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -6409552226660031050L;
/**

8
src/java.desktop/share/classes/java/awt/Point.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -27,6 +27,7 @@ package java.awt;
import java.awt.geom.Point2D;
import java.beans.Transient;
import java.io.Serial;
/**
* A point representing a location in {@code (x,y)} coordinate space,
@ -58,9 +59,10 @@ public class Point extends Point2D implements java.io.Serializable {
*/
public int y;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -5276940640259749850L;
/**

12
src/java.desktop/share/classes/java/awt/Polygon.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -22,15 +22,18 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.awt;
import java.awt.geom.AffineTransform;
import java.awt.geom.PathIterator;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import sun.awt.geom.Crossings;
import java.io.Serial;
import java.util.Arrays;
import sun.awt.geom.Crossings;
/**
* The {@code Polygon} class encapsulates a description of a
* closed, two-dimensional region within a coordinate space. This
@ -109,9 +112,10 @@ public class Polygon implements Shape, java.io.Serializable {
*/
protected Rectangle bounds;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -6460061437900069969L;
/*

13
src/java.desktop/share/classes/java/awt/PopupMenu.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -26,6 +26,7 @@
package java.awt;
import java.awt.peer.PopupMenuPeer;
import java.io.Serial;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@ -60,9 +61,10 @@ public class PopupMenu extends Menu {
});
}
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4620452533522760060L;
/**
@ -223,9 +225,10 @@ public class PopupMenu extends Menu {
*/
protected class AccessibleAWTPopupMenu extends AccessibleAWTMenu
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4282044795947239955L;
/**

8
src/java.desktop/share/classes/java/awt/Rectangle.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -27,6 +27,7 @@ package java.awt;
import java.awt.geom.Rectangle2D;
import java.beans.Transient;
import java.io.Serial;
/**
* A {@code Rectangle} specifies an area in a coordinate space that is
@ -158,9 +159,10 @@ public class Rectangle extends Rectangle2D
*/
public int height;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -4345857070255674764L;
/**

19
src/java.desktop/share/classes/java/awt/ScrollPane.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -35,6 +35,7 @@ import java.beans.Transient;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
@ -178,9 +179,10 @@ public class ScrollPane extends Container implements Accessible {
*/
private boolean wheelScrollingEnabled = defaultWheelScroll;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 7956609840827222915L;
/**
@ -683,6 +685,7 @@ public class ScrollPane extends Container implements Accessible {
* @param s the {@code ObjectOutputStream} to write
* @throws IOException if an I/O error occurs
*/
@Serial
private void writeObject(ObjectOutputStream s) throws IOException {
// 4352819: We only need this degenerate writeObject to make
// it safe for future versions of this class to write optional
@ -701,6 +704,7 @@ public class ScrollPane extends Container implements Accessible {
* returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -738,6 +742,10 @@ public class ScrollPane extends Container implements Accessible {
*/
class PeerFixer implements AdjustmentListener, java.io.Serializable
{
/**
* Use serialVersionUID from JDK 1.1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 1043664721353696630L;
PeerFixer(ScrollPane scroller) {
@ -803,9 +811,10 @@ public class ScrollPane extends Container implements Accessible {
*/
protected class AccessibleAWTScrollPane extends AccessibleAWTContainer
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 6100703663886637L;
/**

6
src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -28,6 +28,7 @@ package java.awt;
import java.awt.event.AdjustmentEvent;
import java.awt.event.AdjustmentListener;
import java.awt.peer.ScrollPanePeer;
import java.io.Serial;
import java.io.Serializable;
import sun.awt.AWTAccessor;
@ -172,8 +173,9 @@ public class ScrollPaneAdjustable implements Adjustable, Serializable {
}
/**
* JDK 1.1 serialVersionUID.
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -3359745691033257079L;

15
src/java.desktop/share/classes/java/awt/Scrollbar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -31,6 +31,7 @@ import java.awt.peer.ScrollbarPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.EventListener;
import javax.accessibility.Accessible;
@ -280,9 +281,10 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
private static final String base = "scrollbar";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 8451667562882310543L;
/**
@ -1191,6 +1193,7 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
* @see java.awt.Component#adjustmentListenerK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -1216,6 +1219,7 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #writeObject(ObjectOutputStream)
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -1267,9 +1271,10 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
protected class AccessibleAWTScrollBar extends AccessibleAWTComponent
implements AccessibleValue
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = -344337268523697807L;
/**

10
src/java.desktop/share/classes/java/awt/SentEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -25,6 +25,8 @@
package java.awt;
import java.io.Serial;
import sun.awt.AppContext;
import sun.awt.SunToolkit;
@ -37,9 +39,11 @@ import sun.awt.SunToolkit;
* @author David Mendenhall
*/
class SentEvent extends AWTEvent implements ActiveEvent {
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = -383615247028828931L;
static final int ID =

11
src/java.desktop/share/classes/java/awt/SequencedEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -25,10 +25,11 @@
package java.awt;
import java.io.Serial;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Iterator;
import java.util.LinkedList;
import sun.awt.AWTAccessor;
import sun.awt.AppContext;
import sun.awt.SunToolkit;
@ -45,9 +46,11 @@ import sun.awt.SunToolkit;
* @author David Mendenhall
*/
class SequencedEvent extends AWTEvent implements ActiveEvent {
/*
* serialVersionUID
/**
* Use serialVersionUID from JDK 1.6 for interoperability.
*/
@Serial
private static final long serialVersionUID = 547742659238625067L;
private static final int ID =

10
src/java.desktop/share/classes/java/awt/SystemColor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -26,6 +26,7 @@
package java.awt;
import java.io.ObjectStreamException;
import java.io.Serial;
import java.lang.annotation.Native;
import sun.awt.AWTAccessor;
@ -421,9 +422,10 @@ public final class SystemColor extends Color implements java.io.Serializable {
*/
public static final SystemColor infoText = new SystemColor((byte)INFO_TEXT);
/*
* JDK 1.1 serialVersionUID.
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4503142729533789064L;
/*
@ -514,6 +516,7 @@ public final class SystemColor extends Color implements java.io.Serializable {
* @return one of the {@code SystemColor} static object
* fields that refers to the same system color.
*/
@Serial
private Object readResolve() {
// The instances of SystemColor are tightly controlled and
// only the canonical instances appearing above as static
@ -539,6 +542,7 @@ public final class SystemColor extends Color implements java.io.Serializable {
* @throws ObjectStreamException if a new object replacing this object could
* not be created
*/
@Serial
private Object writeReplace() throws ObjectStreamException
{
// we put an array index in the SystemColor.value while serialize

14
src/java.desktop/share/classes/java/awt/TextArea.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -28,6 +28,7 @@ package java.awt;
import java.awt.peer.TextAreaPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
import java.util.HashSet;
import java.util.Set;
@ -126,9 +127,10 @@ public class TextArea extends TextComponent {
*/
private static Set<AWTKeyStroke> forwardTraversalKeys, backwardTraversalKeys;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 3692302836626095722L;
/**
@ -659,6 +661,7 @@ public class TextArea extends TextComponent {
* returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -719,9 +722,10 @@ public class TextArea extends TextComponent {
*/
protected class AccessibleAWTTextArea extends AccessibleAWTTextComponent
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 3472827823632144419L;
/**

15
src/java.desktop/share/classes/java/awt/TextComponent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -32,6 +32,7 @@ import java.awt.peer.TextComponentPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.text.BreakIterator;
import java.util.EventListener;
@ -123,9 +124,10 @@ public class TextComponent extends Component implements Accessible {
*/
protected transient TextListener textListener;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -2214773872412987419L;
/**
@ -779,6 +781,7 @@ public class TextComponent extends Component implements Accessible {
* @see AWTEventMulticaster#save(ObjectOutputStream, String, EventListener)
* @see java.awt.Component#textListenerK
*/
@Serial
private void writeObject(java.io.ObjectOutputStream s)
throws IOException
{
@ -814,6 +817,7 @@ public class TextComponent extends Component implements Accessible {
* @see #addTextListener
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -871,9 +875,10 @@ public class TextComponent extends Component implements Accessible {
protected class AccessibleAWTTextComponent extends AccessibleAWTComponent
implements AccessibleText, TextListener
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 3631432373506317811L;
/**

15
src/java.desktop/share/classes/java/awt/TextField.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -31,6 +31,7 @@ import java.awt.peer.TextFieldPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.EventListener;
import javax.accessibility.AccessibleContext;
@ -130,9 +131,10 @@ public class TextField extends TextComponent {
private static final String base = "textfield";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = -2966288784432217853L;
/**
@ -710,6 +712,7 @@ public class TextField extends TextComponent {
* @see AWTEventMulticaster#save(ObjectOutputStream, String, EventListener)
* @see java.awt.Component#actionListenerK
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -735,6 +738,7 @@ public class TextField extends TextComponent {
* @see #addActionListener(ActionListener)
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -792,9 +796,10 @@ public class TextField extends TextComponent {
*/
protected class AccessibleAWTTextField extends AccessibleAWTTextComponent
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 6219164359235943158L;
/**

22
src/java.desktop/share/classes/java/awt/Window.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2021, 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
@ -44,6 +44,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OptionalDataException;
import java.io.Serial;
import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.lang.reflect.InvocationTargetException;
@ -387,9 +388,10 @@ public class Window extends Container implements Accessible {
private static final String base = "win";
private static int nameCounter = 0;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4497834738069338734L;
private static final PlatformLogger log = PlatformLogger.getLogger("java.awt.Window");
@ -2959,6 +2961,7 @@ public class Window extends Container implements Accessible {
* @see Component#ownedWindowK
* @see #readObject(ObjectInputStream)
*/
@Serial
private void writeObject(ObjectOutputStream s) throws IOException {
synchronized (this) {
// Update old focusMgr fields so that our object stream can be read
@ -3105,6 +3108,7 @@ public class Window extends Container implements Accessible {
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #writeObject
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException
{
@ -3165,9 +3169,10 @@ public class Window extends Container implements Accessible {
*/
protected class AccessibleAWTWindow extends AccessibleAWTContainer
{
/*
* JDK 1.3 serialVersionUID
/**
* Use serialVersionUID from JDK 1.3 for interoperability.
*/
@Serial
private static final long serialVersionUID = 4215068635060671780L;
/**
@ -4126,8 +4131,9 @@ class FocusManager implements java.io.Serializable {
Container focusRoot;
Component focusOwner;
/*
* JDK 1.1 serialVersionUID
/**
* Use serialVersionUID from JDK 1.1 for interoperability.
*/
static final long serialVersionUID = 2491878825643557906L;
@Serial
private static final long serialVersionUID = 2491878825643557906L;
}

5
src/java.desktop/share/classes/java/awt/color/CMMException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -35,6 +35,8 @@
package java.awt.color;
import java.io.Serial;
/**
* This exception is thrown if the native CMM returns an error.
*/
@ -43,6 +45,7 @@ public class CMMException extends RuntimeException {
/**
* Use serialVersionUID from JDK 1.2 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5775558044142994965L;
/**

4
src/java.desktop/share/classes/java/awt/color/ColorSpace.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -35,6 +35,7 @@
package java.awt.color;
import java.io.Serial;
import java.io.Serializable;
import java.lang.annotation.Native;
@ -97,6 +98,7 @@ public abstract class ColorSpace implements Serializable {
/**
* Use serialVersionUID from JDK 1.2 for interoperability.
*/
@Serial
private static final long serialVersionUID = -409452704308689724L;
/**

5
src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -36,6 +36,7 @@
package java.awt.color;
import java.io.IOException;
import java.io.Serial;
import sun.java2d.cmm.CMSManager;
import sun.java2d.cmm.ColorTransform;
@ -82,6 +83,7 @@ public class ICC_ColorSpace extends ColorSpace {
/**
* Use serialVersionUID from JDK 1.2 for interoperability.
*/
@Serial
private static final long serialVersionUID = 3455889114070431483L;
/**
@ -155,6 +157,7 @@ public class ICC_ColorSpace extends ColorSpace {
* not be found
* @throws IOException if an I/O error occurs
*/
@Serial
private void readObject(java.io.ObjectInputStream s)
throws ClassNotFoundException, java.io.IOException {

7
src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -46,6 +46,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.OutputStream;
import java.io.Serial;
import java.io.Serializable;
import java.security.AccessController;
import java.security.PrivilegedAction;
@ -89,6 +90,7 @@ public class ICC_Profile implements Serializable {
/**
* Use serialVersionUID from JDK 1.2 for interoperability.
*/
@Serial
private static final long serialVersionUID = -3938515861990936766L;
private transient Profile cmmProfile;
@ -1896,6 +1898,7 @@ public class ICC_Profile implements Serializable {
* only the color space name, but the profile data as well so that
* older versions could still deserialize the object.
*/
@Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -1961,6 +1964,7 @@ public class ICC_Profile implements Serializable {
* @see #getInstance(int)
* @see #getInstance(byte[])
*/
@Serial
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
@ -2003,6 +2007,7 @@ public class ICC_Profile implements Serializable {
* serialization spec
* @since 1.3
*/
@Serial
protected Object readResolve() throws ObjectStreamException {
return resolvedDeserializedProfile;
}

5
src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -35,6 +35,8 @@
package java.awt.color;
import java.io.Serial;
import sun.java2d.cmm.Profile;
import sun.java2d.cmm.ProfileDeferralInfo;
@ -69,6 +71,7 @@ public class ICC_ProfileGray extends ICC_Profile {
/**
* Use serialVersionUID from JDK 1.2 for interoperability.
*/
@Serial
private static final long serialVersionUID = -1124721290732002649L;
/**

5
src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -35,6 +35,8 @@
package java.awt.color;
import java.io.Serial;
import sun.java2d.cmm.Profile;
import sun.java2d.cmm.ProfileDeferralInfo;
@ -83,6 +85,7 @@ public class ICC_ProfileRGB extends ICC_Profile {
/**
* Use serialVersionUID from JDK 1.2 for interoperability.
*/
@Serial
private static final long serialVersionUID = 8505067385152579334L;
/**

5
src/java.desktop/share/classes/java/awt/color/ProfileDataException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -25,6 +25,8 @@
package java.awt.color;
import java.io.Serial;
/**
* This exception is thrown when an error occurs in accessing or processing an
* {@code ICC_Profile} object.
@ -34,6 +36,7 @@ public class ProfileDataException extends RuntimeException {
/**
* Use serialVersionUID from JDK 1.2 for interoperability.
*/
@Serial
private static final long serialVersionUID = 7286140888240322498L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the application is asked to open its about window.
@ -40,6 +41,7 @@ public final class AboutEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = -5987180734802756477L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/AppEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
import java.util.EventObject;
/**
@ -41,6 +42,7 @@ public class AppEvent extends EventObject {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = -5958503993556009432L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the application has become the foreground app, and when it is
@ -42,6 +43,7 @@ public final class AppForegroundEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = -5513582555740533911L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the application has been hidden or shown.
@ -41,6 +42,7 @@ public final class AppHiddenEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 2637465279476429224L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the application is asked to re-open itself.
@ -40,6 +41,7 @@ public final class AppReopenedEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 1503238361530407990L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -29,6 +29,7 @@ import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.File;
import java.io.Serial;
import java.util.ArrayList;
import java.util.List;
@ -42,6 +43,7 @@ public class FilesEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 5271763715462312871L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -29,6 +29,7 @@ import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.File;
import java.io.Serial;
import java.util.List;
/**
@ -42,6 +43,7 @@ public final class OpenFilesEvent extends FilesEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = -3982871005867718956L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
import java.net.URI;
/**
@ -41,6 +42,7 @@ public final class OpenURIEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 221209100935933476L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the application is asked to open its preferences window.
@ -40,6 +41,7 @@ public final class PreferencesEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = -6398607097086476160L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -29,6 +29,7 @@ import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.File;
import java.io.Serial;
import java.util.List;
/**
@ -42,6 +43,7 @@ public final class PrintFilesEvent extends FilesEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = -5752560876153618618L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the application is asked to quit.
@ -40,6 +41,7 @@ public final class QuitEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = -256100795532403146L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the displays attached to the system enter and exit power save
@ -42,6 +43,7 @@ public final class ScreenSleepEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 7521606180376544150L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the system enters and exits power save sleep.
@ -41,6 +42,7 @@ public final class SystemSleepEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 11372269824930549L;
/**

4
src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@ -28,6 +28,7 @@ package java.awt.desktop;
import java.awt.Desktop;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.io.Serial;
/**
* Event sent when the user session has been changed. Some systems may provide a
@ -42,6 +43,7 @@ public final class UserSessionEvent extends AppEvent {
/**
* Use serialVersionUID from JDK 9 for interoperability.
*/
@Serial
private static final long serialVersionUID = 6747138462796569055L;
/**

9
src/java.desktop/share/classes/java/awt/dnd/DragGestureEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021, 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
@ -35,6 +35,7 @@ import java.io.IOException;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.util.Collections;
import java.util.EventObject;
import java.util.Iterator;
@ -65,6 +66,10 @@ import java.util.List;
public class DragGestureEvent extends EventObject {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = 9080172649166731306L;
/**
@ -299,6 +304,7 @@ public class DragGestureEvent extends EventObject {
* {@code null}.
* @since 1.4
*/
@Serial
private void writeObject(ObjectOutputStream s) throws IOException {
s.defaultWriteObject();
@ -323,6 +329,7 @@ public class DragGestureEvent extends EventObject {
* @throws IOException if an I/O error occurs
* @since 1.4
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{

9
src/java.desktop/share/classes/java/awt/dnd/DragGestureRecognizer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021, 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
@ -32,6 +32,7 @@ import java.io.IOException;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.TooManyListenersException;
@ -82,6 +83,10 @@ import java.util.TooManyListenersException;
public abstract class DragGestureRecognizer implements Serializable {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = 8996673345831063337L;
/**
@ -397,6 +402,7 @@ public abstract class DragGestureRecognizer implements Serializable {
* {@code null}.
* @since 1.4
*/
@Serial
private void writeObject(ObjectOutputStream s) throws IOException {
s.defaultWriteObject();
@ -416,6 +422,7 @@ public abstract class DragGestureRecognizer implements Serializable {
* @throws IOException if an I/O error occurs
* @since 1.4
*/
@Serial
@SuppressWarnings("unchecked")
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException

9
src/java.desktop/share/classes/java/awt/dnd/DragSource.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -38,6 +38,7 @@ import java.awt.datatransfer.Transferable;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.io.Serializable;
import java.security.AccessController;
import java.util.EventListener;
@ -117,6 +118,10 @@ import sun.security.action.GetIntegerAction;
public class DragSource implements Serializable {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = 6236096958971414066L;
/*
@ -818,6 +823,7 @@ public class DragSource implements Serializable {
* </ul>.
* @since 1.4
*/
@Serial
private void writeObject(ObjectOutputStream s) throws IOException {
s.defaultWriteObject();
@ -857,6 +863,7 @@ public class DragSource implements Serializable {
* @see java.awt.datatransfer.SystemFlavorMap#getDefaultFlavorMap
* @since 1.4
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException {
s.defaultReadObject();

9
src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -39,6 +39,7 @@ import java.io.IOException;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.io.Serializable;
import java.util.TooManyListenersException;
@ -92,6 +93,10 @@ import sun.awt.ComponentFactory;
public class DragSourceContext
implements DragSourceListener, DragSourceMotionListener, Serializable {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = -115407898692194719L;
// used by updateCurrentCursor
@ -553,6 +558,7 @@ public class DragSourceContext
* {@code null}.
* @since 1.4
*/
@Serial
private void writeObject(ObjectOutputStream s) throws IOException {
s.defaultWriteObject();
@ -578,6 +584,7 @@ public class DragSourceContext
* @throws IOException if an I/O error occurs
* @since 1.4
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{

7
src/java.desktop/share/classes/java/awt/dnd/DragSourceDragEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -26,6 +26,7 @@
package java.awt.dnd;
import java.awt.event.InputEvent;
import java.io.Serial;
/**
* The {@code DragSourceDragEvent} is
@ -71,6 +72,10 @@ import java.awt.event.InputEvent;
public class DragSourceDragEvent extends DragSourceEvent {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = 481346297933902471L;
/**

8
src/java.desktop/share/classes/java/awt/dnd/DragSourceDropEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -25,6 +25,8 @@
package java.awt.dnd;
import java.io.Serial;
/**
* The {@code DragSourceDropEvent} is delivered
* from the {@code DragSourceContextPeer},
@ -42,6 +44,10 @@ package java.awt.dnd;
public class DragSourceDropEvent extends DragSourceEvent {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = -5571321229470821891L;
/**

8
src/java.desktop/share/classes/java/awt/dnd/DragSourceEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -26,7 +26,7 @@
package java.awt.dnd;
import java.awt.Point;
import java.io.Serial;
import java.util.EventObject;
/**
@ -59,6 +59,10 @@ import java.util.EventObject;
public class DragSourceEvent extends EventObject {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = -763287114604032641L;
/**

9
src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -43,6 +43,7 @@ import java.awt.peer.LightweightPeer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serial;
import java.io.Serializable;
import java.util.TooManyListenersException;
@ -67,6 +68,10 @@ import sun.awt.AWTAccessor.ComponentAccessor;
public class DropTarget implements DropTargetListener, Serializable {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = -6283860791671019047L;
/**
@ -581,6 +586,7 @@ public class DropTarget implements DropTargetListener, Serializable {
* instance, or {@code null}.
* @since 1.4
*/
@Serial
private void writeObject(ObjectOutputStream s) throws IOException {
s.defaultWriteObject();
@ -604,6 +610,7 @@ public class DropTarget implements DropTargetListener, Serializable {
* @throws IOException if an I/O error occurs
* @since 1.4
*/
@Serial
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{

11
src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -26,16 +26,13 @@
package java.awt.dnd;
import java.awt.Component;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.dnd.peer.DropTargetContextPeer;
import java.io.IOException;
import java.io.Serial;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
@ -58,6 +55,10 @@ import sun.awt.AWTAccessor.DropTargetContextAccessor;
public class DropTargetContext implements Serializable {
/**
* Use serialVersionUID from JDK 1.4 for interoperability.
*/
@Serial
private static final long serialVersionUID = -634158968993743371L;
static {

Some files were not shown because too many files have changed in this diff Show More