svn commit: r447216 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print: Book.java PageFormat.java Paper.java PrinterIOException.java

[nd...@apache.org]

Author: ndbeyer
Date: Sun Sep 17 20:36:55 2006
New Revision: 447216

URL: http://svn.apache.org/viewvc?view=rev&rev=447216
Log:
Correct serialized field for PrinterIOException; cleanup compiler warnings

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Book.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PageFormat.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Paper.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterIOException.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Book.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Book.java?view=diff&rev=447216&r1=447215&r2=447216
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Book.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Book.java Sun Sep 17 20:36:55 2006
@@ -23,7 +23,7 @@
 
 public class Book implements Pageable {
 
-    private Vector bookPages;
+    private Vector<innerPage> bookPages;
 
     // innerPage -  class to describe inner structure of Book
     private class innerPage {
@@ -54,7 +54,7 @@
     }
 
     public Book() {
-        bookPages = new Vector();
+        bookPages = new Vector<innerPage>();
     }
 
     public void append(Printable painter, PageFormat page) {
@@ -82,7 +82,7 @@
             throw new IndexOutOfBoundsException(
                     "pageIndex is more than book size");
         }
-        return ((innerPage) bookPages.elementAt(pageIndex)).getPageFormat();
+        return bookPages.elementAt(pageIndex).getPageFormat();
     }
 
     public Printable getPrintable(int pageIndex)
@@ -92,7 +92,7 @@
             throw new IndexOutOfBoundsException(
                     "pageIndex is more than book size");
         }
-        return ((innerPage) bookPages.elementAt(pageIndex)).getPrintable();
+        return bookPages.elementAt(pageIndex).getPrintable();
     }
 
     public void setPage(int pageIndex, Printable painter, PageFormat page)

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PageFormat.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PageFormat.java?view=diff&rev=447216&r1=447215&r2=447216
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PageFormat.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PageFormat.java Sun Sep 17 20:36:55 2006
@@ -33,6 +33,7 @@
         pagePaper= new Paper();
     }
 
+    @Override
     public Object clone(){
         PageFormat clonedPage;
         try {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Paper.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Paper.java?view=diff&rev=447216&r1=447215&r2=447216
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Paper.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Paper.java Sun Sep 17 20:36:55 2006
@@ -40,6 +40,7 @@
                                     paperWidth - INCH2, paperHeight - INCH2);
     }
 
+    @Override
     public Object clone(){
         Paper clonedPaper;
         try {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterIOException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterIOException.java?view=diff&rev=447216&r1=447215&r2=447216
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterIOException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterIOException.java Sun Sep 17 20:36:55 2006
@@ -25,18 +25,19 @@
 
     private static final long serialVersionUID = 5850870712125932846L;
 
-    private IOException printerIOException;
+    private IOException mException;
 
     public PrinterIOException(IOException exception) {
         initCause(null);
-        printerIOException = exception;
+        mException = exception;
     }
 
+    @Override
     public Throwable getCause() {
-        return printerIOException;
+        return mException;
     }
 
     public IOException getIOException() {
-        return printerIOException;
+        return mException;
     }
 }