changeset 9611:9e9917236cef

8037139: Fix serial lint warnings in sun.print Reviewed-by: prr
author darcy
date Thu, 13 Mar 2014 12:48:11 -0700
parents a0da4ed5d7d1
children 85230dfee7b4
files src/share/classes/sun/print/DialogOwner.java src/share/classes/sun/print/PrintJobAttributeException.java src/share/classes/sun/print/PrintJobFlavorException.java src/share/classes/sun/print/ServiceDialog.java src/share/classes/sun/print/SunMinMaxPage.java src/share/classes/sun/print/SunPageSelection.java src/solaris/classes/sun/print/IPPPrintService.java src/windows/classes/sun/print/Win32MediaTray.java src/windows/classes/sun/print/Win32PrintService.java
diffstat 9 files changed, 33 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/print/DialogOwner.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/share/classes/sun/print/DialogOwner.java	Thu Mar 13 12:48:11 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -37,6 +37,7 @@
  * <P>
  *
  */
+@SuppressWarnings("serial") // JDK-implementation class
 public final class DialogOwner
     implements PrintRequestAttribute {
 
--- a/src/share/classes/sun/print/PrintJobAttributeException.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/share/classes/sun/print/PrintJobAttributeException.java	Thu Mar 13 12:48:11 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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 javax.print.PrintException;
 import javax.print.attribute.Attribute;
 
+@SuppressWarnings("serial") // JDK-implementation class
 class PrintJobAttributeException extends PrintException
     implements AttributeException {
 
--- a/src/share/classes/sun/print/PrintJobFlavorException.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/share/classes/sun/print/PrintJobFlavorException.java	Thu Mar 13 12:48:11 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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,7 +29,7 @@
 import javax.print.FlavorException;
 import javax.print.PrintException;
 
-
+@SuppressWarnings("serial") // JDK implementation class
 class PrintJobFlavorException extends PrintException
     implements FlavorException {
 
--- a/src/share/classes/sun/print/ServiceDialog.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/share/classes/sun/print/ServiceDialog.java	Thu Mar 13 12:48:11 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -81,6 +81,7 @@
  *
  * @author  Chris Campbell
  */
+@SuppressWarnings("serial") // Superclass is not serializable across versions
 public class ServiceDialog extends JDialog implements ActionListener {
 
     /**
@@ -307,6 +308,7 @@
      * Performs Cancel when Esc key is pressed.
      */
     private void handleEscKey(JButton btnCancel) {
+        @SuppressWarnings("serial") // anonymous class
         Action cancelKeyAction = new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 dispose(CANCEL);
@@ -656,6 +658,7 @@
      * The "General" tab.  Includes the controls for PrintService,
      * PageRange, and Copies/Collate.
      */
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class GeneralPanel extends JPanel {
 
         private PrintServicePanel pnlPrintService;
@@ -699,6 +702,7 @@
         }
     }
 
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class PrintServicePanel extends JPanel
         implements ActionListener, ItemListener, PopupMenuListener
     {
@@ -956,6 +960,7 @@
         }
     }
 
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class PrintRangePanel extends JPanel
         implements ActionListener, FocusListener
     {
@@ -1168,6 +1173,7 @@
         }
     }
 
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class CopiesPanel extends JPanel
         implements ActionListener, ChangeListener
     {
@@ -1301,6 +1307,7 @@
      * The "Page Setup" tab.  Includes the controls for MediaSource/MediaTray,
      * OrientationRequested, and Sides.
      */
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class PageSetupPanel extends JPanel {
 
         private MediaPanel pnlMedia;
@@ -1342,6 +1349,7 @@
         }
     }
 
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class MarginsPanel extends JPanel
                                implements ActionListener, FocusListener {
 
@@ -1872,6 +1880,7 @@
         }
     }
 
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class MediaPanel extends JPanel implements ItemListener {
 
         private final String strTitle = getMsg("border.media");
@@ -2106,6 +2115,7 @@
         }
     }
 
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class OrientationPanel extends JPanel
         implements ActionListener
     {
@@ -2264,6 +2274,7 @@
      * The "Appearance" tab.  Includes the controls for Chromaticity,
      * PrintQuality, JobPriority, JobName, and other related job attributes.
      */
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class AppearancePanel extends JPanel {
 
         private ChromaticityPanel pnlChromaticity;
@@ -2310,6 +2321,7 @@
         }
     }
 
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class ChromaticityPanel extends JPanel
         implements ActionListener
     {
@@ -2400,6 +2412,7 @@
         }
     }
 
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class QualityPanel extends JPanel
         implements ActionListener
     {
@@ -2501,6 +2514,8 @@
 
 
     }
+
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class SidesPanel extends JPanel
         implements ActionListener
     {
@@ -2603,7 +2618,7 @@
     }
 
 
-
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class JobAttributesPanel extends JPanel
         implements ActionListener, ChangeListener, FocusListener
     {
@@ -2791,6 +2806,7 @@
      * A special widget that groups a JRadioButton with an associated icon,
      * placed to the left of the radio button.
      */
+    @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class IconRadioButton extends JPanel {
 
         private JRadioButton rb;
@@ -2843,6 +2859,7 @@
      * chooser will pop up a "Do you want to overwrite..." dialog if the
      * user selects a file that already exists.
      */
+    @SuppressWarnings("serial") // JDK implementation class
     private class ValidatingFileChooser extends JFileChooser {
         public void approveSelection() {
             File selected = getSelectedFile();
--- a/src/share/classes/sun/print/SunMinMaxPage.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/share/classes/sun/print/SunMinMaxPage.java	Thu Mar 13 12:48:11 2014 -0700
@@ -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 @@
 /*
  * A class used to determine minimum and maximum pages.
  */
+@SuppressWarnings("serial") // JDK-implementation class
 public final class SunMinMaxPage implements PrintRequestAttribute {
     private int page_max, page_min;
 
--- a/src/share/classes/sun/print/SunPageSelection.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/share/classes/sun/print/SunPageSelection.java	Thu Mar 13 12:48:11 2014 -0700
@@ -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 @@
 /*
  * A class used to determine the range of pages to be printed.
  */
+@SuppressWarnings("serial") // JDK implementation class
 public final class SunPageSelection implements PrintRequestAttribute {
 
     public static final SunPageSelection ALL = new SunPageSelection(0);
--- a/src/solaris/classes/sun/print/IPPPrintService.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/solaris/classes/sun/print/IPPPrintService.java	Thu Mar 13 12:48:11 2014 -0700
@@ -772,6 +772,7 @@
     }
 
     //This class is for getting all pre-defined Finishings
+    @SuppressWarnings("serial") // JDK implementation class
     private class ExtFinishing extends Finishings {
         ExtFinishing(int value) {
             super(100); // 100 to avoid any conflicts with predefined values.
--- a/src/windows/classes/sun/print/Win32MediaTray.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/windows/classes/sun/print/Win32MediaTray.java	Thu Mar 13 12:48:11 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, 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
@@ -34,7 +34,7 @@
  * Windows media trays or bins not covered by MediaTray's standard values.
  * It also implements driver-defined trays.
  **/
-
+@SuppressWarnings("serial") // JDK implementation class
 public class Win32MediaTray extends MediaTray {
 
     static final Win32MediaTray ENVELOPE_MANUAL = new Win32MediaTray(0,
--- a/src/windows/classes/sun/print/Win32PrintService.java	Thu Mar 13 12:40:27 2014 -0700
+++ b/src/windows/classes/sun/print/Win32PrintService.java	Thu Mar 13 12:48:11 2014 -0700
@@ -1720,7 +1720,7 @@
     private native String getPrinterPort(String printerName);
 }
 
-
+@SuppressWarnings("serial") // JDK implementation class
 class Win32MediaSize extends MediaSizeName {
     private static ArrayList winStringTable = new ArrayList();
     private static ArrayList winEnumTable = new ArrayList();