A continutation of the earlier patch, this fixes the remaining return values
of getCategory() implementations in gnu.javax.print.ipp. It also changes the
getValues() method in RequestedAttributes so that mutable access is no longer
provided to the internal list of attributes; an array snapshot is returned
instead.
2010-04-27 Andrew John Hughes <ahug...@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.
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: gnu/javax/print/ipp/IppRequest.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/print/ipp/IppRequest.java,v
retrieving revision 1.6
diff -u -u -r1.6 IppRequest.java
--- gnu/javax/print/ipp/IppRequest.java 27 Apr 2010 21:34:03 -0000 1.6
+++ gnu/javax/print/ipp/IppRequest.java 27 Apr 2010 22:54:45 -0000
@@ -380,21 +380,21 @@
*/
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());
}
}
Index: gnu/javax/print/ipp/attribute/DetailedStatusMessage.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java,v
retrieving revision 1.2
diff -u -u -r1.2 DetailedStatusMessage.java
--- gnu/javax/print/ipp/attribute/DetailedStatusMessage.java 27 Apr 2010
21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/DetailedStatusMessage.java 27 Apr 2010
22:54:45 -0000
@@ -74,7 +74,7 @@
*
* @return The class <code>DetailedStatusMessage</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return DetailedStatusMessage.class;
}
Index: gnu/javax/print/ipp/attribute/DocumentAccessError.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/DocumentAccessError.java,v
retrieving revision 1.2
diff -u -u -r1.2 DocumentAccessError.java
--- gnu/javax/print/ipp/attribute/DocumentAccessError.java 27 Apr 2010
21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/DocumentAccessError.java 27 Apr 2010
22:54:45 -0000
@@ -74,7 +74,7 @@
*
* @return The class <code>DocumentAccessError</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return DocumentAccessError.class;
}
Index: gnu/javax/print/ipp/attribute/RequestedAttributes.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java,v
retrieving revision 1.3
diff -u -u -r1.3 RequestedAttributes.java
--- gnu/javax/print/ipp/attribute/RequestedAttributes.java 27 Apr 2010
21:34:03 -0000 1.3
+++ gnu/javax/print/ipp/attribute/RequestedAttributes.java 27 Apr 2010
22:54:45 -0000
@@ -53,7 +53,7 @@
*/
public final class RequestedAttributes implements Attribute
{
- private ArrayList attributes;
+ private ArrayList<String> attributes;
/**
* Creates a <code>RequestedAttributes</code> object with
@@ -68,7 +68,7 @@
if (value == null)
throw new NullPointerException();
- attributes = new ArrayList();
+ attributes = new ArrayList<String>();
attributes.add(value);
}
@@ -87,9 +87,9 @@
*
* @return The values as list.
*/
- public List getValues()
+ public String[] getValues()
{
- return attributes;
+ return attributes.toArray(new String[attributes.size()]);
}
/**
@@ -97,7 +97,7 @@
*
* @return The class <code>DocumentFormat</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return RequestedAttributes.class;
}
Index: gnu/javax/print/ipp/attribute/StatusMessage.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/StatusMessage.java,v
retrieving revision 1.2
diff -u -u -r1.2 StatusMessage.java
--- gnu/javax/print/ipp/attribute/StatusMessage.java 27 Apr 2010 21:34:03
-0000 1.2
+++ gnu/javax/print/ipp/attribute/StatusMessage.java 27 Apr 2010 22:54:45
-0000
@@ -73,7 +73,7 @@
*
* @return The class <code>StatusMessage</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return StatusMessage.class;
}
Index: gnu/javax/print/ipp/attribute/UnknownAttribute.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/UnknownAttribute.java,v
retrieving revision 1.2
diff -u -u -r1.2 UnknownAttribute.java
--- gnu/javax/print/ipp/attribute/UnknownAttribute.java 27 Apr 2010 21:34:03
-0000 1.2
+++ gnu/javax/print/ipp/attribute/UnknownAttribute.java 27 Apr 2010 22:54:45
-0000
@@ -77,7 +77,7 @@
*
* @return The class <code>UnknownAttribute</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return UnknownAttribute.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 CopiesDefault.java
--- gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java 27 Apr 2010
21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java 27 Apr 2010
22:54:45 -0000
@@ -89,7 +89,7 @@
*
* @return The class <code>CopiesDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return CopiesDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 DocumentFormatDefault.java
--- gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java 27 Apr
2010 21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java 27 Apr
2010 22:54:45 -0000
@@ -77,7 +77,7 @@
*
* @return The class <code>DocumentFormatDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return DocumentFormatDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 FinishingsDefault.java
--- gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java 27 Apr
2010 21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java 27 Apr
2010 22:54:46 -0000
@@ -204,7 +204,7 @@
*
* @return the class <code>FinishingsDefault</code> itself
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return FinishingsDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobHoldUntilDefault.java
--- gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java 27 Apr
2010 21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java 27 Apr
2010 22:54:46 -0000
@@ -119,7 +119,7 @@
*
* @return The class <code>JobHoldUntilDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobHoldUntilDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobPriorityDefault.java
--- gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java 27 Apr
2010 21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java 27 Apr
2010 22:54:46 -0000
@@ -90,7 +90,7 @@
*
* @return The class <code>JobPriorityDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobPriorityDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobSheetsDefault.java
--- gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java 27 Apr
2010 21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java 27 Apr
2010 22:54:46 -0000
@@ -87,7 +87,7 @@
*
* @return The class <code>JobSheetsDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobSheetsDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/MediaDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 MediaDefault.java
--- gnu/javax/print/ipp/attribute/defaults/MediaDefault.java 27 Apr 2010
21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/MediaDefault.java 27 Apr 2010
22:54:46 -0000
@@ -76,7 +76,7 @@
*
* @return The class <code>MediaDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return MediaDefault.class;
}
Index:
gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 MultipleDocumentHandlingDefault.java
--- gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java
27 Apr 2010 21:34:03 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java
27 Apr 2010 22:54:46 -0000
@@ -102,7 +102,7 @@
*
* @return The class <code>MultipleDocumentHandlingDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return MultipleDocumentHandlingDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 NumberUpDefault.java
--- gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java 27 Apr 2010
21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java 27 Apr 2010
22:54:46 -0000
@@ -85,7 +85,7 @@
*
* @return The class <code>NumberUpDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return NumberUpDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 OrientationRequestedDefault.java
--- gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java
27 Apr 2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java
27 Apr 2010 22:54:46 -0000
@@ -94,7 +94,7 @@
*
* @return The class <code>OrientationRequestedDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return OrientationRequestedDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 PrintQualityDefault.java
--- gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java 27 Apr
2010 22:54:46 -0000
@@ -81,7 +81,7 @@
*
* @return The class <code>PrintQualityDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return PrintQualityDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 PrinterResolutionDefault.java
--- gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java
27 Apr 2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java
27 Apr 2010 22:54:46 -0000
@@ -90,7 +90,7 @@
*
* @return The class <code>PrinterResolutionDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return PrinterResolutionDefault.class;
}
Index: gnu/javax/print/ipp/attribute/defaults/SidesDefault.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java,v
retrieving revision 1.2
diff -u -u -r1.2 SidesDefault.java
--- gnu/javax/print/ipp/attribute/defaults/SidesDefault.java 27 Apr 2010
21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/defaults/SidesDefault.java 27 Apr 2010
22:54:46 -0000
@@ -101,7 +101,7 @@
*
* @return The class <code>SidesDefault</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return SidesDefault.class;
}
Index: gnu/javax/print/ipp/attribute/job/AttributesCharset.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/AttributesCharset.java,v
retrieving revision 1.2
diff -u -u -r1.2 AttributesCharset.java
--- gnu/javax/print/ipp/attribute/job/AttributesCharset.java 27 Apr 2010
21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/job/AttributesCharset.java 27 Apr 2010
22:54:46 -0000
@@ -76,7 +76,7 @@
*
* @return The class <code>AttributesCharset</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return AttributesCharset.class;
}
Index: gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java,v
retrieving revision 1.2
diff -u -u -r1.2 AttributesNaturalLanguage.java
--- gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java 27 Apr
2010 22:54:46 -0000
@@ -78,7 +78,7 @@
*
* @return The class <code>AttributesNaturalLanguage</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return AttributesNaturalLanguage.class;
}
Index: gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobDetailedStatusMessages.java
--- gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java 27 Apr
2010 22:54:46 -0000
@@ -73,7 +73,7 @@
*
* @return The class <code>JobDetailedStatusMessages</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobDetailedStatusMessages.class;
}
Index: gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobDocumentAccessErrors.java
--- gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java 27 Apr
2010 22:54:46 -0000
@@ -74,7 +74,7 @@
*
* @return The class <code>JobDocumentAccessErrors</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobDocumentAccessErrors.class;
}
Index: gnu/javax/print/ipp/attribute/job/JobId.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/JobId.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobId.java
--- gnu/javax/print/ipp/attribute/job/JobId.java 27 Apr 2010 21:34:04
-0000 1.2
+++ gnu/javax/print/ipp/attribute/job/JobId.java 27 Apr 2010 22:54:46
-0000
@@ -69,7 +69,7 @@
*
* @return The class <code>JobId</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobId.class;
}
Index: gnu/javax/print/ipp/attribute/job/JobMoreInfo.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobMoreInfo.java
--- gnu/javax/print/ipp/attribute/job/JobMoreInfo.java 27 Apr 2010 21:34:04
-0000 1.2
+++ gnu/javax/print/ipp/attribute/job/JobMoreInfo.java 27 Apr 2010 22:54:46
-0000
@@ -69,7 +69,7 @@
*
* @return The class <code>JobMoreInfo</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobMoreInfo.class;
}
Index: gnu/javax/print/ipp/attribute/job/JobPrinterUri.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobPrinterUri.java
--- gnu/javax/print/ipp/attribute/job/JobPrinterUri.java 27 Apr 2010
21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/job/JobPrinterUri.java 27 Apr 2010
22:54:46 -0000
@@ -69,7 +69,7 @@
*
* @return The class <code>JobPrinterUri</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobPrinterUri.class;
}
Index: gnu/javax/print/ipp/attribute/job/JobStateMessage.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/JobStateMessage.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobStateMessage.java
--- gnu/javax/print/ipp/attribute/job/JobStateMessage.java 27 Apr 2010
21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/job/JobStateMessage.java 27 Apr 2010
22:54:46 -0000
@@ -73,7 +73,7 @@
*
* @return The class <code>JobStateMessage</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobStateMessage.class;
}
Index: gnu/javax/print/ipp/attribute/job/JobUri.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/job/JobUri.java,v
retrieving revision 1.2
diff -u -u -r1.2 JobUri.java
--- gnu/javax/print/ipp/attribute/job/JobUri.java 27 Apr 2010 21:34:04
-0000 1.2
+++ gnu/javax/print/ipp/attribute/job/JobUri.java 27 Apr 2010 22:54:46
-0000
@@ -69,7 +69,7 @@
*
* @return The class <code>JobUri</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return JobUri.class;
}
Index: gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java,v
retrieving revision 1.2
diff -u -u -r1.2 CharsetConfigured.java
--- gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java 27 Apr
2010 22:54:46 -0000
@@ -68,7 +68,7 @@
*
* @return The class <code>CharsetConfigured</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return CharsetConfigured.class;
}
Index: gnu/javax/print/ipp/attribute/printer/DocumentFormat.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java,v
retrieving revision 1.2
diff -u -u -r1.2 DocumentFormat.java
--- gnu/javax/print/ipp/attribute/printer/DocumentFormat.java 27 Apr 2010
21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/printer/DocumentFormat.java 27 Apr 2010
22:54:46 -0000
@@ -41,6 +41,7 @@
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 @@
*
* @return The class <code>DocumentFormat</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return DocumentFormat.class;
}
Index: gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java,v
retrieving revision 1.2
diff -u -u -r1.2 MultipleOperationTimeOut.java
--- gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java 27 Apr
2010 22:54:46 -0000
@@ -68,7 +68,7 @@
*
* @return The class <code>MultipleOperationTimeOut</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return MultipleOperationTimeOut.class;
}
Index: gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java,v
retrieving revision 1.2
diff -u -u -r1.2 NaturalLanguageConfigured.java
--- gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java
27 Apr 2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java
27 Apr 2010 22:54:46 -0000
@@ -68,7 +68,7 @@
*
* @return The class <code>NaturalLanguageConfigured</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return NaturalLanguageConfigured.class;
}
Index: gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java,v
retrieving revision 1.2
diff -u -u -r1.2 PrinterCurrentTime.java
--- gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java 27 Apr
2010 22:54:46 -0000
@@ -40,6 +40,7 @@
import java.util.Date;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -88,7 +89,7 @@
*
* @return The class <code>PrinterCurrentTime</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return PrinterCurrentTime.class;
}
Index: gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java,v
retrieving revision 1.2
diff -u -u -r1.2 PrinterDriverInstaller.java
--- gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java 27 Apr
2010 22:54:46 -0000
@@ -70,7 +70,7 @@
*
* @return The class <code>PrinterDriverInstaller</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return PrinterDriverInstaller.class;
}
Index: gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java,v
retrieving revision 1.2
diff -u -u -r1.2 PrinterStateMessage.java
--- gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java 27 Apr
2010 21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java 27 Apr
2010 22:54:46 -0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -75,7 +76,7 @@
*
* @return The class <code>PrinterStateMessage</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return PrinterStateMessage.class;
}
Index: gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java,v
retrieving revision 1.2
diff -u -u -r1.2 PrinterUpTime.java
--- gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java 27 Apr 2010
21:34:04 -0000 1.2
+++ gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java 27 Apr 2010
22:54:46 -0000
@@ -68,7 +68,7 @@
*
* @return The class <code>PrinterUpTime</code> itself.
*/
- public Class getCategory()
+ public Class<? extends Attribute> getCategory()
{
return PrinterUpTime.class;
}
