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

Reviewed-by: aivanov, psadhukhan

Author: mrserb

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

@@ -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")

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

@@ -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")

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

@@ -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) {

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

@@ -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;

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

@@ -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 @@
  */
 public class InvalidDataException extends IOException {
 
+    /**
+     * Use serialVersionUID from JDK 1.7 for interoperability.
+     */
+    @Serial
     private static final long serialVersionUID = 1L;
 
     public InvalidDataException() {

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

@@ -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 @@
  */
 public class InvalidFormatException extends InvalidDataException {
 
+    /**
+     * Use serialVersionUID from JDK 1.7 for interoperability.
+     */
+    @Serial
     private static final long serialVersionUID = 1L;
 
     public InvalidFormatException() {

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

@@ -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,13 +25,19 @@
 
 package com.sun.media.sound;
 
+import java.io.Serial;
+
 /**
  * This exception is used when a RIFF file contains illegal or unexpected data.
  *
  * @author Karl Helgason
  */
 public final class RIFFInvalidDataException extends InvalidDataException {
 
+    /**
+     * Use serialVersionUID from JDK 1.7 for interoperability.
+     */
+    @Serial
     private static final long serialVersionUID = 1L;
 
     public RIFFInvalidDataException() {

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

@@ -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 @@
  */
 public final class RIFFInvalidFormatException extends InvalidFormatException {
 
+    /**
+     * Use serialVersionUID from JDK 1.7 for interoperability.
+     */
+    @Serial
     private static final long serialVersionUID = 1L;
 
     public RIFFInvalidFormatException() {

src/java.desktop/share/classes/java/applet/Applet.java

@@ -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.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 Applet() throws HeadlessException {
     /**
      * Use serialVersionUID from JDK 1.0 for interoperability.
      */
+    @Serial
     private static final long serialVersionUID = -5836846270535785031L;
 
     /**
@@ -109,6 +111,7 @@ public Applet() throws HeadlessException {
      * @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 @@ protected class AccessibleApplet extends AccessibleAWTPanel {
         /**
          * Use serialVersionUID from JDK 1.3 for interoperability.
          */
+        @Serial
         private static final long serialVersionUID = 8127374778187708896L;
 
         /**

src/java.desktop/share/classes/java/awt/AWTError.java

@@ -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,16 +25,19 @@
 
 package java.awt;
 
+import java.io.Serial;
+
 /**
  * Thrown when a serious Abstract Window Toolkit error has occurred.
  *
  * @author      Arthur van Hoff
  */
 public class AWTError extends Error {
 
-    /*
-     * JDK 1.1 serialVersionUID
+    /**
+     * Use serialVersionUID from JDK 1.1 for interoperability.
      */
+     @Serial
      private static final long serialVersionUID = -1819846354050686206L;
 
     /**