[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] [generics] Patch: FYI: generics in javax.print
|
From: |
Tom Tromey |
|
Subject: |
[cp-patches] [generics] Patch: FYI: generics in javax.print |
|
Date: |
09 Dec 2005 16:43:15 -0700 |
I'm checking this in on the generics branch.
This genericizes a bunch of return types in javax.print.attribute.
I made 90% of this patch with a single refactoring in Eclipse, fun :-)
Tom
2005-12-09 Tom Tromey <address@hidden>
* javax/print/attribute/standard/Chromaticity.java
(getCategory): Genericized.
* javax/print/attribute/standard/ColorSupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/Compression.java
(getCategory): Genericized.
* javax/print/attribute/standard/Copies.java
(getCategory): Genericized.
* javax/print/attribute/standard/CopiesSupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/DateTimeAtCompleted.java
(getCategory): Genericized.
* javax/print/attribute/standard/DateTimeAtCreation.java
(getCategory): Genericized.
* javax/print/attribute/standard/DateTimeAtProcessing.java
(getCategory): Genericized.
* javax/print/attribute/standard/Destination.java
(getCategory): Genericized.
* javax/print/attribute/standard/DocumentName.java
(getCategory): Genericized.
* javax/print/attribute/standard/Fidelity.java
(getCategory): Genericized.
* javax/print/attribute/standard/Finishings.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobHoldUntil.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobImpressions.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobImpressionsCompleted.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobImpressionsSupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobKOctets.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobKOctetsProcessed.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobKOctetsSupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobMediaSheets.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobMediaSheetsCompleted.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobMediaSheetsSupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobMessageFromOperator.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobName.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobOriginatingUserName.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobPriority.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobPrioritySupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobSheets.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobState.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobStateReason.java
(getCategory): Genericized.
* javax/print/attribute/standard/JobStateReasons.java
(getCategory): Genericized.
* javax/print/attribute/standard/Media.java
(getCategory): Genericized.
* javax/print/attribute/standard/MediaPrintableArea.java
(getCategory): Genericized.
* javax/print/attribute/standard/MediaSize.java
(getCategory): Genericized.
* javax/print/attribute/standard/MultipleDocumentHandling.java
(getCategory): Genericized.
* javax/print/attribute/standard/NumberOfDocuments.java
(getCategory): Genericized.
* javax/print/attribute/standard/NumberOfInterveningJobs.java
(getCategory): Genericized.
* javax/print/attribute/standard/NumberUp.java
(getCategory): Genericized.
* javax/print/attribute/standard/NumberUpSupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/OrientationRequested.java
(getCategory): Genericized.
* javax/print/attribute/standard/OutputDeviceAssigned.java
(getCategory): Genericized.
* javax/print/attribute/standard/PDLOverrideSupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/PageRanges.java
(getCategory): Genericized.
* javax/print/attribute/standard/PagesPerMinute.java
(getCategory): Genericized.
* javax/print/attribute/standard/PagesPerMinuteColor.java
(getCategory): Genericized.
* javax/print/attribute/standard/PresentationDirection.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrintQuality.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterInfo.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterIsAcceptingJobs.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterLocation.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterMakeAndModel.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterMessageFromOperator.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterMoreInfo.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterName.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterResolution.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterState.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterStateReason.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterStateReasons.java
(getCategory): Genericized.
* javax/print/attribute/standard/PrinterURI.java
(getCategory): Genericized.
* javax/print/attribute/standard/QueuedJobCount.java
(getCategory): Genericized.
* javax/print/attribute/standard/ReferenceUriSchemesSupported.java
(getCategory): Genericized.
* javax/print/attribute/standard/RequestingUserName.java
(getCategory): Genericized.
* javax/print/attribute/standard/Severity.java
(getCategory): Genericized.
* javax/print/attribute/standard/SheetCollate.java
(getCategory): Genericized.
* javax/print/attribute/standard/Sides.java
(getCategory): Genericized.
* javax/print/attribute/HashAttributeSet.java (get): Genericized.
(remove): Likewise.
* javax/print/attribute/Attribute.java (getCategory): Fixed return
type.
Index: javax/print/attribute/Attribute.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/Attribute.java,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 Attribute.java
--- javax/print/attribute/Attribute.java 7 Dec 2005 00:53:54 -0000
1.2.2.3
+++ javax/print/attribute/Attribute.java 9 Dec 2005 23:29:40 -0000
@@ -52,7 +52,7 @@
*
* @return The concrete address@hidden Class} instance of the attribute
class.
*/
- Class<?> getCategory ();
+ Class< ? extends Attribute> getCategory ();
/**
* Returns the descriptive name of the attribute category.
Index: javax/print/attribute/HashAttributeSet.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/HashAttributeSet.java,v
retrieving revision 1.3.2.3
diff -u -r1.3.2.3 HashAttributeSet.java
--- javax/print/attribute/HashAttributeSet.java 7 Dec 2005 00:53:54 -0000
1.3.2.3
+++ javax/print/attribute/HashAttributeSet.java 9 Dec 2005 23:29:40 -0000
@@ -298,7 +298,7 @@
* @throws ClassCastException if category is not implementing
* <code>Attribute</code>.
*/
- public Attribute get(Class category)
+ public Attribute get(Class<?> category)
{
if (category == null)
throw new NullPointerException("category may not be null");
@@ -356,7 +356,7 @@
* @return <code>true</code> if an attribute is removed, false in all other
cases.
* @throws UnmodifiableSetException if the set does not support modification.
*/
- public boolean remove(Class category)
+ public boolean remove(Class<?> category)
{
if (category == null)
return false;
Index: javax/print/attribute/standard/Chromaticity.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Chromaticity.java,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 Chromaticity.java
--- javax/print/attribute/standard/Chromaticity.java 2 Aug 2005 20:12:36
-0000 1.1.2.3
+++ javax/print/attribute/standard/Chromaticity.java 9 Dec 2005 23:29:40
-0000
@@ -38,6 +38,7 @@
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;
@@ -69,7 +70,7 @@
*
* @return the class <code>Sides</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Chromaticity.class;
}
Index: javax/print/attribute/standard/ColorSupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/ColorSupported.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 ColorSupported.java
--- javax/print/attribute/standard/ColorSupported.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/ColorSupported.java 9 Dec 2005 23:29:40
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -67,7 +68,7 @@
*
* @return the class <code>ColorSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return ColorSupported.class;
}
Index: javax/print/attribute/standard/Compression.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Compression.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 Compression.java
--- javax/print/attribute/standard/Compression.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/Compression.java 9 Dec 2005 23:29:40
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.EnumSyntax;
@@ -69,7 +70,7 @@
*
* @return the class <code>Compression</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Compression.class;
}
Index: javax/print/attribute/standard/Copies.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Copies.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 Copies.java
--- javax/print/attribute/standard/Copies.java 2 Aug 2005 20:12:36 -0000
1.2.2.2
+++ javax/print/attribute/standard/Copies.java 9 Dec 2005 23:29:40 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
@@ -84,7 +85,7 @@
*
* @return the class <code>Copies</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Copies.class;
}
Index: javax/print/attribute/standard/CopiesSupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/CopiesSupported.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 CopiesSupported.java
--- javax/print/attribute/standard/CopiesSupported.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/CopiesSupported.java 9 Dec 2005 23:29:40
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -70,7 +71,7 @@
*
* @return the class <code>CopiesSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return CopiesSupported.class;
}
Index: javax/print/attribute/standard/DateTimeAtCompleted.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/DateTimeAtCompleted.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 DateTimeAtCompleted.java
--- javax/print/attribute/standard/DateTimeAtCompleted.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/DateTimeAtCompleted.java 9 Dec 2005
23:29:40 -0000
@@ -40,6 +40,7 @@
import java.util.Date;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>DateTimeAtCompleted</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return DateTimeAtCompleted.class;
}
Index: javax/print/attribute/standard/DateTimeAtCreation.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/DateTimeAtCreation.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 DateTimeAtCreation.java
--- javax/print/attribute/standard/DateTimeAtCreation.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/DateTimeAtCreation.java 9 Dec 2005
23:29:40 -0000
@@ -40,6 +40,7 @@
import java.util.Date;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>DateTimeAtCreation</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return DateTimeAtCreation.class;
}
Index: javax/print/attribute/standard/DateTimeAtProcessing.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/DateTimeAtProcessing.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 DateTimeAtProcessing.java
--- javax/print/attribute/standard/DateTimeAtProcessing.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/DateTimeAtProcessing.java 9 Dec 2005
23:29:40 -0000
@@ -40,6 +40,7 @@
import java.util.Date;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>DateTimeAtProcessing</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return DateTimeAtProcessing.class;
}
Index: javax/print/attribute/standard/Destination.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Destination.java,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 Destination.java
--- javax/print/attribute/standard/Destination.java 2 Aug 2005 20:12:36
-0000 1.1.2.3
+++ javax/print/attribute/standard/Destination.java 9 Dec 2005 23:29:40
-0000
@@ -40,6 +40,7 @@
import java.net.URI;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
import javax.print.attribute.URISyntax;
@@ -65,7 +66,7 @@
*
* @return the class <code>Destination</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Destination.class;
}
Index: javax/print/attribute/standard/DocumentName.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/DocumentName.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 DocumentName.java
--- javax/print/attribute/standard/DocumentName.java 2 Aug 2005 20:12:36
-0000 1.3.2.2
+++ javax/print/attribute/standard/DocumentName.java 9 Dec 2005 23:29:40
-0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.TextSyntax;
@@ -83,7 +84,7 @@
*
* @return the class <code>DocumentName</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return DocumentName.class;
}
Index: javax/print/attribute/standard/Fidelity.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Fidelity.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 Fidelity.java
--- javax/print/attribute/standard/Fidelity.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/Fidelity.java 9 Dec 2005 23:29:40
-0000
@@ -37,6 +37,7 @@
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;
@@ -68,7 +69,7 @@
*
* @return the class <code>Fidelity</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Fidelity.class;
}
Index: javax/print/attribute/standard/Finishings.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Finishings.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 Finishings.java
--- javax/print/attribute/standard/Finishings.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/Finishings.java 9 Dec 2005 23:29:40
-0000
@@ -37,6 +37,7 @@
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;
@@ -85,7 +86,7 @@
*
* @return the class <code>Finishings</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Finishings.class;
}
Index: javax/print/attribute/standard/JobHoldUntil.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobHoldUntil.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobHoldUntil.java
--- javax/print/attribute/standard/JobHoldUntil.java 2 Aug 2005 20:12:36
-0000 1.3.2.2
+++ javax/print/attribute/standard/JobHoldUntil.java 9 Dec 2005 23:29:40
-0000
@@ -40,6 +40,7 @@
import java.util.Date;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
@@ -84,7 +85,7 @@
*
* @return the class <code>JobHoldUntil</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobHoldUntil.class;
}
Index: javax/print/attribute/standard/JobImpressions.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobImpressions.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobImpressions.java
--- javax/print/attribute/standard/JobImpressions.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/JobImpressions.java 9 Dec 2005 23:29:40
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
@@ -84,7 +85,7 @@
*
* @return the class <code>JobImpressions</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobImpressions.class;
}
Index: javax/print/attribute/standard/JobImpressionsCompleted.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobImpressionsCompleted.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobImpressionsCompleted.java
--- javax/print/attribute/standard/JobImpressionsCompleted.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/JobImpressionsCompleted.java 9 Dec 2005
23:29:40 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>JobImpressionsCompleted</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobImpressionsCompleted.class;
}
Index: javax/print/attribute/standard/JobImpressionsSupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobImpressionsSupported.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobImpressionsSupported.java
--- javax/print/attribute/standard/JobImpressionsSupported.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/JobImpressionsSupported.java 9 Dec 2005
23:29:41 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -62,7 +63,7 @@
*
* @return the class <code>JobImpressionsSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobImpressionsSupported.class;
}
Index: javax/print/attribute/standard/JobKOctets.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobKOctets.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobKOctets.java
--- javax/print/attribute/standard/JobKOctets.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/JobKOctets.java 9 Dec 2005 23:29:41
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
@@ -84,7 +85,7 @@
*
* @return the class <code>JobKOctets</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobKOctets.class;
}
Index: javax/print/attribute/standard/JobKOctetsProcessed.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobKOctetsProcessed.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobKOctetsProcessed.java
--- javax/print/attribute/standard/JobKOctetsProcessed.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/JobKOctetsProcessed.java 9 Dec 2005
23:29:41 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>JobKOctetsProcessed</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobKOctetsProcessed.class;
}
Index: javax/print/attribute/standard/JobKOctetsSupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobKOctetsSupported.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobKOctetsSupported.java
--- javax/print/attribute/standard/JobKOctetsSupported.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/JobKOctetsSupported.java 9 Dec 2005
23:29:41 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -62,7 +63,7 @@
*
* @return the class <code>ColorSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobKOctetsSupported.class;
}
Index: javax/print/attribute/standard/JobMediaSheets.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobMediaSheets.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobMediaSheets.java
--- javax/print/attribute/standard/JobMediaSheets.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/JobMediaSheets.java 9 Dec 2005 23:29:41
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
@@ -84,7 +85,7 @@
*
* @return the class <code>JobMediaSheets</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobMediaSheets.class;
}
Index: javax/print/attribute/standard/JobMediaSheetsCompleted.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobMediaSheetsCompleted.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobMediaSheetsCompleted.java
--- javax/print/attribute/standard/JobMediaSheetsCompleted.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/JobMediaSheetsCompleted.java 9 Dec 2005
23:29:41 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>JobMediaSheetsCompleted</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobMediaSheetsCompleted.class;
}
Index: javax/print/attribute/standard/JobMediaSheetsSupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobMediaSheetsSupported.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobMediaSheetsSupported.java
--- javax/print/attribute/standard/JobMediaSheetsSupported.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/JobMediaSheetsSupported.java 9 Dec 2005
23:29:41 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -62,7 +63,7 @@
*
* @return the class <code>JobMediaSheetsSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobMediaSheetsSupported.class;
}
Index: javax/print/attribute/standard/JobMessageFromOperator.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobMessageFromOperator.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobMessageFromOperator.java
--- javax/print/attribute/standard/JobMessageFromOperator.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/JobMessageFromOperator.java 9 Dec 2005
23:29:41 -0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
@@ -83,7 +84,7 @@
*
* @return the class <code>JobMessageFromOperator</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobMessageFromOperator.class;
}
Index: javax/print/attribute/standard/JobName.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobName.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobName.java
--- javax/print/attribute/standard/JobName.java 2 Aug 2005 20:12:36 -0000
1.3.2.2
+++ javax/print/attribute/standard/JobName.java 9 Dec 2005 23:29:41 -0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
import javax.print.attribute.TextSyntax;
@@ -84,7 +85,7 @@
*
* @return the class <code>JobName</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobName.class;
}
Index: javax/print/attribute/standard/JobOriginatingUserName.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobOriginatingUserName.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobOriginatingUserName.java
--- javax/print/attribute/standard/JobOriginatingUserName.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/JobOriginatingUserName.java 9 Dec 2005
23:29:41 -0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
@@ -83,7 +84,7 @@
*
* @return the class <code>JobOriginatingUserName</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobOriginatingUserName.class;
}
Index: javax/print/attribute/standard/JobPriority.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobPriority.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobPriority.java
--- javax/print/attribute/standard/JobPriority.java 2 Aug 2005 20:12:36
-0000 1.3.2.2
+++ javax/print/attribute/standard/JobPriority.java 9 Dec 2005 23:29:41
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
@@ -85,7 +86,7 @@
*
* @return the class <code>JobPriority</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobPriority.class;
}
Index: javax/print/attribute/standard/JobPrioritySupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobPrioritySupported.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 JobPrioritySupported.java
--- javax/print/attribute/standard/JobPrioritySupported.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/JobPrioritySupported.java 9 Dec 2005
23:29:41 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -84,7 +85,7 @@
*
* @return the class <code>JobPrioritySupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobPrioritySupported.class;
}
Index: javax/print/attribute/standard/JobSheets.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobSheets.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobSheets.java
--- javax/print/attribute/standard/JobSheets.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/JobSheets.java 9 Dec 2005 23:29:41
-0000
@@ -37,6 +37,7 @@
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;
@@ -66,7 +67,7 @@
*
* @return the class <code>JobSheets</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobSheets.class;
}
Index: javax/print/attribute/standard/JobState.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobState.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobState.java
--- javax/print/attribute/standard/JobState.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/JobState.java 9 Dec 2005 23:29:41
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -71,7 +72,7 @@
*
* @return the class <code>JobState</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobState.class;
}
Index: javax/print/attribute/standard/JobStateReason.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobStateReason.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 JobStateReason.java
--- javax/print/attribute/standard/JobStateReason.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/JobStateReason.java 9 Dec 2005 23:29:41
-0000
@@ -92,7 +92,7 @@
*
* @return the class <code>JobStateReason</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobStateReason.class;
}
Index: javax/print/attribute/standard/JobStateReasons.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/JobStateReasons.java,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 JobStateReasons.java
--- javax/print/attribute/standard/JobStateReasons.java 27 Nov 2005 22:17:21
-0000 1.2.2.3
+++ javax/print/attribute/standard/JobStateReasons.java 9 Dec 2005 23:29:41
-0000
@@ -40,6 +40,7 @@
import java.util.HashSet;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
/**
@@ -55,7 +56,7 @@
*
* @return the class <code>ColorSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobStateReasons.class;
}
Index: javax/print/attribute/standard/Media.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Media.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 Media.java
--- javax/print/attribute/standard/Media.java 2 Aug 2005 20:12:36 -0000
1.2.2.2
+++ javax/print/attribute/standard/Media.java 9 Dec 2005 23:29:41 -0000
@@ -37,6 +37,7 @@
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;
@@ -64,7 +65,7 @@
*
* @return the class <code>Media</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Media.class;
}
Index: javax/print/attribute/standard/MediaPrintableArea.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/MediaPrintableArea.java,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 MediaPrintableArea.java
--- javax/print/attribute/standard/MediaPrintableArea.java 2 Aug 2005
20:12:36 -0000 1.1.2.2
+++ javax/print/attribute/standard/MediaPrintableArea.java 9 Dec 2005
23:29:42 -0000
@@ -38,6 +38,7 @@
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;
@@ -97,7 +98,7 @@
*
* @return the class <code>MediaPrintableArea</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return MediaPrintableArea.class;
}
Index: javax/print/attribute/standard/MediaSize.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/MediaSize.java,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 MediaSize.java
--- javax/print/attribute/standard/MediaSize.java 27 Nov 2005 21:00:37
-0000 1.1.2.3
+++ javax/print/attribute/standard/MediaSize.java 9 Dec 2005 23:29:42
-0000
@@ -79,7 +79,7 @@
*
* @return the class <code>MediaSize</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return MediaSize.class;
}
Index: javax/print/attribute/standard/MultipleDocumentHandling.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 MultipleDocumentHandling.java
--- javax/print/attribute/standard/MultipleDocumentHandling.java 2 Aug
2005 20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/MultipleDocumentHandling.java 9 Dec
2005 23:29:42 -0000
@@ -37,6 +37,7 @@
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;
@@ -72,7 +73,7 @@
*
* @return the class <code>MultipleDocumentHandling</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return MultipleDocumentHandling.class;
}
Index: javax/print/attribute/standard/NumberOfDocuments.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/NumberOfDocuments.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 NumberOfDocuments.java
--- javax/print/attribute/standard/NumberOfDocuments.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/NumberOfDocuments.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>NumberOfDocuments</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return NumberOfDocuments.class;
}
Index: javax/print/attribute/standard/NumberOfInterveningJobs.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/NumberOfInterveningJobs.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 NumberOfInterveningJobs.java
--- javax/print/attribute/standard/NumberOfInterveningJobs.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/NumberOfInterveningJobs.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>NumberOfInterveningJobs</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return NumberOfInterveningJobs.class;
}
Index: javax/print/attribute/standard/NumberUp.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/NumberUp.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 NumberUp.java
--- javax/print/attribute/standard/NumberUp.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/NumberUp.java 9 Dec 2005 23:29:42
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>NumberUp</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return NumberUp.class;
}
Index: javax/print/attribute/standard/NumberUpSupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/NumberUpSupported.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 NumberUpSupported.java
--- javax/print/attribute/standard/NumberUpSupported.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/NumberUpSupported.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -78,7 +79,7 @@
*
* @return the class <code>NumberUpSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return NumberUpSupported.class;
}
Index: javax/print/attribute/standard/OrientationRequested.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/OrientationRequested.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 OrientationRequested.java
--- javax/print/attribute/standard/OrientationRequested.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/OrientationRequested.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
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;
@@ -73,7 +74,7 @@
*
* @return the class <code>OrientationRequested</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return OrientationRequested.class;
}
Index: javax/print/attribute/standard/OutputDeviceAssigned.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 OutputDeviceAssigned.java
--- javax/print/attribute/standard/OutputDeviceAssigned.java 2 Aug 2005
20:12:36 -0000 1.4.2.2
+++ javax/print/attribute/standard/OutputDeviceAssigned.java 9 Dec 2005
23:29:42 -0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
@@ -83,7 +84,7 @@
*
* @return the class <code>OutputDeviceAssigned</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return OutputDeviceAssigned.class;
}
Index: javax/print/attribute/standard/PDLOverrideSupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PDLOverrideSupported.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PDLOverrideSupported.java
--- javax/print/attribute/standard/PDLOverrideSupported.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/PDLOverrideSupported.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -67,7 +68,7 @@
*
* @return the class <code>PDLOverrideSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PDLOverrideSupported.class;
}
Index: javax/print/attribute/standard/PageRanges.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PageRanges.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PageRanges.java
--- javax/print/attribute/standard/PageRanges.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/PageRanges.java 9 Dec 2005 23:29:42
-0000
@@ -38,6 +38,7 @@
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;
@@ -80,7 +81,7 @@
*
* @return the class <code>PageRanges</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PageRanges.class;
}
Index: javax/print/attribute/standard/PagesPerMinute.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PagesPerMinute.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PagesPerMinute.java
--- javax/print/attribute/standard/PagesPerMinute.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/PagesPerMinute.java 9 Dec 2005 23:29:42
-0000
@@ -38,6 +38,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -84,7 +85,7 @@
*
* @return the class <code>PagesPerMinute</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PagesPerMinute.class;
}
Index: javax/print/attribute/standard/PagesPerMinuteColor.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PagesPerMinuteColor.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PagesPerMinuteColor.java
--- javax/print/attribute/standard/PagesPerMinuteColor.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/PagesPerMinuteColor.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>PagesPerMinuteColor</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PagesPerMinuteColor.class;
}
Index: javax/print/attribute/standard/PresentationDirection.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PresentationDirection.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 PresentationDirection.java
--- javax/print/attribute/standard/PresentationDirection.java 2 Aug 2005
20:12:36 -0000 1.2.2.1
+++ javax/print/attribute/standard/PresentationDirection.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
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;
@@ -80,7 +81,7 @@
*
* @return the class <code>PresentationDirection</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PresentationDirection.class;
}
Index: javax/print/attribute/standard/PrintQuality.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrintQuality.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrintQuality.java
--- javax/print/attribute/standard/PrintQuality.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/PrintQuality.java 9 Dec 2005 23:29:42
-0000
@@ -37,6 +37,7 @@
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;
@@ -68,7 +69,7 @@
*
* @return the class <code>PrintQuality</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrintQuality.class;
}
Index: javax/print/attribute/standard/PrinterInfo.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterInfo.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterInfo.java
--- javax/print/attribute/standard/PrinterInfo.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterInfo.java 9 Dec 2005 23:29:42
-0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -84,7 +85,7 @@
*
* @return the class <code>PrinterInfo</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterInfo.class;
}
Index: javax/print/attribute/standard/PrinterIsAcceptingJobs.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterIsAcceptingJobs.java
--- javax/print/attribute/standard/PrinterIsAcceptingJobs.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterIsAcceptingJobs.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -67,7 +68,7 @@
*
* @return the class <code>PrinterIsAcceptingJobs</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterIsAcceptingJobs.class;
}
Index: javax/print/attribute/standard/PrinterLocation.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterLocation.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterLocation.java
--- javax/print/attribute/standard/PrinterLocation.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterLocation.java 9 Dec 2005 23:29:42
-0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -84,7 +85,7 @@
*
* @return the class <code>PrinterLocation</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterLocation.class;
}
Index: javax/print/attribute/standard/PrinterMakeAndModel.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterMakeAndModel.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterMakeAndModel.java
--- javax/print/attribute/standard/PrinterMakeAndModel.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterMakeAndModel.java 9 Dec 2005
23:29:42 -0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -84,7 +85,7 @@
*
* @return the class <code>PrinterMakeAndModel</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterMakeAndModel.class;
}
Index: javax/print/attribute/standard/PrinterMessageFromOperator.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterMessageFromOperator.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterMessageFromOperator.java
--- javax/print/attribute/standard/PrinterMessageFromOperator.java 2 Aug
2005 20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterMessageFromOperator.java 9 Dec
2005 23:29:42 -0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -84,7 +85,7 @@
*
* @return the class <code>PrinterMessageFromOperator</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterMessageFromOperator.class;
}
Index: javax/print/attribute/standard/PrinterMoreInfo.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterMoreInfo.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterMoreInfo.java
--- javax/print/attribute/standard/PrinterMoreInfo.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterMoreInfo.java 9 Dec 2005 23:29:42
-0000
@@ -40,6 +40,7 @@
import java.net.URI;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.URISyntax;
@@ -64,7 +65,7 @@
*
* @return the class <code>PrinterMoreInfo</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterMoreInfo.class;
}
Index: javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterMoreInfoManufacturer.java
--- javax/print/attribute/standard/PrinterMoreInfoManufacturer.java 2 Aug
2005 20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterMoreInfoManufacturer.java 9 Dec
2005 23:29:42 -0000
@@ -40,6 +40,7 @@
import java.net.URI;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.URISyntax;
@@ -64,7 +65,7 @@
*
* @return the class <code>PrinterMoreInfoManufacturer</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterMoreInfoManufacturer.class;
}
Index: javax/print/attribute/standard/PrinterName.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterName.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterName.java
--- javax/print/attribute/standard/PrinterName.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterName.java 9 Dec 2005 23:29:42
-0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -84,7 +85,7 @@
*
* @return the class <code>PrinterName</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterName.class;
}
Index: javax/print/attribute/standard/PrinterResolution.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterResolution.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 PrinterResolution.java
--- javax/print/attribute/standard/PrinterResolution.java 2 Aug 2005
20:12:36 -0000 1.2.2.1
+++ javax/print/attribute/standard/PrinterResolution.java 9 Dec 2005
23:29:42 -0000
@@ -37,6 +37,7 @@
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;
@@ -65,7 +66,7 @@
*
* @return the class <code>PrinterResolution</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterResolution.class;
}
Index: javax/print/attribute/standard/PrinterState.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterState.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 PrinterState.java
--- javax/print/attribute/standard/PrinterState.java 2 Aug 2005 20:12:36
-0000 1.2.2.1
+++ javax/print/attribute/standard/PrinterState.java 9 Dec 2005 23:29:42
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -67,7 +68,7 @@
*
* @return the class <code>PrinterState</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterState.class;
}
Index: javax/print/attribute/standard/PrinterStateReason.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterStateReason.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterStateReason.java
--- javax/print/attribute/standard/PrinterStateReason.java 2 Aug 2005
20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterStateReason.java 9 Dec 2005
23:29:42 -0000
@@ -123,7 +123,7 @@
*
* @return the class <code>PrintStateReason</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterStateReason.class;
}
Index: javax/print/attribute/standard/PrinterStateReasons.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterStateReasons.java,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 PrinterStateReasons.java
--- javax/print/attribute/standard/PrinterStateReasons.java 27 Nov 2005
22:17:21 -0000 1.2.2.3
+++ javax/print/attribute/standard/PrinterStateReasons.java 9 Dec 2005
23:29:43 -0000
@@ -40,6 +40,7 @@
import java.util.HashMap;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
/**
@@ -56,7 +57,7 @@
*
* @return the class <code>PrintStateReasons</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterStateReasons.class;
}
Index: javax/print/attribute/standard/PrinterURI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterURI.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PrinterURI.java
--- javax/print/attribute/standard/PrinterURI.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/print/attribute/standard/PrinterURI.java 9 Dec 2005 23:29:43
-0000
@@ -40,6 +40,7 @@
import java.net.URI;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.URISyntax;
@@ -64,7 +65,7 @@
*
* @return the class <code>PrinterURI</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterURI.class;
}
Index: javax/print/attribute/standard/QueuedJobCount.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/QueuedJobCount.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 QueuedJobCount.java
--- javax/print/attribute/standard/QueuedJobCount.java 2 Aug 2005 20:12:36
-0000 1.2.2.1
+++ javax/print/attribute/standard/QueuedJobCount.java 9 Dec 2005 23:29:43
-0000
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -83,7 +84,7 @@
*
* @return the class <code>QueuedJobCount</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return QueuedJobCount.class;
}
Index: javax/print/attribute/standard/ReferenceUriSchemesSupported.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 ReferenceUriSchemesSupported.java
--- javax/print/attribute/standard/ReferenceUriSchemesSupported.java 2 Aug
2005 20:12:36 -0000 1.2.2.2
+++ javax/print/attribute/standard/ReferenceUriSchemesSupported.java 9 Dec
2005 23:29:43 -0000
@@ -79,7 +79,7 @@
*
* @return the class <code>ReferenceUriSchemesSupported</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return ReferenceUriSchemesSupported.class;
}
Index: javax/print/attribute/standard/RequestingUserName.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/RequestingUserName.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 RequestingUserName.java
--- javax/print/attribute/standard/RequestingUserName.java 2 Aug 2005
20:12:36 -0000 1.3.2.2
+++ javax/print/attribute/standard/RequestingUserName.java 9 Dec 2005
23:29:43 -0000
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintRequestAttribute;
import javax.print.attribute.TextSyntax;
@@ -84,7 +85,7 @@
*
* @return the class <code>RequestingUserName</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return RequestingUserName.class;
}
Index: javax/print/attribute/standard/Severity.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Severity.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 Severity.java
--- javax/print/attribute/standard/Severity.java 2 Aug 2005 20:12:36
-0000 1.2.2.1
+++ javax/print/attribute/standard/Severity.java 9 Dec 2005 23:29:43
-0000
@@ -66,7 +66,7 @@
*
* @return the class <code>Severity</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Severity.class;
}
Index: javax/print/attribute/standard/SheetCollate.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/SheetCollate.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 SheetCollate.java
--- javax/print/attribute/standard/SheetCollate.java 2 Aug 2005 20:12:36
-0000 1.2.2.1
+++ javax/print/attribute/standard/SheetCollate.java 9 Dec 2005 23:29:43
-0000
@@ -37,6 +37,7 @@
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;
@@ -64,7 +65,7 @@
*
* @return the class <code>SheetCollate</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return SheetCollate.class;
}
Index: javax/print/attribute/standard/Sides.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/print/attribute/standard/Sides.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 Sides.java
--- javax/print/attribute/standard/Sides.java 2 Aug 2005 20:12:36 -0000
1.2.2.1
+++ javax/print/attribute/standard/Sides.java 9 Dec 2005 23:29:43 -0000
@@ -37,6 +37,7 @@
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;
@@ -72,7 +73,7 @@
*
* @return the class <code>Sides</code> itself
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Sides.class;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] [generics] Patch: FYI: generics in javax.print,
Tom Tromey <=