From 7c9de3ea76f5b2d67414ffd6a3928513deb8da23 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Thu, 13 Mar 2014 12:40:27 -0700 Subject: [PATCH] 8033712: Fix more serial lint warnings in sun.awt Reviewed-by: alanb, serb, prr --- jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java | 3 +++ jdk/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java | 3 ++- .../solaris/classes/sun/awt/X11/XCreateWindowParams.java | 3 ++- jdk/src/solaris/classes/sun/awt/X11/XCustomCursor.java | 3 ++- jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java | 1 + jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java | 3 ++- jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java | 3 ++- jdk/src/solaris/classes/sun/awt/X11/XException.java | 3 ++- jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java | 6 ++++-- jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java | 8 ++++++-- jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java | 3 ++- jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java | 5 ++++- jdk/src/solaris/classes/sun/awt/X11CustomCursor.java | 3 ++- .../windows/classes/sun/awt/shell/Win32ShellFolder2.java | 4 ++-- .../windows/classes/sun/awt/windows/WCustomCursor.java | 1 + .../windows/classes/sun/awt/windows/WEmbeddedFrame.java | 1 + jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java | 1 + jdk/src/windows/classes/sun/awt/windows/WPageDialog.java | 1 + jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java | 1 + jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java | 1 + .../windows/classes/sun/awt/windows/WScrollPanePeer.java | 3 ++- 21 files changed, 44 insertions(+), 16 deletions(-) diff --git a/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java b/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java index 48a5b946c81..334d1d1c036 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java +++ b/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java @@ -39,6 +39,7 @@ import java.lang.reflect.InvocationTargetException; /** * An utility window class. This is a base class for Tooltip and Balloon. */ +@SuppressWarnings("serial") // JDK-implementation class public abstract class InfoWindow extends Window { private Container container; private Closer closer; @@ -146,6 +147,7 @@ public abstract class InfoWindow extends Window { Rectangle getBounds(); } + @SuppressWarnings("serial") // JDK-implementation class public static class Tooltip extends InfoWindow { public interface LiveArguments extends InfoWindow.LiveArguments { @@ -239,6 +241,7 @@ public abstract class InfoWindow extends Window { } } + @SuppressWarnings("serial") // JDK-implementation class public static class Balloon extends InfoWindow { public interface LiveArguments extends InfoWindow.LiveArguments { diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java b/jdk/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java index cf6c3345041..a258e8288dd 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -38,6 +38,7 @@ import javax.swing.plaf.basic.BasicBorders; import com.sun.java.swing.plaf.motif.*; import sun.awt.X11.XComponentPeer; +@SuppressWarnings("serial") // JDK-implementation class class XAWTLookAndFeel extends MotifLookAndFeel { /** diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java b/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java index d61a59a81c0..32d83f193ce 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +@SuppressWarnings("serial") // JDK-implementation class public class XCreateWindowParams extends HashMap { public XCreateWindowParams() { } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCustomCursor.java b/jdk/src/solaris/classes/sun/awt/X11/XCustomCursor.java index 0135e259c48..33ddd383f8b 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XCustomCursor.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XCustomCursor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 java.awt.*; * @author Thomas Ball * @author Bino George */ +@SuppressWarnings("serial") // JDK-implementation class public class XCustomCursor extends X11CustomCursor { public XCustomCursor(Image cursor, Point hotSpot, String name) diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java index cdce154834e..9370b8cdae4 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java @@ -688,6 +688,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } } + @SuppressWarnings("serial") // JDK-implementation class private static class XEmbedDropTarget extends DropTarget { public void addDropTargetListener(DropTargetListener dtl) throws TooManyListenersException { diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java b/jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java index bca7cf0db68..def4eecf9cd 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ import java.awt.Component; import java.awt.Toolkit; import sun.awt.AWTAccessor; +@SuppressWarnings("serial") // JDK-implementation class public class XEmbedChildProxy extends Component { long handle; XEmbeddingContainer container; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java index 4e968977d44..132375098d7 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 java.awt.*; import java.awt.AWTKeyStroke; import java.util.logging.Logger; +@SuppressWarnings("serial") // JDK-implementation class public class XEmbeddedFrame extends EmbeddedFrame { private static final Logger log = Logger.getLogger(XEmbeddedFrame.class.getName()); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XException.java b/jdk/src/solaris/classes/sun/awt/X11/XException.java index 1ec83e99961..732c94b5abe 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XException.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ package sun.awt.X11; * * @since 1.5 */ +@SuppressWarnings("serial") // JDK-implementation class public class XException extends RuntimeException { public XException() { super(); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java index 5da53e88634..b3d0731d5f0 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java @@ -199,12 +199,13 @@ class XFileDialogPeer extends XDialogPeer implements FileDialogPeer, ActionListe // After showing we should display 'user.dir' as current directory // if user didn't set directory programatically pathField = new TextField(savedDir != null ? savedDir : userDir); - - pathChoice = new Choice() { + @SuppressWarnings("serial") // Anonymous class + Choice tmp = new Choice() { public Dimension getPreferredSize() { return new Dimension(PATH_CHOICE_WIDTH, pathField.getPreferredSize().height); } }; + pathChoice = tmp; pathPanel = new Panel(); pathPanel.setLayout(new BorderLayout()); @@ -845,6 +846,7 @@ class XFileDialogPeer extends XDialogPeer implements FileDialogPeer, ActionListe } } +@SuppressWarnings("serial") // JDK-implementation class class Separator extends Canvas { public final static int HORIZONTAL = 0; public final static int VERTICAL = 1; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java index f4bf1ec2062..9f0a717e5e4 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java @@ -63,7 +63,6 @@ import sun.awt.CausedFocusEvent; import sun.awt.AWTAccessor; import sun.awt.SunToolkit; - final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { private final AWTTextPane textPane; @@ -615,7 +614,7 @@ final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { } } - + @SuppressWarnings("serial") // JDK-implementation class static final class XAWTCaret extends DefaultCaret { @Override public void focusGained(FocusEvent e) { @@ -647,6 +646,7 @@ final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { } } + @SuppressWarnings("serial") // JDK-implementation class final class XAWTScrollBarButton extends BasicArrowButton { private UIDefaults uidefaults = XToolkit.getUIDefaults(); @@ -907,6 +907,7 @@ final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { } } + @SuppressWarnings("serial") // JDK-implementation class final class AWTTextArea extends JTextArea implements DocumentListener { private boolean isFocused = false; @@ -1105,6 +1106,7 @@ final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { } } + @SuppressWarnings("serial") // JDK-implementation class private class AWTTextPane extends JScrollPane implements FocusListener { private final JTextArea jtext; @@ -1190,6 +1192,7 @@ final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { return xwin.getGraphics(); } + @SuppressWarnings("serial") // JDK-implementation class final class XAWTScrollBar extends ScrollBar { XAWTScrollBar(int i) { @@ -1205,6 +1208,7 @@ final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { } } + @SuppressWarnings("serial") // JDK-implementation class static class BevelBorder extends AbstractBorder implements UIResource { private Color darkShadow = SystemColor.controlDkShadow; private Color lightShadow = SystemColor.controlLtHighlight; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java index 3db7ed4ef9d..aeee2a022a4 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -541,6 +541,7 @@ final class XTextFieldPeer extends XComponentPeer implements TextFieldPeer { } } + @SuppressWarnings("serial") // JDK-implementation class final class XAWTTextField extends JPasswordField implements ActionListener, DocumentListener { diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java index e2da468f440..86e6e064fc0 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -501,6 +501,7 @@ public class XTrayIconPeer implements TrayIconPeer, // Special embedded frame for tray icon // *************************************** + @SuppressWarnings("serial") // JDK-implementation class private static class XTrayIconEmbeddedFrame extends XEmbeddedFrame { public XTrayIconEmbeddedFrame(){ super(XToolkit.getDefaultRootWindow(), true, true); @@ -527,6 +528,7 @@ public class XTrayIconPeer implements TrayIconPeer, // Classes for painting an image on canvas // *************************************** + @SuppressWarnings("serial") // JDK-implementation class static class TrayIconCanvas extends IconCanvas { TrayIcon target; boolean autosize; @@ -548,6 +550,7 @@ public class XTrayIconPeer implements TrayIconPeer, } } + @SuppressWarnings("serial") // JDK-implementation class public static class IconCanvas extends Canvas { volatile Image image; IconObserver observer; diff --git a/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java b/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java index ed9a804cc60..969e7c5116e 100644 --- a/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java +++ b/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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.image.ImageRepresentation; * @see Component#setCursor * @author Thomas Ball */ +@SuppressWarnings("serial") // JDK-implementation class public abstract class X11CustomCursor extends CustomCursor { public X11CustomCursor(Image cursor, Point hotSpot, String name) diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java index 765a9b4962b..696633917a2 100644 --- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java +++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -68,7 +68,7 @@ import javax.swing.SwingConstants; * @author Leif Samuelsson * @author Kenneth Russell * @since 1.4 */ - +@SuppressWarnings("serial") // JDK-implementation class final class Win32ShellFolder2 extends ShellFolder { private static native void initIDs(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WCustomCursor.java b/jdk/src/windows/classes/sun/awt/windows/WCustomCursor.java index dc5debd4af5..81e77c86ff7 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WCustomCursor.java +++ b/jdk/src/windows/classes/sun/awt/windows/WCustomCursor.java @@ -38,6 +38,7 @@ import sun.awt.image.ToolkitImage; * @see Component#setCursor * @author ThomasBall */ +@SuppressWarnings("serial") // JDK-implementation class final class WCustomCursor extends CustomCursor { WCustomCursor(Image cursor, Point hotSpot, String name) diff --git a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java index 25d45dca90d..bc22003a261 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java +++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java @@ -35,6 +35,7 @@ import sun.security.action.GetPropertyAction; import java.security.PrivilegedAction; import java.security.AccessController; +@SuppressWarnings("serial") // JDK-implementation class public class WEmbeddedFrame extends EmbeddedFrame { static { diff --git a/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java b/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java index b92f3b03b5e..01dae69c91a 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java +++ b/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java @@ -33,6 +33,7 @@ import java.util.Hashtable; * * @author Jim Graham */ +@SuppressWarnings("serial") // JDK-implementation class final class WFontMetrics extends FontMetrics { static { diff --git a/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java b/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java index 16d707bc25c..877e722e1ae 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java +++ b/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java @@ -34,6 +34,7 @@ import java.awt.print.PrinterJob; import java.awt.print.PageFormat; import java.awt.print.Printable; +@SuppressWarnings("serial") // JDK-implementation class final class WPageDialog extends WPrintDialog { static { initIDs(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java b/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java index c3d0295f44f..9f518311876 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java +++ b/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java @@ -32,6 +32,7 @@ import java.awt.print.PrinterJob; import sun.awt.AWTAccessor; +@SuppressWarnings("serial") // JDK-implementation class class WPrintDialog extends Dialog { static { initIDs(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java b/jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java index 5121562ebcc..5adc64854d3 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java +++ b/jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java @@ -2194,6 +2194,7 @@ public final class WPrinterJob extends RasterPrinterJob } +@SuppressWarnings("serial") // JDK-implementation class class PrintToFileErrorDialog extends Dialog implements ActionListener{ public PrintToFileErrorDialog(Frame parent, String title, String message, String buttonText) { diff --git a/jdk/src/windows/classes/sun/awt/windows/WScrollPanePeer.java b/jdk/src/windows/classes/sun/awt/windows/WScrollPanePeer.java index 654c502743d..3914fe80ec9 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WScrollPanePeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WScrollPanePeer.java @@ -1,4 +1,4 @@ -/* +h/* * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -164,6 +164,7 @@ final class WScrollPanePeer extends WPanelPeer implements ScrollPanePeer { * scroll bar thumbs and paint the exposed area in one synchronous * operation. */ + @SuppressWarnings("serial") // JDK-implementation class class ScrollEvent extends PeerEvent { ScrollEvent(Object source, Runnable runnable) { super(source, runnable, 0L);