--- old/src/share/classes/sun/print/RasterPrinterJob.java	2014-06-08 21:27:57.000000000 -0700
+++ new/src/share/classes/sun/print/RasterPrinterJob.java	2014-06-08 21:27:57.000000000 -0700
@@ -273,7 +273,7 @@
     /**
      * List of areas & the graphics state for redrawing
      */
-    private ArrayList redrawList = new ArrayList();
+    private ArrayList<GraphicsState> redrawList = new ArrayList<>();
 
 
     /* variables representing values extracted from an attribute set.
@@ -712,10 +712,9 @@
           GraphicsEnvironment.getLocalGraphicsEnvironment().
           getDefaultScreenDevice().getDefaultConfiguration();
 
-        PrintService service =
-            (PrintService)java.security.AccessController.doPrivileged(
-                                        new java.security.PrivilegedAction() {
-                public Object run() {
+        PrintService service = java.security.AccessController.doPrivileged(
+                               new java.security.PrivilegedAction<PrintService>() {
+                public PrintService run() {
                     PrintService service = getPrintService();
                     if (service == null) {
                         ServiceDialog.showNoPrintService(gc);
@@ -768,10 +767,9 @@
         int x = bounds.x+bounds.width/3;
         int y = bounds.y+bounds.height/3;
 
-        PrintService service =
-            (PrintService)java.security.AccessController.doPrivileged(
-                                        new java.security.PrivilegedAction() {
-                public Object run() {
+        PrintService service = java.security.AccessController.doPrivileged(
+                               new java.security.PrivilegedAction<PrintService>() {
+                public PrintService run() {
                     PrintService service = getPrintService();
                     if (service == null) {
                         ServiceDialog.showNoPrintService(gc);
@@ -793,7 +791,7 @@
         if (pageDialog.getStatus() == ServiceDialog.APPROVE) {
             PrintRequestAttributeSet newas =
                 pageDialog.getAttributes();
-            Class amCategory = SunAlternateMedia.class;
+            Class<?> amCategory = SunAlternateMedia.class;
 
             if (attributes.containsKey(amCategory) &&
                 !newas.containsKey(amCategory)) {
@@ -868,10 +866,9 @@
             GraphicsEnvironment.getLocalGraphicsEnvironment().
             getDefaultScreenDevice().getDefaultConfiguration();
 
-        PrintService service =
-            (PrintService)java.security.AccessController.doPrivileged(
-                       new java.security.PrivilegedAction() {
-                public Object run() {
+        PrintService service = java.security.AccessController.doPrivileged(
+                               new java.security.PrivilegedAction<PrintService>() {
+                public PrintService run() {
                     PrintService service = getPrintService();
                     if (service == null) {
                         ServiceDialog.showNoPrintService(gc);
@@ -894,10 +891,9 @@
                 services[i] = spsFactories[i].getPrintService(null);
             }
         } else {
-            services =
-            (PrintService[])java.security.AccessController.doPrivileged(
-                       new java.security.PrivilegedAction() {
-                public Object run() {
+            services = java.security.AccessController.doPrivileged(
+                       new java.security.PrivilegedAction<PrintService[]>() {
+                public PrintService[] run() {
                     PrintService[] services = PrinterJob.lookupPrintServices();
                     return services;
                 }
@@ -2131,7 +2127,7 @@
                 painter.print(pathGraphics, origPage, pageIndex);
 
                 for (int i=0;i<redrawList.size();i++) {
-                   GraphicsState gstate = (GraphicsState)redrawList.get(i);
+                   GraphicsState gstate = redrawList.get(i);
                    pathGraphics.setTransform(initialTx);
                    ((PathGraphics)pathGraphics).redrawRegion(
                                                          gstate.region,