8189201: [macosx] NotSerializableException during JFrame with MenuBar serialization

Reviewed-by: serb, prr

src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java

@@ -31,13 +31,14 @@ import java.awt.Graphics;
 import java.awt.Insets;
 
 import javax.swing.border.Border;
+import javax.swing.plaf.UIResource;
 
 import sun.swing.SwingUtilities2;
 
 /**
  * The class represents the border of a {@code JMenuBar}.
  */
-public class AquaMenuBarBorder implements Border {
+public class AquaMenuBarBorder implements Border, UIResource {
 
     @Override
     public void paintBorder(final Component c, final Graphics g, final int x,

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

@@ -9310,7 +9310,9 @@ public abstract class Component implements ImageObserver, MenuContainer,
          * when shown/hidden..
          * @since 1.3
          */
-        protected class AccessibleAWTComponentHandler implements ComponentListener {
+        protected class AccessibleAWTComponentHandler implements ComponentListener, Serializable {
+            private static final long serialVersionUID = -1009684107426231869L;
+
             public void componentHidden(ComponentEvent e)  {
                 if (accessibleContext != null) {
                     accessibleContext.firePropertyChange(
@@ -9340,7 +9342,9 @@ public abstract class Component implements ImageObserver, MenuContainer,
          * when focus events happen
          * @since 1.3
          */
-        protected class AccessibleAWTFocusHandler implements FocusListener {
+        protected class AccessibleAWTFocusHandler implements FocusListener, Serializable {
+            private static final long serialVersionUID = 3150908257351582233L;
+
             public void focusGained(FocusEvent event) {
                 if (accessibleContext != null) {
                     accessibleContext.firePropertyChange(

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

@@ -40,6 +40,7 @@ import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.io.Serializable;
 
 import java.lang.ref.WeakReference;
 import java.security.AccessController;
@@ -3849,7 +3850,9 @@ public class Container extends Component {
          * @since 1.3
          */
         protected class AccessibleContainerHandler
-            implements ContainerListener {
+            implements ContainerListener, Serializable {
+            private static final long serialVersionUID = -480855353991814677L;
+
             public void componentAdded(ContainerEvent e) {
                 Component c = e.getChild();
                 if (c != null && c instanceof Accessible) {

test/jdk/javax/swing/JFrame/Serialization/JFrameMenuSerializationTest.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2017, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8189201
+ * @summary [macosx] NotSerializableException during JFrame with MenuBar
+ *          serialization
+ * @run main JFrameMenuSerializationTest
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectOutputStream;
+
+public class JFrameMenuSerializationTest {
+    private static JFrame frame;
+
+    public static void main(String[] args) throws Exception {
+        System.setProperty("apple.laf.useScreenMenuBar", "true");
+        SwingUtilities.invokeAndWait(() -> {
+            frame = new JFrame();
+            frame.setJMenuBar(new JMenuBar());
+            frame.setVisible(true);
+            frame.getAccessibleContext().addPropertyChangeListener(evt -> {});
+        });
+        Robot robot = new Robot();
+        robot.waitForIdle();
+        robot.delay(200);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(10000);
+        ObjectOutputStream oos = new ObjectOutputStream(baos);
+        SwingUtilities.invokeAndWait(() -> {
+            try {
+                oos.writeObject(frame);
+            } catch (NotSerializableException e) {
+                throw new RuntimeException("Test failed", e);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
+        SwingUtilities.invokeLater(frame::dispose);
+
+    }
+}