From 25d1d45fd9b96452fde20291338944e8ae3f75e2 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Thu, 13 Mar 2014 16:29:26 -0700 Subject: [PATCH] 8035692: Fix serial lint warnings in mac-specific code Reviewed-by: alanb, prr --- .../classes/apple/laf/AquaLookAndFeel.java | 3 ++- .../classes/apple/security/AppleProvider.java | 2 +- .../classes/com/apple/eawt/AppEvent.java | 17 +++++++++++++- .../com/apple/eawt/ApplicationEvent.java | 3 ++- .../classes/com/apple/laf/AquaCaret.java | 3 ++- .../com/apple/laf/AquaComboBoxButton.java | 4 +++- .../com/apple/laf/AquaComboBoxPopup.java | 4 +++- .../com/apple/laf/AquaComboBoxRenderer.java | 3 ++- .../laf/AquaComboBoxRendererInternal.java | 3 ++- .../classes/com/apple/laf/AquaComboBoxUI.java | 14 ++++++++++- .../com/apple/laf/AquaFileChooserUI.java | 23 ++++++++++++++++++- .../com/apple/laf/AquaFileSystemModel.java | 3 ++- .../classes/com/apple/laf/AquaFileView.java | 3 ++- .../classes/com/apple/laf/AquaFonts.java | 3 ++- .../com/apple/laf/AquaImageFactory.java | 4 +++- .../laf/AquaInternalFrameDockIconUI.java | 4 +++- .../apple/laf/AquaInternalFrameManager.java | 3 ++- .../apple/laf/AquaInternalFramePaneUI.java | 4 +++- .../com/apple/laf/AquaInternalFrameUI.java | 4 +++- .../com/apple/laf/AquaKeyBindings.java | 4 +++- .../classes/com/apple/laf/AquaListUI.java | 3 ++- .../com/apple/laf/AquaLookAndFeel.java | 1 + .../com/apple/laf/AquaNativeResources.java | 3 ++- .../classes/com/apple/laf/AquaSpinnerUI.java | 5 +++- .../com/apple/laf/AquaSplitPaneDividerUI.java | 3 ++- .../laf/AquaTabbedPaneCopyFromBasicUI.java | 8 ++++++- .../com/apple/laf/AquaTabbedPaneUI.java | 6 +++-- .../com/apple/laf/AquaTableHeaderBorder.java | 3 ++- .../com/apple/laf/AquaTableHeaderUI.java | 3 ++- .../com/apple/laf/AquaTextFieldSearch.java | 4 +++- .../classes/com/apple/laf/AquaToolBarUI.java | 3 ++- .../classes/com/apple/laf/AquaTreeUI.java | 3 ++- .../classes/com/apple/laf/ScreenMenu.java | 3 ++- .../classes/com/apple/laf/ScreenMenuBar.java | 3 ++- .../classes/com/apple/laf/ScreenMenuItem.java | 3 ++- .../com/apple/laf/ScreenMenuItemCheckbox.java | 3 ++- .../sun/lwawt/macosx/CCustomCursor.java | 3 ++- .../sun/lwawt/macosx/CEmbeddedFrame.java | 1 + .../macosx/CMouseDragGestureRecognizer.java | 4 ++-- .../sun/lwawt/macosx/CPrinterDialog.java | 3 ++- .../sun/lwawt/macosx/CPrinterJobDialog.java | 1 + .../sun/lwawt/macosx/CPrinterPageDialog.java | 1 + .../sun/lwawt/macosx/CViewEmbeddedFrame.java | 1 + .../classes/sun/lwawt/macosx/LWCToolkit.java | 2 ++ .../classes/sun/lwawt/macosx/NSPrintInfo.java | 3 ++- 45 files changed, 146 insertions(+), 41 deletions(-) diff --git a/jdk/src/macosx/classes/apple/laf/AquaLookAndFeel.java b/jdk/src/macosx/classes/apple/laf/AquaLookAndFeel.java index 805bb4e23d6..b51b08b84c5 100644 --- a/jdk/src/macosx/classes/apple/laf/AquaLookAndFeel.java +++ b/jdk/src/macosx/classes/apple/laf/AquaLookAndFeel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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,4 +30,5 @@ package apple.laf; * "apple.laf.AquaLookAndFeel" is so widely used, documented, * and hard coded that it is impractical to remove it. */ +@SuppressWarnings("serial") // JDK implementation class public class AquaLookAndFeel extends com.apple.laf.AquaLookAndFeel { } diff --git a/jdk/src/macosx/classes/apple/security/AppleProvider.java b/jdk/src/macosx/classes/apple/security/AppleProvider.java index 5f05f968d1f..01accf67324 100644 --- a/jdk/src/macosx/classes/apple/security/AppleProvider.java +++ b/jdk/src/macosx/classes/apple/security/AppleProvider.java @@ -36,7 +36,7 @@ import java.security.*; * * This provider only exists to provide access to the Apple keychain-based KeyStore implementation */ - +@SuppressWarnings("serial") // JDK implementation class public final class AppleProvider extends Provider { private static final String info = "Apple Provider"; diff --git a/jdk/src/macosx/classes/com/apple/eawt/AppEvent.java b/jdk/src/macosx/classes/com/apple/eawt/AppEvent.java index d2d9575ec0b..643351748cd 100644 --- a/jdk/src/macosx/classes/com/apple/eawt/AppEvent.java +++ b/jdk/src/macosx/classes/com/apple/eawt/AppEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ import java.awt.Window; * @since Java for Mac OS X 10.6 Update 3 * @since Java for Mac OS X 10.5 Update 8 */ +@SuppressWarnings("serial") // JDK implementation class public abstract class AppEvent extends EventObject { AppEvent() { super(Application.getApplication()); @@ -44,6 +45,7 @@ public abstract class AppEvent extends EventObject { /** * Contains a list of files. */ + @SuppressWarnings("serial") // JDK implementation class public abstract static class FilesEvent extends AppEvent { final List files; @@ -64,6 +66,7 @@ public abstract class AppEvent extends EventObject { * * @see OpenFilesHandler#openFiles(OpenFilesEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class OpenFilesEvent extends FilesEvent { final String searchTerm; @@ -87,6 +90,7 @@ public abstract class AppEvent extends EventObject { * * @see PrintFilesHandler#printFiles(PrintFilesEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class PrintFilesEvent extends FilesEvent { PrintFilesEvent(final List files) { super(files); @@ -98,6 +102,7 @@ public abstract class AppEvent extends EventObject { * * @see OpenURIHandler#openURI(OpenURIEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class OpenURIEvent extends AppEvent { final URI uri; @@ -118,6 +123,7 @@ public abstract class AppEvent extends EventObject { * * @see AboutHandler#handleAbout() */ + @SuppressWarnings("serial") // JDK implementation class public static class AboutEvent extends AppEvent { AboutEvent() { } } /** @@ -125,6 +131,7 @@ public abstract class AppEvent extends EventObject { * * @see PreferencesHandler#handlePreferences() */ + @SuppressWarnings("serial") // JDK implementation class public static class PreferencesEvent extends AppEvent { PreferencesEvent() { } } /** @@ -132,6 +139,7 @@ public abstract class AppEvent extends EventObject { * * @see QuitHandler#handleQuitRequestWith(QuitEvent, QuitResponse) */ + @SuppressWarnings("serial") // JDK implementation class public static class QuitEvent extends AppEvent { QuitEvent() { } } /** @@ -139,6 +147,7 @@ public abstract class AppEvent extends EventObject { * * @see AppReOpenedListener#appReOpened(AppReOpenedEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class AppReOpenedEvent extends AppEvent { AppReOpenedEvent() { } } /** @@ -147,6 +156,7 @@ public abstract class AppEvent extends EventObject { * @see AppForegroundListener#appRaisedToForeground(AppForegroundEvent) * @see AppForegroundListener#appMovedToBackground(AppForegroundEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class AppForegroundEvent extends AppEvent { AppForegroundEvent() { } } /** @@ -155,6 +165,7 @@ public abstract class AppEvent extends EventObject { * @see AppHiddenListener#appHidden(AppHiddenEvent) * @see AppHiddenListener#appUnhidden(AppHiddenEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class AppHiddenEvent extends AppEvent { AppHiddenEvent() { } } /** @@ -163,6 +174,7 @@ public abstract class AppEvent extends EventObject { * @see UserSessionListener#userSessionActivated(UserSessionEvent) * @see UserSessionListener#userSessionDeactivated(UserSessionEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class UserSessionEvent extends AppEvent { UserSessionEvent() { } } /** @@ -171,6 +183,7 @@ public abstract class AppEvent extends EventObject { * @see ScreenSleepListener#screenAboutToSleep(ScreenSleepEvent) * @see ScreenSleepListener#screenAwoke(ScreenSleepEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class ScreenSleepEvent extends AppEvent { ScreenSleepEvent() { } } /** @@ -179,6 +192,7 @@ public abstract class AppEvent extends EventObject { * @see SystemSleepListener#systemAboutToSleep(SystemSleepEvent) * @see SystemSleepListener#systemAwoke(SystemSleepEvent) */ + @SuppressWarnings("serial") // JDK implementation class public static class SystemSleepEvent extends AppEvent { SystemSleepEvent() { } } /** @@ -188,6 +202,7 @@ public abstract class AppEvent extends EventObject { * * @since Java for Mac OS X 10.7 Update 1 */ + @SuppressWarnings("serial") // JDK implementation class public static class FullScreenEvent extends AppEvent { final Window window; diff --git a/jdk/src/macosx/classes/com/apple/eawt/ApplicationEvent.java b/jdk/src/macosx/classes/com/apple/eawt/ApplicationEvent.java index 482075dc163..908c8257b01 100644 --- a/jdk/src/macosx/classes/com/apple/eawt/ApplicationEvent.java +++ b/jdk/src/macosx/classes/com/apple/eawt/ApplicationEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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.util.EventObject; * @since 1.4 */ @Deprecated +@SuppressWarnings("serial") // JDK implementation class public class ApplicationEvent extends EventObject { private String fFilename = null; private boolean fHandled = false; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaCaret.java b/jdk/src/macosx/classes/com/apple/laf/AquaCaret.java index edb2bea8b2b..15b9098ced2 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaCaret.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaCaret.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 javax.swing.border.Border; import javax.swing.plaf.UIResource; import javax.swing.text.*; +@SuppressWarnings("serial") // Superclass is not serializable across versions public class AquaCaret extends DefaultCaret implements UIResource, PropertyChangeListener { final boolean isMultiLineEditor; final JTextComponent c; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxButton.java b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxButton.java index 1d902d0a1d5..2867245ee1e 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxButton.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxButton.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 javax.swing.plaf.UIResource; import apple.laf.JRSUIState; import apple.laf.JRSUIConstants.*; +@SuppressWarnings("serial") // Superclass is not serializable across versions class AquaComboBoxButton extends JButton { final protected JComboBox comboBox; final protected JList list; @@ -43,6 +44,7 @@ class AquaComboBoxButton extends JButton { boolean isPopDown; boolean isSquare; + @SuppressWarnings("serial") // anonymous class protected AquaComboBoxButton(final AquaComboBoxUI ui, final JComboBox comboBox, final CellRendererPane rendererPane, final JList list) { super(""); putClientProperty("JButton.buttonType", "comboboxInternal"); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxPopup.java b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxPopup.java index 0607f9c36ac..dde9b1be337 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxPopup.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxPopup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 javax.swing.plaf.basic.BasicComboPopup; import sun.lwawt.macosx.CPlatformWindow; +@SuppressWarnings("serial") // Superclass is not serializable across versions class AquaComboBoxPopup extends BasicComboPopup { static final int FOCUS_RING_PAD_LEFT = 6; static final int FOCUS_RING_PAD_RIGHT = 6; @@ -147,6 +148,7 @@ class AquaComboBoxPopup extends BasicComboPopup { } @Override + @SuppressWarnings("serial") // anonymous class protected JList createList() { return new JList(comboBox.getModel()) { @Override diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java index 181ad9970dc..6161eb6447c 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 com.apple.laf; import javax.swing.*; import javax.swing.plaf.UIResource; +@SuppressWarnings("serial") // Superclass is not serializable across versions class AquaComboBoxRenderer extends AquaComboBoxRendererInternal implements UIResource { public AquaComboBoxRenderer(final JComboBox comboBox) { super(comboBox); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java index a93560a1f71..2ed6dcfcf70 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, 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 sun.swing.SwingUtilities2; import javax.swing.*; import java.awt.*; +@SuppressWarnings("serial") // Superclass is not serializable across versions class AquaComboBoxRendererInternal extends JLabel implements ListCellRenderer { final JComboBox fComboBox; boolean fSelected; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java index 4b9c78b3dcd..c38e108633b 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -202,7 +202,9 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { } } + @SuppressWarnings("serial") // Superclass is not serializable across versions class AquaCustomComboTextField extends JTextField { + @SuppressWarnings("serial") // anonymous class public AquaCustomComboTextField() { final InputMap inputMap = getInputMap(); inputMap.put(KeyStroke.getKeyStroke("DOWN"), highlightNextAction); @@ -286,6 +288,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { SwingUtilities.replaceUIActionMap(comboBox, actionMap); } + @SuppressWarnings("serial") // Superclass is not serializable across versions private abstract class ComboBoxAction extends AbstractAction { public void actionPerformed(final ActionEvent e) { if (!comboBox.isEnabled() || !comboBox.isShowing()) { @@ -306,6 +309,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { /** * Hilight _but do not select_ the next item in the list. */ + @SuppressWarnings("serial") // anonymous class private Action highlightNextAction = new ComboBoxAction() { @Override public void performComboBoxAction(AquaComboBoxUI ui) { @@ -322,6 +326,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { /** * Hilight _but do not select_ the previous item in the list. */ + @SuppressWarnings("serial") // anonymous class private Action highlightPreviousAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { @@ -334,6 +339,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { } }; + @SuppressWarnings("serial") // anonymous class private Action highlightFirstAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { @@ -342,6 +348,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { } }; + @SuppressWarnings("serial") // anonymous class private Action highlightLastAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { @@ -351,6 +358,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { } }; + @SuppressWarnings("serial") // anonymous class private Action highlightPageUpAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { @@ -371,6 +379,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { } }; + @SuppressWarnings("serial") // anonymous class private Action highlightPageDownAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { @@ -486,12 +495,14 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { // This is somewhat messy. The difference here from BasicComboBoxUI.EnterAction is that // arrow up or down does not automatically select the + @SuppressWarnings("serial") // anonymous class private static final Action triggerSelectionAction = new AbstractAction() { public void actionPerformed(final ActionEvent e) { triggerSelectionEvent((JComboBox)e.getSource(), e); } }; + @SuppressWarnings("serial") // anonymous class private static final Action toggleSelectionAction = new AbstractAction() { public void actionPerformed(final ActionEvent e) { final JComboBox comboBox = (JComboBox)e.getSource(); @@ -510,6 +521,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable { } }; + @SuppressWarnings("serial") // anonymous class private static Action hideAction = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java index cfa3b08d3be..3fae5e20310 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -857,6 +857,7 @@ public class AquaFileChooserUI extends FileChooserUI { // Action to attach to the file list so we can override the default action // of the table for the return key, which is to select the next line. + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class DefaultButtonAction extends AbstractAction { public void actionPerformed(final ActionEvent e) { final JRootPane root = AquaFileChooserUI.this.getFileChooser().getRootPane(); @@ -883,6 +884,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Creates a new folder. */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class NewFolderAction extends AbstractAction { protected NewFolderAction() { super(newFolderAccessibleName); @@ -944,6 +946,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Responds to an Open, Save, or Choose request */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class ApproveSelectionAction extends AbstractAction { public void actionPerformed(final ActionEvent e) { fSubPanel.approveSelection(getFileChooser()); @@ -953,6 +956,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Responds to an OpenDirectory request */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class OpenSelectionAction extends AbstractAction { public void actionPerformed(final ActionEvent e) { final int index = fFileList.getSelectedRow(); @@ -966,6 +970,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Responds to a cancel request. */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class CancelSelectionAction extends AbstractAction { public void actionPerformed(final ActionEvent e) { getFileChooser().cancelSelection(); @@ -979,6 +984,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Rescans the files in the current directory */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class UpdateAction extends AbstractAction { public void actionPerformed(final ActionEvent e) { final JFileChooser fc = getFileChooser(); @@ -1004,6 +1010,7 @@ public class AquaFileChooserUI extends FileChooserUI { } // Penultimate superclass is JLabel + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class MacFCTableCellRenderer extends DefaultTableCellRenderer { boolean fIsSelected = false; @@ -1084,6 +1091,7 @@ public class AquaFileChooserUI extends FileChooserUI { } + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class FileRenderer extends MacFCTableCellRenderer { public FileRenderer(final Font f) { super(f); @@ -1100,6 +1108,7 @@ public class AquaFileChooserUI extends FileChooserUI { } } + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class DateRenderer extends MacFCTableCellRenderer { public DateRenderer(final Font f) { super(f); @@ -1134,6 +1143,7 @@ public class AquaFileChooserUI extends FileChooserUI { return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); } + @SuppressWarnings("serial") // anonymous class protected ListCellRenderer createDirectoryComboBoxRenderer(final JFileChooser fc) { return new AquaComboBoxRendererInternal(directoryComboBox) { public Component getListCellRendererComponent(final JList list, final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) { @@ -1162,6 +1172,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Data model for a type-face selection combo-box. */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class DirectoryComboBoxModel extends AbstractListModel implements ComboBoxModel { Vector fDirectories = new Vector(); int topIndex = -1; @@ -1245,6 +1256,7 @@ public class AquaFileChooserUI extends FileChooserUI { // // Renderer for Types ComboBox // + @SuppressWarnings("serial") // anonymous class protected ListCellRenderer createFilterComboBoxRenderer() { return new AquaComboBoxRendererInternal(filterComboBox) { public Component getListCellRendererComponent(final JList list, final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) { @@ -1266,6 +1278,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Data model for a type-face selection combo-box. */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class FilterComboBoxModel extends AbstractListModel implements ComboBoxModel, PropertyChangeListener { protected FileFilter[] filters; @@ -1336,6 +1349,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Acts when FilterComboBox has changed the selected item. */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class FilterComboBoxAction extends AbstractAction { protected FilterComboBoxAction() { super("FilterComboBoxAction"); @@ -1349,6 +1363,7 @@ public class AquaFileChooserUI extends FileChooserUI { /** * Acts when DirectoryComboBox has changed the selected item. */ + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class DirectoryComboBoxAction extends AbstractAction { protected DirectoryComboBoxAction() { super("DirectoryComboBoxAction"); @@ -1360,6 +1375,7 @@ public class AquaFileChooserUI extends FileChooserUI { } // Sorting Table operations + @SuppressWarnings("serial") // Superclass is not serializable across versions class JSortingTableHeader extends JTableHeader { public JSortingTableHeader(final TableColumnModel cm) { super(cm); @@ -1396,6 +1412,7 @@ public class AquaFileChooserUI extends FileChooserUI { return label; } + @SuppressWarnings("serial") // Superclass is not serializable across versions class AquaTableCellRenderer extends DefaultTableCellRenderer implements UIResource { public Component getTableCellRendererComponent(final JTable localTable, final Object value, final boolean isSelected, final boolean hasFocus, final int row, final int column) { if (localTable != null) { @@ -1474,6 +1491,7 @@ public class AquaFileChooserUI extends FileChooserUI { tPanel.add(labelArea); // separator line + @SuppressWarnings("serial") // anonymous class final JSeparator sep = new JSeparator(){ public Dimension getPreferredSize() { return new Dimension(((JComponent)getParent()).getWidth(), 3); @@ -1761,6 +1779,7 @@ public class AquaFileChooserUI extends FileChooserUI { return p; } + @SuppressWarnings("serial") // Superclass is not serializable across versions protected class ScrollPaneCornerPanel extends JPanel { final Border border = UIManager.getBorder("TableHeader.cellBorder"); @@ -2225,6 +2244,7 @@ public class AquaFileChooserUI extends FileChooserUI { } // See FileRenderer - documents in Save dialogs draw disabled, so they shouldn't be selected + @SuppressWarnings("serial") // Superclass is not serializable across versions class MacListSelectionModel extends DefaultListSelectionModel { AquaFileSystemModel fModel; @@ -2315,6 +2335,7 @@ public class AquaFileChooserUI extends FileChooserUI { // Convenience, to translate from the JList directory view to the Mac-style JTable // & minimize diffs between this and BasicFileChooserUI + @SuppressWarnings("serial") // Superclass is not serializable across versions class JTableExtension extends JTable { public void setSelectedIndex(final int index) { getSelectionModel().setSelectionInterval(index, index); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFileSystemModel.java b/jdk/src/macosx/classes/com/apple/laf/AquaFileSystemModel.java index 31c249349ea..37e627e8338 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaFileSystemModel.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaFileSystemModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 javax.swing.table.AbstractTableModel; * * Some of it came from BasicDirectoryModel */ +@SuppressWarnings("serial") // Superclass is not serializable across versions class AquaFileSystemModel extends AbstractTableModel implements PropertyChangeListener { private final JTable fFileList; private LoadFilesThread loadThread = null; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFileView.java b/jdk/src/macosx/classes/com/apple/laf/AquaFileView.java index dccd9bc93e7..b69d2d09e7c 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaFileView.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaFileView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 javax.swing.filechooser.FileView; import com.apple.laf.AquaUtils.RecyclableSingleton; +@SuppressWarnings("serial") // JDK implementation class class AquaFileView extends FileView { private static final boolean DEBUG = false; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFonts.java b/jdk/src/macosx/classes/com/apple/laf/AquaFonts.java index 79f032ae94d..1e9c778695b 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaFonts.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaFonts.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 javax.swing.plaf.*; import com.apple.laf.AquaUtils.RecyclableSingleton; +@SuppressWarnings("serial") // JDK implementation class public class AquaFonts { private static final String MAC_DEFAULT_FONT_NAME = "Lucida Grande"; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java b/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java index 5451abd5dcd..10a0480f7d2 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -248,6 +248,7 @@ public class AquaImageFactory { } } + @SuppressWarnings("serial") // Superclass is not serializable across versions static class InvertableImageIcon extends ImageIcon implements InvertableIcon, UIResource { Icon invertedImage; public InvertableImageIcon(final Image image) { @@ -480,6 +481,7 @@ public class AquaImageFactory { // when we use SystemColors, we need to proxy the color with something that implements UIResource, // so that it will be uninstalled when the look and feel is changed. + @SuppressWarnings("serial") // JDK implementation class private static class SystemColorProxy extends Color implements UIResource { final Color color; public SystemColorProxy(final Color color) { diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java index 80ba1bbf332..e144100ce0f 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -167,6 +167,7 @@ public class AquaInternalFrameDockIconUI extends DesktopIconUI implements MouseL fFrame.putClientProperty(CACHED_FRAME_ICON_KEY, null); } + @SuppressWarnings("serial") // Superclass is not serializable across versions class ScaledImageLabel extends JLabel { ScaledImageLabel() { super(null, null, CENTER); @@ -226,6 +227,7 @@ public class AquaInternalFrameDockIconUI extends DesktopIconUI implements MouseL } } + @SuppressWarnings("serial") // Superclass is not serializable across versions class DockLabel extends JLabel { final static int NUB_HEIGHT = 7; final static int ROUND_ADDITIONAL_HEIGHT = 8; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameManager.java b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameManager.java index a229b19d0d2..49a9a19d201 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameManager.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -53,6 +53,7 @@ import javax.swing.*; * * @see com.sun.java.swing.plaf.windows.WindowsDesktopManager */ +@SuppressWarnings("serial") // JDK implementation class public class AquaInternalFrameManager extends DefaultDesktopManager { // Variables diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java index c21575db86a..1534d6d80c7 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -116,6 +116,7 @@ public class AquaInternalFramePaneUI extends BasicDesktopPaneUI implements Mouse } } + @SuppressWarnings("serial") // Superclass is not serializable across versions class Dock extends JComponent implements Border { static final int DOCK_EDGE_SLACK = 8; @@ -185,6 +186,7 @@ public class AquaInternalFramePaneUI extends BasicDesktopPaneUI implements Mouse } } + @SuppressWarnings("serial") // JDK implementation class class AquaDockingDesktopManager extends AquaInternalFrameManager { public void openFrame(final JInternalFrame f) { final JInternalFrame.JDesktopIcon desktopIcon = f.getDesktopIcon(); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java index dd0267ce3fc..076b2dec952 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -753,6 +753,7 @@ public class AquaInternalFrameUI extends BasicInternalFrameUI implements SwingCo } }; + @SuppressWarnings("serial") // Superclass is not serializable across versions static class CompoundUIBorder extends CompoundBorder implements UIResource { public CompoundUIBorder(final Border inside, final Border outside) { super(inside, outside); } } @@ -796,6 +797,7 @@ public class AquaInternalFrameUI extends BasicInternalFrameUI implements SwingCo } }; + @SuppressWarnings("serial") // Superclass is not serializable across versions class ResizeBox extends JLabel implements MouseListener, MouseMotionListener, MouseWheelListener, ComponentListener, PropertyChangeListener, UIResource { final JLayeredPane layeredPane; Dimension originalSize; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java b/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java index 98048262b80..1b83b300027 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -528,6 +528,7 @@ public class AquaKeyBindings { } // extracted and adapted from DefaultEditorKit in 1.6 + @SuppressWarnings("serial") // Superclass is not serializable across versions static abstract class DeleteWordAction extends TextAction { public DeleteWordAction(final String name) { super(name); } @@ -565,6 +566,7 @@ public class AquaKeyBindings { final TextAction pageUpMultilineAction = new AquaMultilineAction(pageUpMultiline, DefaultEditorKit.pageUpAction, DefaultEditorKit.beginAction); final TextAction pageDownMultilineAction = new AquaMultilineAction(pageDownMultiline, DefaultEditorKit.pageDownAction, DefaultEditorKit.endAction); + @SuppressWarnings("serial") // Superclass is not serializable across versions static class AquaMultilineAction extends TextAction { final String targetActionName; final String proxyActionName; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaListUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaListUI.java index 91636ca190d..85d06468912 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaListUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaListUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ public class AquaListUI extends BasicListUI { list.getActionMap().put("aquaEnd", new AquaHomeEndAction(false)); } + @SuppressWarnings("serial") // Superclass is not serializable across versions static class AquaHomeEndAction extends AbstractAction { private boolean fHomeAction = false; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java b/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java index acc8f0d689d..8c0d06cfa79 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java @@ -38,6 +38,7 @@ import static javax.swing.UIDefaults.LazyValue; import sun.swing.*; import apple.laf.*; +@SuppressWarnings("serial") // Superclass is not serializable across versions public class AquaLookAndFeel extends BasicLookAndFeel { static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar' static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar' diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaNativeResources.java b/jdk/src/macosx/classes/com/apple/laf/AquaNativeResources.java index e0e7c41db70..b43f8965cf2 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaNativeResources.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaNativeResources.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ public class AquaNativeResources { } // TODO: removing CColorPaint for now + @SuppressWarnings("serial") // JDK implementation class static class CColorPaintUIResource extends Color/*CColorPaint*/ implements UIResource { // The color passed to this MUST be a retained NSColor, and the CColorPaintUIResource // takes ownership of that retain. diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaSpinnerUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaSpinnerUI.java index f7bfd926f9b..1f9cc03dadc 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaSpinnerUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaSpinnerUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -188,6 +188,7 @@ public class AquaSpinnerUI extends SpinnerUI { return spinner.getEditor().getBaselineResizeBehavior(); } + @SuppressWarnings("serial") // Superclass is not serializable across versions class TransparentButton extends JButton implements SwingConstants { boolean interceptRepaints = false; @@ -293,6 +294,7 @@ public class AquaSpinnerUI extends SpinnerUI { return map; } + @SuppressWarnings("serial") // Superclass is not serializable across versions private static class ArrowButtonHandler extends AbstractAction implements MouseListener { final javax.swing.Timer autoRepeatTimer; final boolean isNext; @@ -461,6 +463,7 @@ public class AquaSpinnerUI extends SpinnerUI { } } + @SuppressWarnings("serial") // Superclass is not serializable across versions class SpinPainter extends JComponent { final AquaPainter painter = AquaPainter.create(JRSUIStateFactory.getSpinnerArrows()); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java index 81b4c5bbe48..6f7580496d2 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 com.apple.laf.AquaUtils.LazyKeyedSingleton; import com.apple.laf.AquaUtils.RecyclableSingleton; import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor; +@SuppressWarnings("serial") // Superclass is not serializable across versions public class AquaSplitPaneDividerUI extends BasicSplitPaneDivider { final AquaPainter painter = AquaPainter.create(JRSUIStateFactory.getSplitPaneDivider()); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java index 4bd2570e91f..dd65433283f 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -3237,6 +3237,7 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing } + @SuppressWarnings("serial") // Superclass is not serializable across versions private class ScrollableTabViewport extends JViewport implements UIResource { public ScrollableTabViewport() { super(); @@ -3251,6 +3252,7 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing } } + @SuppressWarnings("serial") // Superclass is not serializable across versions private class ScrollableTabPanel extends JPanel implements UIResource { public ScrollableTabPanel() { super(null); @@ -3281,6 +3283,7 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing } } + @SuppressWarnings("serial") // Superclass is not serializable across versions private class ScrollableTabButton extends javax.swing.plaf.basic.BasicArrowButton implements UIResource, SwingConstants { public ScrollableTabButton(final int direction) { super(direction, UIManager.getColor("TabbedPane.selected"), UIManager.getColor("TabbedPane.shadow"), UIManager.getColor("TabbedPane.darkShadow"), UIManager.getColor("TabbedPane.highlight")); @@ -3585,6 +3588,7 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing return htmlViews; } + @SuppressWarnings("serial") // Superclass is not serializable across versions private class TabContainer extends JPanel implements UIResource { private boolean notifyTabbedPane = true; @@ -3629,6 +3633,7 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing } } + @SuppressWarnings("serial") // Superclass is not serializable across versions private class CroppedEdge extends JPanel implements UIResource { private Shape shape; private int tabIndex; @@ -3708,6 +3713,7 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing * @version 1.6, 11/17/05 * @author Scott Violet */ + @SuppressWarnings("serial") // Superclass is not serializable across versions static class LazyActionMap extends ActionMapUIResource { /** * Object to invoke loadActionMap on. This may be diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java index 5c3ce82378d..41b9dd906a6 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -987,7 +987,8 @@ public class AquaTabbedPaneUI extends AquaTabbedPaneCopyFromBasicUI { if (component == null) { menuItem = new JMenuItem(tabPane.getTitleAt(i), tabPane.getIconAt(i)); } else { - menuItem = new JMenuItem() { + @SuppressWarnings("serial") // anonymous class + JMenuItem tmp = new JMenuItem() { public void paintComponent(final Graphics g) { super.paintComponent(g); final Dimension size = component.getSize(); @@ -1001,6 +1002,7 @@ public class AquaTabbedPaneUI extends AquaTabbedPaneCopyFromBasicUI { return component.getPreferredSize(); } }; + menuItem = tmp; } final Color background = tabPane.getBackgroundAt(i); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java b/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java index d103065cb54..17f412b8d42 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ import apple.laf.JRSUIConstants.*; import com.apple.laf.AquaUtils.RecyclableSingleton; +@SuppressWarnings("serial") // Superclass is not serializable across versions public class AquaTableHeaderBorder extends AbstractBorder { protected static final int SORT_NONE = 0; protected static final int SORT_ASCENDING = 1; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderUI.java index 656a89cff1a..5d847e98ef2 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -111,6 +111,7 @@ public class AquaTableHeaderUI extends BasicTableHeaderUI { tableColumn.setHeaderRenderer(renderer); } + @SuppressWarnings("serial") // Superclass is not serializable across versions class AquaTableCellRenderer extends DefaultTableCellRenderer implements UIResource { public Component getTableCellRendererComponent(final JTable localTable, final Object value, final boolean isSelected, final boolean hasFocus, final int row, final int column) { if (localTable != null) { diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTextFieldSearch.java b/jdk/src/macosx/classes/com/apple/laf/AquaTextFieldSearch.java index b6492a31fcc..4117d895f6e 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaTextFieldSearch.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaTextFieldSearch.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -249,6 +249,7 @@ public class AquaTextFieldSearch { label.setText(promptText); } + @SuppressWarnings("serial") // anonymous class inside protected static JButton getCancelButton(final JTextComponent c) { final JButton b = createButton(c, getCancelIcon()); b.setName("cancel"); @@ -325,6 +326,7 @@ public class AquaTextFieldSearch { } protected boolean doingLayout; + @SuppressWarnings("serial") // anonymous class inside protected LayoutManager getCustomLayout() { // unfortunately, the default behavior of BorderLayout, which accommodates for margins // is not what we want, so we "turn off margins" for layout for layout out our buttons diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaToolBarUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaToolBarUI.java index 21fd8ab8bca..05773dd6429 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaToolBarUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaToolBarUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -55,6 +55,7 @@ public class AquaToolBarUI extends BasicToolBarUI implements SwingConstants { } /* ToolBarBorder and drag-off handle, based loosly on MetalBumps */ + @SuppressWarnings("serial") // Superclass is not serializable across versions static class ToolBarBorder extends AbstractBorder implements UIResource, javax.swing.SwingConstants { protected void fillHandle(final Graphics g, final int x1, final int y1, final int x2, final int y2, final boolean horizontal) { g.setColor(UIManager.getColor("ToolBar.borderHandleColor")); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTreeUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaTreeUI.java index 4ebbbed819e..1b73f2a987a 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaTreeUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaTreeUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -493,6 +493,7 @@ public class AquaTreeUI extends BasicTreeUI { tree.getActionMap().put("aquaFullyCollapseNode", new KeyboardExpandCollapseAction(false, true)); } + @SuppressWarnings("serial") // Superclass is not serializable across versions class KeyboardExpandCollapseAction extends AbstractAction { /** * Determines direction to traverse, 1 means expand, -1 means collapse. diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java b/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java index 87393408487..a692ae1794b 100644 --- a/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java +++ b/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ import sun.awt.SunToolkit; import sun.lwawt.LWToolkit; import sun.lwawt.macosx.*; +@SuppressWarnings("serial") // JDK implementation class final class ScreenMenu extends Menu implements ContainerListener, ComponentListener, ScreenMenuPropertyHandler { diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuBar.java b/jdk/src/macosx/classes/com/apple/laf/ScreenMenuBar.java index 94fea5f09a4..1735b444ea5 100644 --- a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuBar.java +++ b/jdk/src/macosx/classes/com/apple/laf/ScreenMenuBar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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.util.*; import javax.swing.*; +@SuppressWarnings("serial") // JDK implementation class public class ScreenMenuBar extends MenuBar implements ContainerListener, ScreenMenuPropertyHandler, ComponentListener { static boolean sJMenuBarHasHelpMenus = false; //$ could check by calling getHelpMenu in a try block diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItem.java b/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItem.java index c403b8b3c28..47be00d1504 100644 --- a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItem.java +++ b/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 javax.swing.plaf.ComponentUI; import sun.lwawt.macosx.CMenuItem; +@SuppressWarnings("serial") // JDK implementation class final class ScreenMenuItem extends MenuItem implements ActionListener, ComponentListener, ScreenMenuPropertyHandler { ScreenMenuPropertyListener fListener; JMenuItem fMenuItem; diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java b/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java index 92b6afe7245..a0483581ca2 100644 --- a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java +++ b/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ import com.apple.laf.AquaMenuItemUI.IndeterminateListener; import sun.lwawt.macosx.*; +@SuppressWarnings("serial") // JDK implementation class final class ScreenMenuItemCheckbox extends CheckboxMenuItem implements ActionListener, ComponentListener, ScreenMenuPropertyHandler, ItemListener { JMenuItem fMenuItem; MenuContainer fParent; diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java index 8e0ded6b3eb..3312f6e4213 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 sun.lwawt.macosx; import java.awt.*; import java.awt.image.BufferedImage; +@SuppressWarnings("serial") // JDK implementation class public class CCustomCursor extends Cursor { static Dimension sMaxCursorSize; static Dimension getMaxCursorSize() { diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java index 7aab0b58fa7..dd718c0ca0b 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java @@ -33,6 +33,7 @@ import java.awt.Toolkit; import sun.awt.EmbeddedFrame; import sun.lwawt.LWWindowPeer; +@SuppressWarnings("serial") // JDK implementation class public class CEmbeddedFrame extends EmbeddedFrame { private CPlatformResponder responder; diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java index 170e93d2ffe..b2d2015d191 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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,7 +32,7 @@ import java.awt.event.*; import sun.awt.dnd.SunDragSourceContextPeer; - +@SuppressWarnings("serial") // JDK implementation class class CMouseDragGestureRecognizer extends MouseDragGestureRecognizer { // Number of pixels before drag is determined to have started: diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java index f877e42925c..4a75ddae9c0 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 sun.lwawt.macosx; import java.awt.*; +@SuppressWarnings("serial") // JDK implementation class public abstract class CPrinterDialog extends Dialog { private final CPrinterJob fPrinterJob; // used from native diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java index 55da5684521..562f0524f91 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java @@ -29,6 +29,7 @@ package sun.lwawt.macosx; import java.awt.*; import java.awt.print.*; +@SuppressWarnings("serial") // JDK implementation class final class CPrinterJobDialog extends CPrinterDialog { private Pageable fPageable; private boolean fAllowPrintToFile; diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java index 95b8e58985a..3880e51e2bd 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java @@ -29,6 +29,7 @@ package sun.lwawt.macosx; import java.awt.*; import java.awt.print.*; +@SuppressWarnings("serial") // JDK implementation class final class CPrinterPageDialog extends CPrinterDialog { private PageFormat fPage; private Printable fPainter; diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java index 0d12aa1ca67..f2dfa7d44be 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java @@ -37,6 +37,7 @@ import sun.lwawt.LWWindowPeer; * The CViewEmbeddedFrame class is used in the SWT_AWT bridge. * This is a part of public API and should not be renamed or moved */ +@SuppressWarnings("serial") // JDK implementation class public class CViewEmbeddedFrame extends EmbeddedFrame { private final long nsViewPtr; diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java index fc587f298dc..0f0cc766c50 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -51,6 +51,7 @@ import sun.awt.image.MultiResolutionImage; import sun.util.CoreResourceBundleControl; +@SuppressWarnings("serial") // JDK implementation class final class NamedCursor extends Cursor { NamedCursor(String name) { super(name); @@ -141,6 +142,7 @@ public final class LWCToolkit extends LWToolkit { loadNativeColors(systemColors, appleColors); } + @SuppressWarnings("serial") // JDK implementation class private static class AppleSpecificColor extends Color { private final int index; AppleSpecificColor(int index) { diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java b/jdk/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java index 56988646c01..16bada2688c 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ package sun.lwawt.macosx; import java.io.*; import javax.print.attribute.*; +@SuppressWarnings("serial") // JDK implementation class public final class NSPrintInfo implements PrintJobAttribute, PrintRequestAttribute, Serializable, Cloneable { private long fNSPrintInfo;