Fix return value of getCategory() and mutability of private variables in RequestedAttributes.java.

2010-04-27  Andrew John Hughes  <ahughes@redhat.com>

	* gnu/javax/print/ipp/IppRequest.java:
	(write(RequestedAttributes)): Fix for change in return value
	of RequestedAttributes.getValues().
	* gnu/javax/print/ipp/attribute/DetailedStatusMessage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/DocumentAccessError.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/RequestedAttributes.java:
	(RequestedAttributes()): Use appropriate generic type with attributes
	ArrayList.
	(getValues()): Return an array-based snapshot of the current state of
	attributes rather than providing direct mutable access to it.
	* gnu/javax/print/ipp/attribute/StatusMessage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/UnknownAttribute.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/MediaDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/SidesDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/AttributesCharset.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobId.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobMoreInfo.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobPrinterUri.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobStateMessage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobUri.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/DocumentFormat.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java:
	(getCategory()): Fix return value.

37 files changed, 127 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index b7e3a9ccd..deaa908d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,84 @@
 2010-04-27  Andrew John Hughes  <ahughes@redhat.com>
 
+	* gnu/javax/print/ipp/IppRequest.java:
+	(write(RequestedAttributes)): Fix for change in return value
+	of RequestedAttributes.getValues().
+	* gnu/javax/print/ipp/attribute/DetailedStatusMessage.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/DocumentAccessError.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/RequestedAttributes.java:
+	(RequestedAttributes()): Use appropriate generic type with attributes
+	ArrayList.
+	(getValues()): Return an array-based snapshot of the current state of
+	attributes rather than providing direct mutable access to it.
+	* gnu/javax/print/ipp/attribute/StatusMessage.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/UnknownAttribute.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/MediaDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/defaults/SidesDefault.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/AttributesCharset.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/JobId.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/JobMoreInfo.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/JobPrinterUri.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/JobStateMessage.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/job/JobUri.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/printer/DocumentFormat.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java:
+	(getCategory()): Fix return value.
+	* gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java:
+	(getCategory()): Fix return value.
+
+2010-04-27  Andrew John Hughes  <ahughes@redhat.com>
+
 	* gnu/javax/print/CupsIppOperation.java,
 	* gnu/javax/print/CupsMediaMapping.java,
 	* gnu/javax/print/CupsPrintService.java,
diff --git a/gnu/javax/print/ipp/IppRequest.java b/gnu/javax/print/ipp/IppRequest.java
index 661f144aa..ae1f2c409 100644
--- a/gnu/javax/print/ipp/IppRequest.java
+++ b/gnu/javax/print/ipp/IppRequest.java
@@ -380,21 +380,21 @@ public class IppRequest
      */
     private void write(RequestedAttributes attribute) throws IOException
     {
-      List values = attribute.getValues();
+      String[] values = attribute.getValues();
 
       String name = ((Attribute) attribute).getName();
       out.writeByte(IppValueTag.KEYWORD);
       out.writeShort(name.length());
       out.write(name.getBytes());
-      out.writeShort(((String) values.get(0)).length());
-      out.write(((String) values.get(0)).getBytes());
+      out.writeShort(values[0].length());
+      out.write(values[0].getBytes());
 
-      for (int i=1; i < values.size(); i++)
+      for (int i=1; i < values.length; i++)
         {
           out.writeByte(IppValueTag.KEYWORD);
           out.writeShort(0x0000); // length for additional value
-          out.writeShort(((String) values.get(i)).length());
-          out.write(((String) values.get(i)).getBytes());
+          out.writeShort(values[i].length());
+          out.write(values[i].getBytes());
         }
     }
 
diff --git a/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java b/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java
index 6d0c2fe39..2d005a82e 100644
--- a/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java
+++ b/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java
@@ -74,7 +74,7 @@ public final class DetailedStatusMessage extends TextSyntax
    *
    * @return The class <code>DetailedStatusMessage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return DetailedStatusMessage.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/DocumentAccessError.java b/gnu/javax/print/ipp/attribute/DocumentAccessError.java
index ad2eedf89..56b55ba76 100644
--- a/gnu/javax/print/ipp/attribute/DocumentAccessError.java
+++ b/gnu/javax/print/ipp/attribute/DocumentAccessError.java
@@ -74,7 +74,7 @@ public final class DocumentAccessError extends TextSyntax
    *
    * @return The class <code>DocumentAccessError</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return DocumentAccessError.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/RequestedAttributes.java b/gnu/javax/print/ipp/attribute/RequestedAttributes.java
index cc2d0cfb0..4c129f6d5 100644
--- a/gnu/javax/print/ipp/attribute/RequestedAttributes.java
+++ b/gnu/javax/print/ipp/attribute/RequestedAttributes.java
@@ -53,7 +53,7 @@ import javax.print.attribute.Attribute;
  */
 public final class RequestedAttributes implements Attribute
 {
-  private ArrayList attributes;
+  private ArrayList<String> attributes;
 
   /**
    * Creates a <code>RequestedAttributes</code> object with
@@ -68,7 +68,7 @@ public final class RequestedAttributes implements Attribute
     if (value == null)
       throw new NullPointerException();
 
-    attributes = new ArrayList();
+    attributes = new ArrayList<String>();
     attributes.add(value);
   }
 
@@ -87,9 +87,9 @@ public final class RequestedAttributes implements Attribute
    *
    * @return The values as list.
    */
-  public List getValues()
+  public String[] getValues()
   {
-    return attributes;
+    return attributes.toArray(new String[attributes.size()]);
   }
 
   /**
@@ -97,7 +97,7 @@ public final class RequestedAttributes implements Attribute
    *
    * @return The class <code>DocumentFormat</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return RequestedAttributes.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/StatusMessage.java b/gnu/javax/print/ipp/attribute/StatusMessage.java
index 78a3136c5..0701008ef 100644
--- a/gnu/javax/print/ipp/attribute/StatusMessage.java
+++ b/gnu/javax/print/ipp/attribute/StatusMessage.java
@@ -73,7 +73,7 @@ public final class StatusMessage extends TextSyntax implements Attribute
    *
    * @return The class <code>StatusMessage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return StatusMessage.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/UnknownAttribute.java b/gnu/javax/print/ipp/attribute/UnknownAttribute.java
index 71bd1a49b..a03beccbe 100644
--- a/gnu/javax/print/ipp/attribute/UnknownAttribute.java
+++ b/gnu/javax/print/ipp/attribute/UnknownAttribute.java
@@ -77,7 +77,7 @@ public final class UnknownAttribute implements Attribute
    *
    * @return The class <code>UnknownAttribute</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return UnknownAttribute.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java b/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java
index 545429281..39d8fe1c0 100644
--- a/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java
@@ -89,7 +89,7 @@ public final class CopiesDefault extends IntegerSyntax
    *
    * @return The class <code>CopiesDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return CopiesDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java b/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java
index dd797c53a..5eff91498 100644
--- a/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java
@@ -77,7 +77,7 @@ public final class DocumentFormatDefault extends TextSyntax
    *
    * @return The class <code>DocumentFormatDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return DocumentFormatDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java b/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java
index f8a9ab1a7..9d4a06002 100644
--- a/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java
@@ -204,7 +204,7 @@ public final class FinishingsDefault extends EnumSyntax
    *
    * @return the class <code>FinishingsDefault</code> itself
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return FinishingsDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java b/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java
index 817d8e6b9..7c29f231c 100644
--- a/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java
@@ -119,7 +119,7 @@ public final class JobHoldUntilDefault extends TextSyntax
    *
    * @return The class <code>JobHoldUntilDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobHoldUntilDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java b/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java
index 93b8061f0..9430250ae 100644
--- a/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java
@@ -90,7 +90,7 @@ public final class JobPriorityDefault extends IntegerSyntax
    *
    * @return The class <code>JobPriorityDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobPriorityDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java b/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java
index 233f90140..6bf027eda 100644
--- a/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java
@@ -87,7 +87,7 @@ public final class JobSheetsDefault extends TextSyntax
    *
    * @return The class <code>JobSheetsDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobSheetsDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java b/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java
index a348fa19a..5945d0b9b 100644
--- a/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java
@@ -76,7 +76,7 @@ public final class MediaDefault extends TextSyntax
    *
    * @return The class <code>MediaDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return MediaDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java b/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java
index 17bb9196e..1563db82c 100644
--- a/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java
@@ -102,7 +102,7 @@ public final class MultipleDocumentHandlingDefault extends EnumSyntax
    *
    * @return The class <code>MultipleDocumentHandlingDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return MultipleDocumentHandlingDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java b/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java
index 40bca19cd..8e2d076d5 100644
--- a/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java
@@ -85,7 +85,7 @@ public final class NumberUpDefault extends IntegerSyntax
    *
    * @return The class <code>NumberUpDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return NumberUpDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java b/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java
index 12d9ebe6d..4563ec525 100644
--- a/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java
@@ -94,7 +94,7 @@ public final class OrientationRequestedDefault extends EnumSyntax
    *
    * @return The class <code>OrientationRequestedDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return OrientationRequestedDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java b/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java
index 62495b31f..7b123eeb4 100644
--- a/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java
@@ -81,7 +81,7 @@ public final class PrintQualityDefault extends EnumSyntax
    *
    * @return The class <code>PrintQualityDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return PrintQualityDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java b/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java
index 811a4648d..2c84b99ba 100644
--- a/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java
@@ -90,7 +90,7 @@ public final class PrinterResolutionDefault extends ResolutionSyntax
    *
    * @return The class <code>PrinterResolutionDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return PrinterResolutionDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java b/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java
index 0645773cf..a50560ae9 100644
--- a/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java
+++ b/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java
@@ -101,7 +101,7 @@ public final class SidesDefault extends EnumSyntax
    *
    * @return The class <code>SidesDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return SidesDefault.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/AttributesCharset.java b/gnu/javax/print/ipp/attribute/job/AttributesCharset.java
index 76847a94a..4fe2ce0d5 100644
--- a/gnu/javax/print/ipp/attribute/job/AttributesCharset.java
+++ b/gnu/javax/print/ipp/attribute/job/AttributesCharset.java
@@ -76,7 +76,7 @@ public final class AttributesCharset extends CharsetSyntax
    *
    * @return The class <code>AttributesCharset</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return AttributesCharset.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java b/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java
index e30859b9a..151cec439 100644
--- a/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java
+++ b/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java
@@ -78,7 +78,7 @@ public final class AttributesNaturalLanguage extends NaturalLanguageSyntax
    *
    * @return The class <code>AttributesNaturalLanguage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return AttributesNaturalLanguage.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java b/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java
index 0b8e262dd..5b83344a9 100644
--- a/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java
+++ b/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java
@@ -73,7 +73,7 @@ public final class JobDetailedStatusMessages
    *
    * @return The class <code>JobDetailedStatusMessages</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobDetailedStatusMessages.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java b/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java
index 2ab4f8734..c3fff057c 100644
--- a/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java
+++ b/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java
@@ -74,7 +74,7 @@ public final class JobDocumentAccessErrors
    *
    * @return The class <code>JobDocumentAccessErrors</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobDocumentAccessErrors.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/JobId.java b/gnu/javax/print/ipp/attribute/job/JobId.java
index bec478f78..78c866723 100644
--- a/gnu/javax/print/ipp/attribute/job/JobId.java
+++ b/gnu/javax/print/ipp/attribute/job/JobId.java
@@ -69,7 +69,7 @@ public final class JobId extends IntegerSyntax implements Attribute
    *
    * @return The class <code>JobId</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobId.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java b/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java
index 394c0e19b..569400f40 100644
--- a/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java
+++ b/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java
@@ -69,7 +69,7 @@ public final class JobMoreInfo extends URISyntax implements Attribute
    *
    * @return The class <code>JobMoreInfo</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobMoreInfo.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java b/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java
index 9ff34f7d2..1375a2419 100644
--- a/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java
+++ b/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java
@@ -69,7 +69,7 @@ public final class JobPrinterUri extends URISyntax implements Attribute
    *
    * @return The class <code>JobPrinterUri</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobPrinterUri.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/JobStateMessage.java b/gnu/javax/print/ipp/attribute/job/JobStateMessage.java
index 51dcfa8ed..d65126621 100644
--- a/gnu/javax/print/ipp/attribute/job/JobStateMessage.java
+++ b/gnu/javax/print/ipp/attribute/job/JobStateMessage.java
@@ -73,7 +73,7 @@ public final class JobStateMessage
    *
    * @return The class <code>JobStateMessage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobStateMessage.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/job/JobUri.java b/gnu/javax/print/ipp/attribute/job/JobUri.java
index 774006f95..4b545b956 100644
--- a/gnu/javax/print/ipp/attribute/job/JobUri.java
+++ b/gnu/javax/print/ipp/attribute/job/JobUri.java
@@ -69,7 +69,7 @@ public final class JobUri extends URISyntax implements Attribute
    *
    * @return The class <code>JobUri</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return JobUri.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java b/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java
index 927d00b99..42430377c 100644
--- a/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java
+++ b/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java
@@ -68,7 +68,7 @@ public final class CharsetConfigured extends CharsetSyntax
    *
    * @return The class <code>CharsetConfigured</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return CharsetConfigured.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java b/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java
index d44910a50..9a5e01e1d 100644
--- a/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java
+++ b/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java
@@ -41,6 +41,7 @@ package gnu.javax.print.ipp.attribute.printer;
 import java.util.Locale;
 
 import javax.print.DocFlavor;
+import javax.print.attribute.Attribute;
 import javax.print.attribute.SupportedValuesAttribute;
 import javax.print.attribute.TextSyntax;
 
@@ -92,7 +93,7 @@ public final class DocumentFormat extends TextSyntax
    *
    * @return The class <code>DocumentFormat</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return DocumentFormat.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java b/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java
index 149f6c1ec..bb00b8891 100644
--- a/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java
+++ b/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java
@@ -68,7 +68,7 @@ public final class MultipleOperationTimeOut extends IntegerSyntax
    *
    * @return The class <code>MultipleOperationTimeOut</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return MultipleOperationTimeOut.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java b/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java
index 90eeebc33..8dc05fe58 100644
--- a/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java
+++ b/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java
@@ -68,7 +68,7 @@ public final class NaturalLanguageConfigured extends NaturalLanguageSyntax
    *
    * @return The class <code>NaturalLanguageConfigured</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return NaturalLanguageConfigured.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java b/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java
index 1e4ade966..361916773 100644
--- a/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java
+++ b/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java
@@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.printer;
 
 import java.util.Date;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
@@ -88,7 +89,7 @@ public final class PrinterCurrentTime extends DateTimeSyntax
    *
    * @return The class <code>PrinterCurrentTime</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return PrinterCurrentTime.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java b/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java
index be9c425c2..28a2f4485 100644
--- a/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java
+++ b/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java
@@ -70,7 +70,7 @@ public final class PrinterDriverInstaller extends URISyntax
    *
    * @return The class <code>PrinterDriverInstaller</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return PrinterDriverInstaller.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java b/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java
index ab59e9687..07c458889 100644
--- a/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java
+++ b/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java
@@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.printer;
 
 import java.util.Locale;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
@@ -75,7 +76,7 @@ public final class PrinterStateMessage extends TextSyntax
    *
    * @return The class <code>PrinterStateMessage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return PrinterStateMessage.class;
   }
diff --git a/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java b/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java
index f5fc1b13a..7bec92ed3 100644
--- a/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java
+++ b/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java
@@ -68,7 +68,7 @@ public final class PrinterUpTime extends IntegerSyntax
    *
    * @return The class <code>PrinterUpTime</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> getCategory()
   {
     return PrinterUpTime.class;
   }