harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r469773 [3/3] - in /incubator/harmony/enhanced/classlib/trunk/modules/print/src: main/java/common/javax/print/attribute/standard/ main/java/common/org/apache/harmony/x/print/ipp/util/ test/api/java/common/javax/print/attribute/standard/
Date Wed, 01 Nov 2006 03:58:09 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OrientationRequested.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OrientationRequested.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OrientationRequested.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OrientationRequested.java Tue Oct 31 19:58:05 2006
@@ -14,13 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.DocAttribute;
 import javax.print.attribute.EnumSyntax;
 import javax.print.attribute.PrintJobAttribute;
@@ -30,64 +27,48 @@
  * Table values are obtained from RFC2911: Internet Printing Protocol/1.1: 
  * Model and Semantics, section 4.2.10, http://ietf.org/rfc/rfc2911.txt?number=2911
  */
+public final class OrientationRequested extends EnumSyntax implements DocAttribute,
+        PrintJobAttribute, PrintRequestAttribute {
+    private static final long serialVersionUID = -4447437289862822276L;
 
-public final class OrientationRequested extends EnumSyntax 
-    implements DocAttribute, PrintJobAttribute, PrintRequestAttribute {
+    public static final OrientationRequested PORTRAIT = new OrientationRequested(3);
 
+    public static final OrientationRequested LANDSCAPE = new OrientationRequested(4);
 
-    public static final OrientationRequested
-        PORTRAIT = new OrientationRequested(3);
+    public static final OrientationRequested REVERSE_LANDSCAPE = new OrientationRequested(5);
 
-    public static final OrientationRequested 
-        LANDSCAPE = new OrientationRequested(4);
-   
-    public static final OrientationRequested 
-        REVERSE_LANDSCAPE = new OrientationRequested(5);
-
-    public static final OrientationRequested 
-        REVERSE_PORTRAIT  = new OrientationRequested(6);
-
-
-    private static final OrientationRequested[] enumValueTable = {
-
-            PORTRAIT,
-            LANDSCAPE,
-            REVERSE_LANDSCAPE,
-            REVERSE_PORTRAIT
-    };
-    
-    private static final String[] stringTable = { "portrait",
-                                                  "landscape",
-                                                  "reverse-landscape",
-                                                  "reverse-portrait" };
-    
+    public static final OrientationRequested REVERSE_PORTRAIT = new OrientationRequested(6);
+
+    private static final OrientationRequested[] enumValueTable = { PORTRAIT, LANDSCAPE,
+            REVERSE_LANDSCAPE, REVERSE_PORTRAIT };
+
+    private static final String[] stringTable = { "portrait", "landscape", "reverse-landscape",
+            "reverse-portrait" };
 
     protected OrientationRequested(int value) {
         super(value);
     }
-    
-    
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes 
-       Class<? extends Attribute> getCategory() { */
+
+    public final Class<? extends Attribute> getCategory() {
         return OrientationRequested.class;
     }
-    
+
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return enumValueTable;
     }
-    
+
     public final String getName() {
         return "orientation-requested";
     }
-    
+
+    @Override
     protected int getOffset() {
         return 3;
-    } 
-    
+    }
+
+    @Override
     protected String[] getStringTable() {
         return stringTable;
     }
-    
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OutputDeviceAssigned.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OutputDeviceAssigned.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OutputDeviceAssigned.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OutputDeviceAssigned.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.util.Locale;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
-public final class OutputDeviceAssigned extends TextSyntax 
-    implements PrintJobAttribute {
-
+public final class OutputDeviceAssigned extends TextSyntax implements PrintJobAttribute {
+    private static final long serialVersionUID = 5486733778854271081L;
 
     public OutputDeviceAssigned(String deviceName, Locale locale) {
         super(deviceName, locale);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof OutputDeviceAssigned)) {
+        if (!(object instanceof OutputDeviceAssigned)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return OutputDeviceAssigned.class;
     }
 
     public final String getName() {
         return "output-device-assigned";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PDLOverrideSupported.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PDLOverrideSupported.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PDLOverrideSupported.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PDLOverrideSupported.java Tue Oct 31 19:58:05 2006
@@ -14,60 +14,43 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.EnumSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
+public class PDLOverrideSupported extends EnumSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = -4393264467928463934L;
 
-public class PDLOverrideSupported extends EnumSyntax 
-    implements PrintServiceAttribute {
+    public static final PDLOverrideSupported NOT_ATTEMPTED = new PDLOverrideSupported(0);
 
+    public static final PDLOverrideSupported ATTEMPTED = new PDLOverrideSupported(1);
 
-    public static final PDLOverrideSupported
-        NOT_ATTEMPTED = new PDLOverrideSupported(0);
-
-    public static final PDLOverrideSupported
-        ATTEMPTED = new PDLOverrideSupported(1);
-
-
-    private static final PDLOverrideSupported[] enumValueTable = {
-
-            NOT_ATTEMPTED,
-            ATTEMPTED
-    };
-
-    private static final String[] stringTable = { "not-attempted",
-                                                  "attempted" };
+    private static final PDLOverrideSupported[] enumValueTable = { NOT_ATTEMPTED, ATTEMPTED };
 
+    private static final String[] stringTable = { "not-attempted", "attempted" };
 
     protected PDLOverrideSupported(int value) {
         super(value);
     }
 
-
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PDLOverrideSupported.class;
     }
 
-    protected EnumSyntax[]  getEnumValueTable() {
-        return (EnumSyntax[]) enumValueTable.clone();
+    @Override
+    protected EnumSyntax[] getEnumValueTable() {
+        return enumValueTable.clone();
     }
 
     public final String getName() {
         return "pdl-override-supported";
     }
 
+    @Override
     protected String[] getStringTable() {
-        return (String[]) stringTable.clone();
+        return stringTable.clone();
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PageRanges.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PageRanges.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PageRanges.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PageRanges.java Tue Oct 31 19:58:05 2006
@@ -14,38 +14,32 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.DocAttribute;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.SetOfIntegerSyntax;
 
-public final class PageRanges extends SetOfIntegerSyntax 
-    implements DocAttribute, PrintJobAttribute, PrintRequestAttribute {
-
+public final class PageRanges extends SetOfIntegerSyntax implements DocAttribute,
+        PrintJobAttribute, PrintRequestAttribute {
+    private static final long serialVersionUID = 8639895197656148392L;
 
     public PageRanges(int value) {
         super(value);
         if (value < 1) {
-            throw new IllegalArgumentException("Value" + value +
-                                                    "is less than 1");
+            throw new IllegalArgumentException("Value" + value + "is less than 1");
         }
     }
 
     public PageRanges(int lowerBound, int upperBound) {
         super(lowerBound, upperBound);
         if (lowerBound > upperBound) {
-            throw new IllegalArgumentException("Null range: lowerBound " +
-                                                            "> upperBound");
+            throw new IllegalArgumentException("Null range: lowerBound " + "> upperBound");
         } else if (lowerBound < 1) {
-            throw new IllegalArgumentException("Lower bound " + lowerBound +
-                                                            " is less than 1");
+            throw new IllegalArgumentException("Lower bound " + lowerBound + " is less than 1");
         }
     }
 
@@ -65,37 +59,31 @@
         precisionCheck();
     }
 
-
     private void precisionCheck() {
         int[][] canonicalArray = getMembers();
         if (canonicalArray.length == 0) {
-                throw new IllegalArgumentException("Zero-length array");
+            throw new IllegalArgumentException("Zero-length array");
         }
         for (int i = 0; i < canonicalArray.length; i++) {
             if (canonicalArray[i][0] < 1) {
-                throw new IllegalArgumentException("Valid values are not " +
-                                                                "less than 1");
+                throw new IllegalArgumentException("Valid values are not " + "less than 1");
             }
         }
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if( !(object instanceof PageRanges) ) {
+        if (!(object instanceof PageRanges)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public Class<? extends Attribute> getCategory() {
         return PageRanges.class;
     }
 
     public String getName() {
         return "page-ranges";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinute.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinute.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinute.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinute.java Tue Oct 31 19:58:05 2006
@@ -14,42 +14,33 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
-
-public final class PagesPerMinute extends IntegerSyntax 
-    implements PrintServiceAttribute {
-
+public final class PagesPerMinute extends IntegerSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = -6366403993072862015L;
 
     public PagesPerMinute(int value) {
         super(value, 0, Integer.MAX_VALUE);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PagesPerMinute) ) {
+        if (!(object instanceof PagesPerMinute)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PagesPerMinute.class;
     }
 
     public final String getName() {
         return "pages-per-minute";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinuteColor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinuteColor.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinuteColor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinuteColor.java Tue Oct 31 19:58:05 2006
@@ -14,42 +14,33 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
-
-public final class PagesPerMinuteColor extends IntegerSyntax 
-    implements PrintServiceAttribute {
-
+public final class PagesPerMinuteColor extends IntegerSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = 1684993151687470944L;
 
     public PagesPerMinuteColor(int value) {
         super(value, 0, Integer.MAX_VALUE);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PagesPerMinuteColor) ) {
+        if (!(object instanceof PagesPerMinuteColor)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PagesPerMinuteColor.class;
     }
 
     public final String getName() {
         return "pages-per-minute-color";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PresentationDirection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PresentationDirection.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PresentationDirection.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PresentationDirection.java Tue Oct 31 19:58:05 2006
@@ -14,13 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.EnumSyntax;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
@@ -29,79 +26,53 @@
  * Table values are obtained from PWG 5100.3:Production Printing Attributes
  * Set1, section 3.17, ftp://ftp.pwg.org/pub/pwg/candidates/cs-ippprodprint10-20010212-5100.3.pdf
  */
+public final class PresentationDirection extends EnumSyntax implements PrintJobAttribute,
+        PrintRequestAttribute {
+    private static final long serialVersionUID = 8294728067230931780L;
 
-public final class PresentationDirection extends EnumSyntax
-    implements PrintJobAttribute, PrintRequestAttribute {
+    public static final PresentationDirection TOBOTTOM_TORIGHT = new PresentationDirection(0);
 
-    public static final PresentationDirection
-        TOBOTTOM_TORIGHT = new PresentationDirection(0);
+    public static final PresentationDirection TOBOTTOM_TOLEFT = new PresentationDirection(1);
 
-    public static final PresentationDirection
-        TOBOTTOM_TOLEFT = new PresentationDirection(1);
+    public static final PresentationDirection TOTOP_TORIGHT = new PresentationDirection(2);
 
-    public static final PresentationDirection
-        TOTOP_TORIGHT = new PresentationDirection(2);
-
-    public static final PresentationDirection
-        TOTOP_TOLEFT = new PresentationDirection(3);
-
-    public static final PresentationDirection
-        TORIGHT_TOBOTTOM = new PresentationDirection(4);
-
-    public static final PresentationDirection
-        TORIGHT_TOTOP = new PresentationDirection(5);
-
-    public static final PresentationDirection
-        TOLEFT_TOBOTTOM = new PresentationDirection(6);
-
-    public static final PresentationDirection
-        TOLEFT_TOTOP = new PresentationDirection(7);
-
-
-    private static final PresentationDirection[] enumValueTable = {
-
-            TOBOTTOM_TORIGHT,
-            TOBOTTOM_TOLEFT,
-            TOTOP_TORIGHT,
-            TOTOP_TOLEFT,
-            TORIGHT_TOBOTTOM,
-            TORIGHT_TOTOP,
-            TOLEFT_TOBOTTOM,
-            TOLEFT_TOTOP
-    };
-
-    private static final String[] stringTable = { "tobottom-toright",
-                                                  "tobottom-toleft",
-                                                  "totop-toright",
-                                                  "totop-toleft",
-                                                  "toright-tobottom",
-                                                  "toright-totop",
-                                                  "toleft-tobottom",
-                                                  "toleft-totop" };
+    public static final PresentationDirection TOTOP_TOLEFT = new PresentationDirection(3);
 
+    public static final PresentationDirection TORIGHT_TOBOTTOM = new PresentationDirection(4);
+
+    public static final PresentationDirection TORIGHT_TOTOP = new PresentationDirection(5);
+
+    public static final PresentationDirection TOLEFT_TOBOTTOM = new PresentationDirection(6);
+
+    public static final PresentationDirection TOLEFT_TOTOP = new PresentationDirection(7);
+
+    private static final PresentationDirection[] enumValueTable = { TOBOTTOM_TORIGHT,
+            TOBOTTOM_TOLEFT, TOTOP_TORIGHT, TOTOP_TOLEFT, TORIGHT_TOBOTTOM, TORIGHT_TOTOP,
+            TOLEFT_TOBOTTOM, TOLEFT_TOTOP };
+
+    private static final String[] stringTable = { "tobottom-toright", "tobottom-toleft",
+            "totop-toright", "totop-toleft", "toright-tobottom", "toright-totop",
+            "toleft-tobottom", "toleft-totop" };
 
     PresentationDirection(int value) {
         super(value);
     }
 
-
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PresentationDirection.class;
     }
 
-    protected EnumSyntax[]  getEnumValueTable() {
-        return enumValueTable;
+    @Override
+    protected EnumSyntax[] getEnumValueTable() {
+        return enumValueTable.clone();
     }
 
     public final String getName() {
         return "presentation-direction";
     }
 
+    @Override
     protected String[] getStringTable() {
-        return stringTable;
+        return stringTable.clone();
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrintQuality.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrintQuality.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrintQuality.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrintQuality.java Tue Oct 31 19:58:05 2006
@@ -14,27 +14,22 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.DocAttribute;
 import javax.print.attribute.EnumSyntax;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 
-
 /*
  * Table values are obtained from RFC2911: Internet Printing Protocol/1.1: 
  * Model and Semantics, section 4.2.13, http://ietf.org/rfc/rfc2911.txt?number=2911
  */
-
-public class PrintQuality extends EnumSyntax 
-    implements DocAttribute, PrintJobAttribute, PrintRequestAttribute {
-
+public class PrintQuality extends EnumSyntax implements DocAttribute, PrintJobAttribute,
+        PrintRequestAttribute {
+    private static final long serialVersionUID = -3072341285225858365L;
 
     public static final PrintQuality DRAFT = new PrintQuality(3);
 
@@ -42,44 +37,34 @@
 
     public static final PrintQuality HIGH = new PrintQuality(5);
 
-    
-    private static final PrintQuality[] enumValueTable = { DRAFT,
-                                                           NORMAL,
-                                                           HIGH };
-    
-    private static final String[] stringTable = { "draft",
-                                                  "normal",
-                                                  "high" };
-    
-    
+    private static final PrintQuality[] enumValueTable = { DRAFT, NORMAL, HIGH };
+
+    private static final String[] stringTable = { "draft", "normal", "high" };
+
     protected PrintQuality(int value) {
         super(value);
     }
 
-
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes 
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrintQuality.class;
     }
-    
+
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
-        return (EnumSyntax[]) enumValueTable.clone();
+        return enumValueTable.clone();
     }
-    
+
     public final String getName() {
         return "print-quality";
     }
-        
+
+    @Override
     protected int getOffset() {
         return 3;
-    } 
+    }
 
+    @Override
     protected String[] getStringTable() {
-        return (String[]) stringTable.clone();
+        return stringTable.clone();
     }
-
-    
 }
-
-

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterInfo.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterInfo.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.util.Locale;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
-public final class PrinterInfo extends TextSyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterInfo extends TextSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = 7765280618777599727L;
 
     public PrinterInfo(String printerInfo, Locale locale) {
         super(printerInfo, locale);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-
-        if ( !(object instanceof PrinterInfo) ) {
+        if (!(object instanceof PrinterInfo)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterInfo.class;
     }
 
     public final String getName() {
         return "printer-info";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterIsAcceptingJobs.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterIsAcceptingJobs.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterIsAcceptingJobs.java Tue Oct 31 19:58:05 2006
@@ -14,59 +14,45 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.EnumSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
+public final class PrinterIsAcceptingJobs extends EnumSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = -5052010680537678061L;
 
-public final class PrinterIsAcceptingJobs extends EnumSyntax 
-    implements PrintServiceAttribute {
+    public static final PrinterIsAcceptingJobs NOT_ACCEPTING_JOBS = new PrinterIsAcceptingJobs(
+            0);
 
+    public static final PrinterIsAcceptingJobs ACCEPTING_JOBS = new PrinterIsAcceptingJobs(1);
 
-    public static final PrinterIsAcceptingJobs
-        NOT_ACCEPTING_JOBS = new PrinterIsAcceptingJobs(0);
+    private static final PrinterIsAcceptingJobs[] enumValueTable = { NOT_ACCEPTING_JOBS,
+            ACCEPTING_JOBS };
 
-    public static final PrinterIsAcceptingJobs
-        ACCEPTING_JOBS = new PrinterIsAcceptingJobs(1);
-
-    
-    private static final PrinterIsAcceptingJobs[] enumValueTable = { 
-        NOT_ACCEPTING_JOBS,
-        ACCEPTING_JOBS
-    };
-    
-    private static final String[] stringTable = { "false",
-                                                  "true" };
+    private static final String[] stringTable = { "false", "true" };
 
-    
     protected PrinterIsAcceptingJobs(int value) {
-        super (value);
+        super(value);
     }
 
- 
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
-        return enumValueTable;
+        return enumValueTable.clone();
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes 
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterIsAcceptingJobs.class;
     }
 
     public final String getName() {
         return "printer-is-accepting-jobs";
     }
-    
+
+    @Override
     protected String[] getStringTable() {
-        return stringTable;
+        return stringTable.clone();
     }
-
-    
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterLocation.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterLocation.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterLocation.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterLocation.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.util.Locale;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
-public final class PrinterLocation extends TextSyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterLocation extends TextSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = -1598610039865566337L;
 
     public PrinterLocation(String printerLocation, Locale locale) {
         super(printerLocation, locale);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PrinterLocation) ) {
+        if (!(object instanceof PrinterLocation)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterLocation.class;
     }
 
     public final String getName() {
         return "printer-location";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMakeAndModel.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMakeAndModel.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMakeAndModel.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMakeAndModel.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.util.Locale;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
-public final class PrinterMakeAndModel extends TextSyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterMakeAndModel extends TextSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = 4580461489499351411L;
 
     public PrinterMakeAndModel(String makeAndModel, Locale locale) {
         super(makeAndModel, locale);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PrinterMakeAndModel) ) {
+        if (!(object instanceof PrinterMakeAndModel)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterMakeAndModel.class;
     }
 
     public final String getName() {
         return "printer-make-and-model";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMessageFromOperator.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMessageFromOperator.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMessageFromOperator.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMessageFromOperator.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,35 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.util.Locale;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
-public final class PrinterMessageFromOperator extends TextSyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterMessageFromOperator extends TextSyntax implements
+        PrintServiceAttribute {
+    private static final long serialVersionUID = -4486871203218629318L;
 
     public PrinterMessageFromOperator(String message, Locale locale) {
         super(message, locale);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PrinterMessageFromOperator) ) {
+        if (!(object instanceof PrinterMessageFromOperator)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterMessageFromOperator.class;
     }
 
     public final String getName() {
         return "printer-message-from-operator";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfo.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfo.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.net.URI;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
-
-public final class PrinterMoreInfo extends URISyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterMoreInfo extends URISyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = 4555850007675338574L;
 
     public PrinterMoreInfo(URI uri) {
         super(uri);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PrinterMoreInfo) ) {
+        if (!(object instanceof PrinterMoreInfo)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterMoreInfo.class;
     }
 
     public final String getName() {
         return "printer-more-info";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,35 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.net.URI;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
-
-public final class PrinterMoreInfoManufacturer extends URISyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterMoreInfoManufacturer extends URISyntax implements
+        PrintServiceAttribute {
+    private static final long serialVersionUID = 3323271346485076608L;
 
     public PrinterMoreInfoManufacturer(URI uri) {
         super(uri);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( ! (object instanceof PrinterMoreInfoManufacturer) ) {
+        if (!(object instanceof PrinterMoreInfoManufacturer)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterMoreInfoManufacturer.class;
     }
 
     public final String getName() {
         return "printer-more-info-manufacturer";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterName.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterName.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterName.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterName.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.util.Locale;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
-
-public final class PrinterName extends TextSyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterName extends TextSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = 299740639137803127L;
 
     public PrinterName(String printerName, Locale locale) {
         super(printerName, locale);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PrinterName) ) {
+        if (!(object instanceof PrinterName)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterName.class;
     }
 
     public final String getName() {
         return "printer-name";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterResolution.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterResolution.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterResolution.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterResolution.java Tue Oct 31 19:58:05 2006
@@ -14,45 +14,36 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.DocAttribute;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.ResolutionSyntax;
 
+public final class PrinterResolution extends ResolutionSyntax implements DocAttribute,
+        PrintRequestAttribute, PrintJobAttribute {
+    private static final long serialVersionUID = 13090306561090558L;
 
-public final class PrinterResolution extends ResolutionSyntax 
-    implements DocAttribute, PrintRequestAttribute, PrintJobAttribute {
-
-
-    public PrinterResolution(int crossFeedResolution, int feedResolution,
-                                                                int units) {
+    public PrinterResolution(int crossFeedResolution, int feedResolution, int units) {
         super(crossFeedResolution, feedResolution, units);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PrinterResolution) ) {
+        if (!(object instanceof PrinterResolution)) {
             return false;
         }
-        return super.equals (object);
+        return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterResolution.class;
     }
 
     public final String getName() {
         return "printer-resolution";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterState.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterState.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterState.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterState.java Tue Oct 31 19:58:05 2006
@@ -14,13 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.EnumSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
@@ -28,10 +25,8 @@
  * Table values are obtained from RFC2911: Internet Printing Protocol/1.1: 
  * Model and Semantics, section 4.4.11, http://ietf.org/rfc/rfc2911.txt?number=2911
  */
-
-public final class PrinterState extends EnumSyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterState extends EnumSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = -649578618346507718L;
 
     public static final PrinterState UNKNOWN = new PrinterState(0);
 
@@ -41,34 +36,22 @@
 
     public static final PrinterState STOPPED = new PrinterState(5);
 
-    
-    
-    private static final PrinterState[] enumValueTable = { UNKNOWN,
-                                                           null,
-                                                           null,
-                                                           IDLE,
-                                                           PROCESSING,
-                                                           STOPPED };
-
-    private static final String[] stringTable = { "unknown",
-                                                  null,
-                                                  null,
-                                                  "idle",
-                                                  "processing",
-                                                  "stopped" };
-    
+    private static final PrinterState[] enumValueTable = { UNKNOWN, null, null, IDLE,
+            PROCESSING, STOPPED };
+
+    private static final String[] stringTable = { "unknown", null, null, "idle", "processing",
+            "stopped" };
+
     protected PrinterState(int value) {
         super(value);
     }
 
-    
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
-        return enumValueTable;
+        return enumValueTable.clone();
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes 
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterState.class;
     }
 
@@ -76,9 +59,8 @@
         return "printer-state";
     }
 
+    @Override
     protected String[] getStringTable() {
-        return stringTable;
+        return stringTable.clone();
     }
-
-    
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReason.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReason.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReason.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReason.java Tue Oct 31 19:58:05 2006
@@ -14,205 +14,111 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import javax.print.attribute.Attribute;
 import javax.print.attribute.EnumSyntax;
 
-
 public class PrinterStateReason extends EnumSyntax implements Attribute {
+    private static final long serialVersionUID = -1623720656201472593L;
+
+    public static final PrinterStateReason OTHER = new PrinterStateReason(0);
+
+    public static final PrinterStateReason MEDIA_NEEDED = new PrinterStateReason(1);
+
+    public static final PrinterStateReason MEDIA_JAM = new PrinterStateReason(2);
+
+    public static final PrinterStateReason MOVING_TO_PAUSED = new PrinterStateReason(3);
+
+    public static final PrinterStateReason PAUSED = new PrinterStateReason(4);
+
+    public static final PrinterStateReason SHUTDOWN = new PrinterStateReason(5);
+
+    public static final PrinterStateReason CONNECTING_TO_DEVICE = new PrinterStateReason(6);
+
+    public static final PrinterStateReason TIMED_OUT = new PrinterStateReason(7);
+
+    public static final PrinterStateReason STOPPING = new PrinterStateReason(8);
+
+    public static final PrinterStateReason STOPPED_PARTLY = new PrinterStateReason(9);
+
+    public static final PrinterStateReason TONER_LOW = new PrinterStateReason(10);
+
+    public static final PrinterStateReason TONER_EMPTY = new PrinterStateReason(11);
+
+    public static final PrinterStateReason SPOOL_AREA_FULL = new PrinterStateReason(12);
+
+    public static final PrinterStateReason COVER_OPEN = new PrinterStateReason(13);
+
+    public static final PrinterStateReason INTERLOCK_OPEN = new PrinterStateReason(14);
+
+    public static final PrinterStateReason DOOR_OPEN = new PrinterStateReason(15);
+
+    public static final PrinterStateReason INPUT_TRAY_MISSING = new PrinterStateReason(16);
 
+    public static final PrinterStateReason MEDIA_LOW = new PrinterStateReason(17);
 
-    public static final PrinterStateReason
-        OTHER = new PrinterStateReason(0);
+    public static final PrinterStateReason MEDIA_EMPTY = new PrinterStateReason(18);
 
-    public static final PrinterStateReason 
-        MEDIA_NEEDED = new PrinterStateReason(1);
+    public static final PrinterStateReason OUTPUT_TRAY_MISSING = new PrinterStateReason(19);
 
-    public static final PrinterStateReason
-        MEDIA_JAM = new PrinterStateReason(2);
+    public static final PrinterStateReason OUTPUT_AREA_ALMOST_FULL = new PrinterStateReason(20);
 
-    public static final PrinterStateReason
-        MOVING_TO_PAUSED = new PrinterStateReason(3);
-
-    public static final PrinterStateReason
-        PAUSED = new PrinterStateReason(4);
-
-    public static final PrinterStateReason
-        SHUTDOWN = new PrinterStateReason(5);
-
-    public static final PrinterStateReason
-        CONNECTING_TO_DEVICE = new PrinterStateReason(6);
-
-    public static final PrinterStateReason
-        TIMED_OUT = new PrinterStateReason(7);
-
-    public static final PrinterStateReason
-        STOPPING = new PrinterStateReason(8);
-
-    public static final PrinterStateReason
-        STOPPED_PARTLY = new PrinterStateReason(9);
-
-    public static final PrinterStateReason
-        TONER_LOW = new PrinterStateReason(10);
-
-    public static final PrinterStateReason
-        TONER_EMPTY = new PrinterStateReason(11);
-
-    public static final PrinterStateReason
-        SPOOL_AREA_FULL = new PrinterStateReason(12);
-
-    public static final PrinterStateReason
-        COVER_OPEN = new PrinterStateReason(13);
-
-    public static final PrinterStateReason
-        INTERLOCK_OPEN = new PrinterStateReason(14);
-
-    public static final PrinterStateReason
-        DOOR_OPEN = new PrinterStateReason(15);
-
-    public static final PrinterStateReason
-        INPUT_TRAY_MISSING = new PrinterStateReason(16);
-
-    public static final PrinterStateReason
-        MEDIA_LOW = new PrinterStateReason(17);
-
-    public static final PrinterStateReason
-        MEDIA_EMPTY = new PrinterStateReason(18);
-
-    public static final PrinterStateReason 
-        OUTPUT_TRAY_MISSING = new PrinterStateReason(19);
-
-    public static final PrinterStateReason
-        OUTPUT_AREA_ALMOST_FULL = new PrinterStateReason(20);
-
-    public static final PrinterStateReason
-        OUTPUT_AREA_FULL = new PrinterStateReason(21);
-
-    public static final PrinterStateReason
-        MARKER_SUPPLY_LOW = new PrinterStateReason(22);
-
-    public static final PrinterStateReason
-        MARKER_SUPPLY_EMPTY = new PrinterStateReason(23);
-
-    public static final PrinterStateReason
-        MARKER_WASTE_ALMOST_FULL = new PrinterStateReason(24);
-
-    public static final PrinterStateReason 
-        MARKER_WASTE_FULL = new PrinterStateReason(25);
-
-    public static final PrinterStateReason
-        FUSER_OVER_TEMP = new PrinterStateReason(26);
-
-    public static final PrinterStateReason
-        FUSER_UNDER_TEMP = new PrinterStateReason(27);
-
-    public static final PrinterStateReason
-        OPC_NEAR_EOL = new PrinterStateReason(28);
-
-    public static final PrinterStateReason
-        OPC_LIFE_OVER = new PrinterStateReason(29);
-
-    public static final PrinterStateReason
-        DEVELOPER_LOW = new PrinterStateReason(30);
-
-    public static final PrinterStateReason
-        DEVELOPER_EMPTY = new PrinterStateReason(31);
-
-    public static final PrinterStateReason
-        INTERPRETER_RESOURCE_UNAVAILABLE = new PrinterStateReason(32);
-    
-    
-    private static final PrinterStateReason[] enumValueTable = {
-        OTHER,
-        MEDIA_NEEDED,
-        MEDIA_JAM,
-        MOVING_TO_PAUSED,
-        PAUSED,
-        SHUTDOWN,
-        CONNECTING_TO_DEVICE,
-        TIMED_OUT,
-        STOPPING,
-        STOPPED_PARTLY,
-        TONER_LOW,
-        TONER_EMPTY,
-        SPOOL_AREA_FULL,
-        COVER_OPEN,
-        INTERLOCK_OPEN,
-        DOOR_OPEN,
-        INPUT_TRAY_MISSING,
-        MEDIA_LOW,
-        MEDIA_EMPTY,
-        OUTPUT_TRAY_MISSING,
-        OUTPUT_AREA_ALMOST_FULL,
-        OUTPUT_AREA_FULL,
-        MARKER_SUPPLY_LOW,
-        MARKER_SUPPLY_EMPTY,
-        MARKER_WASTE_ALMOST_FULL,
-        MARKER_WASTE_FULL,
-        FUSER_OVER_TEMP,
-        FUSER_UNDER_TEMP,
-        OPC_NEAR_EOL,
-        OPC_LIFE_OVER,
-        DEVELOPER_LOW,
-        DEVELOPER_EMPTY,
-        INTERPRETER_RESOURCE_UNAVAILABLE
-    };
-
-    private static final String[] stringTable = {
-        "other",
-        "media-needed",
-        "media-jam",
-        "moving-to-paused",
-        "paused",
-        "shutdown",
-        "connecting-to-device",
-        "timed-out",
-        "stopping",
-        "stopped-partly",
-        "toner-low",
-        "toner-empty",
-        "spool-area-full",
-        "cover-open",
-        "interlock-open",
-        "door-open",
-        "input-tray-missing",
-        "media-low",
-        "media-empty",
-        "output-tray-missing",
-        "output-area-almost-full",
-        "output-area-full",
-        "marker-supply-low",
-        "marker-supply-empty",
-        "marker-waste-almost-full",
-        "marker-waste-full",
-        "fuser-over-temp",
-        "fuser-under-temp",
-        "opc-near-eol",
-        "opc-life-over",
-        "developer-low",
-        "developer-empty",
-        "interpreter-resource-unavailable"
-    };
+    public static final PrinterStateReason OUTPUT_AREA_FULL = new PrinterStateReason(21);
+
+    public static final PrinterStateReason MARKER_SUPPLY_LOW = new PrinterStateReason(22);
+
+    public static final PrinterStateReason MARKER_SUPPLY_EMPTY = new PrinterStateReason(23);
+
+    public static final PrinterStateReason MARKER_WASTE_ALMOST_FULL = new PrinterStateReason(24);
+
+    public static final PrinterStateReason MARKER_WASTE_FULL = new PrinterStateReason(25);
+
+    public static final PrinterStateReason FUSER_OVER_TEMP = new PrinterStateReason(26);
+
+    public static final PrinterStateReason FUSER_UNDER_TEMP = new PrinterStateReason(27);
+
+    public static final PrinterStateReason OPC_NEAR_EOL = new PrinterStateReason(28);
+
+    public static final PrinterStateReason OPC_LIFE_OVER = new PrinterStateReason(29);
+
+    public static final PrinterStateReason DEVELOPER_LOW = new PrinterStateReason(30);
+
+    public static final PrinterStateReason DEVELOPER_EMPTY = new PrinterStateReason(31);
+
+    public static final PrinterStateReason INTERPRETER_RESOURCE_UNAVAILABLE = new PrinterStateReason(
+            32);
+
+    private static final PrinterStateReason[] enumValueTable = { OTHER, MEDIA_NEEDED,
+            MEDIA_JAM, MOVING_TO_PAUSED, PAUSED, SHUTDOWN, CONNECTING_TO_DEVICE, TIMED_OUT,
+            STOPPING, STOPPED_PARTLY, TONER_LOW, TONER_EMPTY, SPOOL_AREA_FULL, COVER_OPEN,
+            INTERLOCK_OPEN, DOOR_OPEN, INPUT_TRAY_MISSING, MEDIA_LOW, MEDIA_EMPTY,
+            OUTPUT_TRAY_MISSING, OUTPUT_AREA_ALMOST_FULL, OUTPUT_AREA_FULL, MARKER_SUPPLY_LOW,
+            MARKER_SUPPLY_EMPTY, MARKER_WASTE_ALMOST_FULL, MARKER_WASTE_FULL, FUSER_OVER_TEMP,
+            FUSER_UNDER_TEMP, OPC_NEAR_EOL, OPC_LIFE_OVER, DEVELOPER_LOW, DEVELOPER_EMPTY,
+            INTERPRETER_RESOURCE_UNAVAILABLE };
+
+    private static final String[] stringTable = { "other", "media-needed", "media-jam",
+            "moving-to-paused", "paused", "shutdown", "connecting-to-device", "timed-out",
+            "stopping", "stopped-partly", "toner-low", "toner-empty", "spool-area-full",
+            "cover-open", "interlock-open", "door-open", "input-tray-missing", "media-low",
+            "media-empty", "output-tray-missing", "output-area-almost-full",
+            "output-area-full", "marker-supply-low", "marker-supply-empty",
+            "marker-waste-almost-full", "marker-waste-full", "fuser-over-temp",
+            "fuser-under-temp", "opc-near-eol", "opc-life-over", "developer-low",
+            "developer-empty", "interpreter-resource-unavailable" };
 
-    
     protected PrinterStateReason(int value) {
         super(value);
     }
-   
-    
+
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
-        return (EnumSyntax[]) enumValueTable.clone();
+        return enumValueTable.clone();
     }
-    
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes 
-       Class<? extends Attribute> getCategory() { */
+
+    public final Class<? extends Attribute> getCategory() {
         return PrinterStateReason.class;
     }
 
@@ -220,9 +126,8 @@
         return "printer-state-reason";
     }
 
+    @Override
     protected String[] getStringTable() {
-        return (String[]) stringTable.clone();
+        return stringTable.clone();
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReasons.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReasons.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReasons.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReasons.java Tue Oct 31 19:58:05 2006
@@ -14,33 +14,25 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.6 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 
 /*
  * Table values are obtained from RFC2911: Internet Printing Protocol/1.1: 
  * Model and Semantics, section 4.4.11, http://ietf.org/rfc/rfc2911.txt?number=2911
  */
+public final class PrinterStateReasons extends HashMap<PrinterStateReason, Severity> implements
+        PrintServiceAttribute {
+    private static final long serialVersionUID = -3731791085163619457L;
 
-public final class PrinterStateReasons extends HashMap
-        implements PrintServiceAttribute {
-//public final class PrinterStateReasons extends 
-//HashMap<PrinterStateReason, Severity> implements PrintServiceAttribute {
-    
-    
     public PrinterStateReasons() {
         super();
     }
@@ -53,21 +45,14 @@
         super(initialCapacity, loadFactor);
     }
 
-    public PrinterStateReasons(Map map) {
-    //1.5 support requires the following changes 
-    //public PrinterStateReasons(Map<PrinterStateReason, Severity> map) {
+    public PrinterStateReasons(Map<PrinterStateReason, Severity> map) {
         this();
-        Iterator iterator = map.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry mapEntry = (Map.Entry) iterator.next();
+        for (Map.Entry<PrinterStateReason, Severity> mapEntry : map.entrySet()) {
             put(mapEntry.getKey(), mapEntry.getValue());
         }
     }
 
-
-    public final Class getCategory() {
-    //1.5 support requires the following changes
-    //Class<? extends Attribute> getCategory() {
+    public final Class<? extends Attribute> getCategory() {
         return PrinterStateReasons.class;
     }
 
@@ -75,37 +60,27 @@
         return "printer-state-reasons";
     }
 
-    public Object put(Object reason, Object severity) {
-    //1.5 support requires the following changes 
-    //public Severity put(PrinterStateReason reason, Severity severity) {
-
+    @Override
+    public Severity put(PrinterStateReason reason, Severity severity) {
         if (reason == null) {
             throw new NullPointerException("Reason is null");
         }
         if (severity == null) {
             throw new NullPointerException("Severity is null");
         }
-        return super.put((PrinterStateReason) reason,
-                                            (Severity) severity);
+        return super.put(reason, severity);
     }
 
-    public Set printerStateReasonSet(Severity severity) {
-    //1.5 support requires the following changes 
-    //public Set<PrinterStateReason> printerStateReasonSet(Severity severity) {
-
+    public Set<PrinterStateReason> printerStateReasonSet(Severity severity) {
         if (severity == null) {
             throw new NullPointerException("Severity is null");
         }
-        Map.Entry mapEntry;
-        HashSet set = new HashSet();
-        Iterator iterator = entrySet().iterator();
-        while (iterator.hasNext()) {
-            mapEntry = (Map.Entry) iterator.next();
-            if ((Severity) mapEntry.getValue() == severity) {
-                set.add((PrinterStateReason) mapEntry.getKey());
+        Set<PrinterStateReason> set = new HashSet<PrinterStateReason>();
+        for (Map.Entry<PrinterStateReason, Severity> mapEntry : entrySet()) {
+            if (mapEntry.getValue() == severity) {
+                set.add(mapEntry.getKey());
             }
         }
         return Collections.unmodifiableSet(set);
     }
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterURI.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterURI.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterURI.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterURI.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.net.URI;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
-
-public final class PrinterURI extends URISyntax 
-    implements PrintServiceAttribute {
-
+public final class PrinterURI extends URISyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = 7923912792485606497L;
 
     public PrinterURI(URI uri) {
         super(uri);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof PrinterURI) ) {
+        if (!(object instanceof PrinterURI)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return PrinterURI.class;
     }
 
     public final String getName() {
         return "printer-uri";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/QueuedJobCount.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/QueuedJobCount.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/QueuedJobCount.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/QueuedJobCount.java Tue Oct 31 19:58:05 2006
@@ -14,42 +14,33 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
-
-public final class QueuedJobCount extends IntegerSyntax 
-    implements PrintServiceAttribute {
-
+public final class QueuedJobCount extends IntegerSyntax implements PrintServiceAttribute {
+    private static final long serialVersionUID = 7499723077864047742L;
 
     public QueuedJobCount(int value) {
         super(value, 0, Integer.MAX_VALUE);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof QueuedJobCount) ) {
+        if (!(object instanceof QueuedJobCount)) {
             return false;
         }
-        return super.equals (object);
+        return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return QueuedJobCount.class;
     }
 
     public final String getName() {
         return "queued-job-count";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ReferenceUriSchemesSupported.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ReferenceUriSchemesSupported.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ReferenceUriSchemesSupported.java Tue Oct 31 19:58:05 2006
@@ -14,10 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
@@ -28,69 +24,42 @@
  * Table values are obtained from RFC2911: Internet Printing Protocol/1.1: 
  * Model and Semantics, section 4.1.6, 4.4.27 http://ietf.org/rfc/rfc2911.txt?number=2911
  */
+public class ReferenceUriSchemesSupported extends EnumSyntax implements Attribute {
+    private static final long serialVersionUID = -8989076942813442805L;
 
-public class ReferenceUriSchemesSupported extends EnumSyntax 
-    implements Attribute {
+    public static final ReferenceUriSchemesSupported FTP = new ReferenceUriSchemesSupported(0);
 
-    public static final ReferenceUriSchemesSupported
-        FTP = new ReferenceUriSchemesSupported(0);
+    public static final ReferenceUriSchemesSupported HTTP = new ReferenceUriSchemesSupported(1);
 
-    public static final ReferenceUriSchemesSupported
-        HTTP = new ReferenceUriSchemesSupported(1);
+    public static final ReferenceUriSchemesSupported HTTPS = new ReferenceUriSchemesSupported(2);
 
-    public static final ReferenceUriSchemesSupported
-        HTTPS = new ReferenceUriSchemesSupported(2);
-
-    public static final ReferenceUriSchemesSupported
-        GOPHER = new ReferenceUriSchemesSupported(3);
-
-    public static final ReferenceUriSchemesSupported
-        NEWS = new ReferenceUriSchemesSupported(4);
-
-    public static final ReferenceUriSchemesSupported
-        NNTP = new ReferenceUriSchemesSupported(5);
-
-    public static final ReferenceUriSchemesSupported
-        WAIS = new ReferenceUriSchemesSupported(6);
-
-    public static final ReferenceUriSchemesSupported
-        FILE = new ReferenceUriSchemesSupported(7);
-
-
-    private static final ReferenceUriSchemesSupported[] enumValueTable = {
-
-        FTP,
-        HTTP,
-        HTTPS,
-        GOPHER,
-        NEWS,
-        NNTP,
-        WAIS,
-        FILE,
-    };
-
-    private static final String[] stringTable = { "ftp",
-                                                  "http",
-                                                  "https",
-                                                  "gopher",
-                                                  "news",
-                                                  "nntp",
-                                                  "wais",
-                                                  "file" };
+    public static final ReferenceUriSchemesSupported GOPHER = new ReferenceUriSchemesSupported(
+            3);
 
+    public static final ReferenceUriSchemesSupported NEWS = new ReferenceUriSchemesSupported(4);
+
+    public static final ReferenceUriSchemesSupported NNTP = new ReferenceUriSchemesSupported(5);
+
+    public static final ReferenceUriSchemesSupported WAIS = new ReferenceUriSchemesSupported(6);
+
+    public static final ReferenceUriSchemesSupported FILE = new ReferenceUriSchemesSupported(7);
+
+    private static final ReferenceUriSchemesSupported[] enumValueTable = { FTP, HTTP, HTTPS,
+            GOPHER, NEWS, NNTP, WAIS, FILE, };
+
+    private static final String[] stringTable = { "ftp", "http", "https", "gopher", "news",
+            "nntp", "wais", "file" };
 
     protected ReferenceUriSchemesSupported(int value) {
         super(value);
     }
 
-
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
-        return (EnumSyntax[]) enumValueTable.clone();
+        return enumValueTable.clone();
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return ReferenceUriSchemesSupported.class;
     }
 
@@ -98,9 +67,8 @@
         return "reference-uri-schemes-supported";
     }
 
+    @Override
     protected String[] getStringTable() {
-        return (String[])stringTable.clone();
+        return stringTable.clone();
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/RequestingUserName.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/RequestingUserName.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/RequestingUserName.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/RequestingUserName.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import java.util.Locale;
-
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.TextSyntax;
 
-
-public final class RequestingUserName extends TextSyntax 
-    implements PrintRequestAttribute {
-
+public final class RequestingUserName extends TextSyntax implements PrintRequestAttribute {
+    private static final long serialVersionUID = -2683049894310331454L;
 
     public RequestingUserName(String userName, Locale locale) {
         super(userName, locale);
     }
 
-
+    @Override
     public boolean equals(Object object) {
-        if ( !(object instanceof RequestingUserName) ) {
+        if (!(object instanceof RequestingUserName)) {
             return false;
         }
         return super.equals(object);
     }
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return RequestingUserName.class;
     }
 
     public final String getName() {
         return "requesting-user-name";
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Severity.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Severity.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Severity.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Severity.java Tue Oct 31 19:58:05 2006
@@ -14,24 +14,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
 import javax.print.attribute.Attribute;
 import javax.print.attribute.EnumSyntax;
 
-
 /*
  * table values are obtained from rfc2911: internet printing protocol/1.1: 
  * model and semantics, section 4.4.12 http://ietf.org/rfc/rfc2911.txt?number=2911
  */
-
 public final class Severity extends EnumSyntax implements Attribute {
-
+    private static final long serialVersionUID = 8781881462717925380L;
 
     public static final Severity REPORT = new Severity(0);
 
@@ -39,38 +33,29 @@
 
     public static final Severity ERROR = new Severity(2);
 
+    private static final Severity[] enumValueTable = { REPORT, WARNING, ERROR };
 
-    private static final Severity[] enumValueTable = { REPORT,
-                                                       WARNING,
-                                                       ERROR };
-
-    private static final String[] stringTable = { "report",
-                                                  "warning",
-                                                  "error" };
-
+    private static final String[] stringTable = { "report", "warning", "error" };
 
     protected Severity(int value) {
         super(value);
     }
 
-
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return Severity.class;
     }
 
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
-        return enumValueTable;
+        return enumValueTable.clone();
     }
 
     public final String getName() {
         return "severity";
     }
 
+    @Override
     protected String[] getStringTable() {
-        return stringTable;
+        return stringTable.clone();
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/SheetCollate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/SheetCollate.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/SheetCollate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/SheetCollate.java Tue Oct 31 19:58:05 2006
@@ -14,57 +14,46 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.DocAttribute;
 import javax.print.attribute.EnumSyntax;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 
+public final class SheetCollate extends EnumSyntax implements DocAttribute, PrintJobAttribute,
+        PrintRequestAttribute {
+    private static final long serialVersionUID = 7080587914259873003L;
 
-public final class SheetCollate extends EnumSyntax 
-    implements DocAttribute, PrintJobAttribute, PrintRequestAttribute {
-
-    
     public static final SheetCollate UNCOLLATED = new SheetCollate(0);
 
     public static final SheetCollate COLLATED = new SheetCollate(1);
 
+    private static final String[] stringTable = { "uncollated", "collated" };
 
-    private static final String[] stringTable = { "uncollated",
-                                                  "collated" };
+    private static final SheetCollate[] enumValueTable = { UNCOLLATED, COLLATED };
 
-    private static final SheetCollate[] enumValueTable = { UNCOLLATED,
-                                                            COLLATED };
-    
-    
     protected SheetCollate(int value) {
         super(value);
     }
-    
 
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes 
-       Class<? extends Attribute> getCategory() { */
+    public final Class<? extends Attribute> getCategory() {
         return SheetCollate.class;
     }
 
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
-        return enumValueTable;
+        return enumValueTable.clone();
     }
-    
+
     public final String getName() {
         return "sheet-collate";
     }
-    
+
+    @Override
     protected String[] getStringTable() {
-        return stringTable;
+        return stringTable.clone();
     }
-
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Sides.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Sides.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Sides.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Sides.java Tue Oct 31 19:58:05 2006
@@ -14,69 +14,58 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Elena V. Sayapina 
- * @version $Revision: 1.5 $ 
- */ 
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.DocAttribute;
 import javax.print.attribute.EnumSyntax;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 
-
 /*
  * table values are obtained from rfc2911: internet printing protocol/1.1: 
  * model and semantics, section 4.2.8 http://ietf.org/rfc/rfc2911.txt?number=2911
  */
+public final class Sides extends EnumSyntax implements DocAttribute, PrintJobAttribute,
+        PrintRequestAttribute {
+    private static final long serialVersionUID = -6890309414893262822L;
 
-public final class Sides extends EnumSyntax 
-    implements DocAttribute, PrintJobAttribute, PrintRequestAttribute {
-
-    
     public static final Sides ONE_SIDED = new Sides(0);
 
     public static final Sides TWO_SIDED_LONG_EDGE = new Sides(1);
-   
+
     public static final Sides TWO_SIDED_SHORT_EDGE = new Sides(2);
 
     public static final Sides DUPLEX = TWO_SIDED_LONG_EDGE;
 
     public static final Sides TUMBLE = TWO_SIDED_SHORT_EDGE;
-    
 
-    private static final Sides[] enumValueTable = { ONE_SIDED,
-                                                    TWO_SIDED_LONG_EDGE,
-                                                    TWO_SIDED_SHORT_EDGE };
-    
-    private static final String[] stringTable = { "one-sided",
-                                                  "two-sided-long-edge",
-                                                  "two-sided-short-edge" };
+    private static final Sides[] enumValueTable = { ONE_SIDED, TWO_SIDED_LONG_EDGE,
+            TWO_SIDED_SHORT_EDGE };
+
+    private static final String[] stringTable = { "one-sided", "two-sided-long-edge",
+            "two-sided-short-edge" };
 
     protected Sides(int value) {
         super(value);
     }
-    
-    
-    public final Class getCategory() {
-    /* 1.5 support requires the following changes 
-       Class<? extends Attribute> getCategory() { */
+
+    public final Class<? extends Attribute> getCategory() {
         return Sides.class;
     }
-    
+
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
-        return enumValueTable;
+        return enumValueTable.clone();
     }
 
     public final String getName() {
         return "sides";
     }
-    
+
+    @Override
     protected String[] getStringTable() {
-        return stringTable;
+        return stringTable.clone();
     }
-    
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/util/Ipp2Java.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/util/Ipp2Java.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/util/Ipp2Java.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/util/Ipp2Java.java Tue Oct 31 19:58:05 2006
@@ -393,7 +393,7 @@
                 a = (Attribute) IppAttributeUtils.getObject(
                         PrinterStateReason.class, r);
                 if (a != null) {
-                    rs.put(a, s);
+                    rs.put((PrinterStateReason)a, s);
                 }
             }
             if (rs.size() > 0) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/JobStateReasonsTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/JobStateReasonsTest.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/JobStateReasonsTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/JobStateReasonsTest.java Tue Oct 31 19:58:05 2006
@@ -103,13 +103,6 @@
         assertFalse(jsreasons.add(JobStateReason.ABORTED_BY_SYSTEM));
 
         try {
-            assertTrue(jsreasons.add(MediaTray.BOTTOM));
-            fail("Method doesn't throw ClassCastException if " +
-                    "adding element isn't JobStateReason");
-        } catch (ClassCastException e) {
-        }
-
-        try {
             assertTrue(jsreasons.add(null));
             fail("Method doesn't throw NullPointerException if " +
                     "adding element is null");

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/PrinterStateReasonsTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/PrinterStateReasonsTest.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/PrinterStateReasonsTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/PrinterStateReasonsTest.java Tue Oct 31 19:58:05 2006
@@ -138,20 +138,6 @@
     }
 
     /*
-     * put(PrinterStateReason reason, Severity severity) method testing.
-     */
-    public final void testPutPrinterStateReasonSeverity() {
-
-        try {
-            reasons = new PrinterStateReasons();
-            reasons.put(PrinterStateReason.MEDIA_LOW, PrintQuality.DRAFT);
-            fail("Metho doesn't throw ClassCastException if " +
-                    "adding value isn't Severity");
-        } catch (ClassCastException e) {
-        }
-    }
-
-    /*
      * printerStateReasonSet(Severity severity) method testing.
      */
     public final void testPrinterStateReasonSet() {



Mime
View raw message