Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [3024] trunk/core/src/classpath/javax/javax/print
|
From: <ls...@us...> - 2007-01-07 12:55:52
|
Revision: 3024
http://jnode.svn.sourceforge.net/jnode/?rev=3024&view=rev
Author: lsantha
Date: 2007-01-07 04:55:51 -0800 (Sun, 07 Jan 2007)
Log Message:
-----------
Classpath patches.
Modified Paths:
--------------
trunk/core/src/classpath/javax/javax/print/PrintService.java
trunk/core/src/classpath/javax/javax/print/attribute/Attribute.java
trunk/core/src/classpath/javax/javax/print/attribute/AttributeSet.java
trunk/core/src/classpath/javax/javax/print/attribute/AttributeSetUtilities.java
trunk/core/src/classpath/javax/javax/print/attribute/HashAttributeSet.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Chromaticity.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/ColorSupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Compression.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Copies.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/CopiesSupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtCompleted.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtCreation.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtProcessing.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Destination.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/DocumentName.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Fidelity.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Finishings.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobHoldUntil.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressions.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressionsCompleted.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressionsSupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctets.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctetsProcessed.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctetsSupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheets.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheetsCompleted.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheetsSupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMessageFromOperator.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobName.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobOriginatingUserName.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobPriority.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobPrioritySupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobSheets.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobState.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobStateReason.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/JobStateReasons.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Media.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/MediaPrintableArea.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/MediaSize.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/MultipleDocumentHandling.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberOfDocuments.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberOfInterveningJobs.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberUp.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberUpSupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/OrientationRequested.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/OutputDeviceAssigned.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PDLOverrideSupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PageRanges.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PagesPerMinute.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PagesPerMinuteColor.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PresentationDirection.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrintQuality.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterInfo.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterLocation.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMakeAndModel.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMessageFromOperator.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMoreInfo.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterName.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterResolution.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterState.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterStateReason.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterStateReasons.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterURI.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/QueuedJobCount.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/RequestingUserName.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Severity.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/SheetCollate.java
trunk/core/src/classpath/javax/javax/print/attribute/standard/Sides.java
Modified: trunk/core/src/classpath/javax/javax/print/PrintService.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/PrintService.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/PrintService.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -89,7 +89,7 @@
* @throws IllegalArgumentException if category is not a class that
* implements <code>PrintServiceAttribute</code>.
*/
- PrintServiceAttribute getAttribute(Class category);
+ <T extends PrintServiceAttribute> T getAttribute(Class<T> category);
/**
* Returns the attributes describing this print service. The returned
@@ -123,7 +123,7 @@
* @throws IllegalArgumentException if <code>category</code> is a class
* not implementing <code>Attribute</code>
*/
- Object getDefaultAttributeValue(Class category);
+ Object getDefaultAttributeValue(Class<? extends Attribute> category);
/**
* Returns the name of this print service.
@@ -145,7 +145,7 @@
*
* @return The class array of all supported attribute categories.
*/
- Class[] getSupportedAttributeCategories();
+ Class<?>[] getSupportedAttributeCategories();
/**
* Determines and returns all supported attribute values of a given
@@ -177,7 +177,9 @@
* implementing <code>Attribute</code>, or if <code>flavor</code> is not
* supported
*/
- Object getSupportedAttributeValues(Class category, DocFlavor flavor, AttributeSet attributes);
+ Object getSupportedAttributeValues(Class<? extends Attribute> category,
+ DocFlavor flavor,
+ AttributeSet attributes);
/**
* Determines and returns an array of all supported document flavors which
@@ -189,7 +191,7 @@
* the specific doc flavor and attributes set.
* </p>
*
- * @return The supported document flavors.
+ * @return the supported document flavors
*/
DocFlavor[] getSupportedDocFlavors();
@@ -240,7 +242,7 @@
* @throws IllegalArgumentException if <code>category</code> is a class not
* implementing <code>Attribute</code>.
*/
- boolean isAttributeCategorySupported(Class category);
+ boolean isAttributeCategorySupported(Class<? extends Attribute> category);
/**
* Determines if a given attribute value is supported when creating a print
Modified: trunk/core/src/classpath/javax/javax/print/attribute/Attribute.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/Attribute.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/Attribute.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -52,7 +52,7 @@
*
* @return The concrete {@link Class} instance of the attribute class.
*/
- Class getCategory ();
+ Class< ? extends Attribute> getCategory ();
/**
* Returns the descriptive name of the attribute category.
Modified: trunk/core/src/classpath/javax/javax/print/attribute/AttributeSet.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/AttributeSet.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/AttributeSet.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -110,7 +110,7 @@
* @return <code>true</code> if an attribute of the category is contained
* in the set, <code>false</code> otherwise.
*/
- boolean containsKey (Class category);
+ boolean containsKey (Class<?> category);
/**
* Checks if this attribute set contains the given attribute.
@@ -143,7 +143,7 @@
* @throws ClassCastException if category is not implementing
* <code>Attribute</code>.
*/
- Attribute get (Class category);
+ Attribute get (Class<?> category);
/**
* Returns the hashcode value. The hashcode value is the sum of all hashcodes
@@ -178,7 +178,7 @@
* @return <code>true</code> if an attribute is removed, false in all other cases.
* @throws UnmodifiableSetException if the set does not support modification.
*/
- boolean remove (Class category);
+ boolean remove (Class<?> category);
/**
* Returns the number of elements in this attribute set.
Modified: trunk/core/src/classpath/javax/javax/print/attribute/AttributeSetUtilities.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/AttributeSetUtilities.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/AttributeSetUtilities.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -435,8 +435,8 @@
* that implements interfaceName
* @exception NullPointerException if object is null
*/
- public static Class verifyAttributeCategory(Object object,
- Class interfaceName)
+ public static Class<?> verifyAttributeCategory(Object object,
+ Class<?> interfaceName)
{
if (object == null)
throw new NullPointerException("object may not be null");
@@ -461,7 +461,7 @@
* @exception NullPointerException if object is null
*/
public static Attribute verifyAttributeValue(Object object,
- Class interfaceName)
+ Class<?> interfaceName)
{
if (object == null)
throw new NullPointerException("object may not be null");
@@ -482,7 +482,7 @@
* @exception IllegalArgumentException if the categories are not equal
* @exception NullPointerException if category is null
*/
- public static void verifyCategoryForValue(Class category,
+ public static void verifyCategoryForValue(Class<?> category,
Attribute attribute)
{
if (category == null || attribute == null)
Modified: trunk/core/src/classpath/javax/javax/print/attribute/HashAttributeSet.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/HashAttributeSet.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/HashAttributeSet.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -110,7 +110,7 @@
*
* @exception NullPointerException if interfaceName is null
*/
- protected HashAttributeSet(Class interfaceName)
+ protected HashAttributeSet(Class<?> interfaceName)
{
if (interfaceName == null)
throw new NullPointerException("interfaceName may not be null");
@@ -129,7 +129,7 @@
* interfaceName
* @exception NullPointerException if attribute or interfaceName is null
*/
- protected HashAttributeSet(Attribute attribute, Class interfaceName)
+ protected HashAttributeSet(Attribute attribute, Class<?> interfaceName)
{
this(interfaceName);
@@ -151,7 +151,7 @@
* interface of interfaceName
* @exception NullPointerException if attributes or interfaceName is null
*/
- protected HashAttributeSet(Attribute[] attributes, Class interfaceName)
+ protected HashAttributeSet(Attribute[] attributes, Class<?> interfaceName)
{
this(interfaceName);
@@ -173,7 +173,7 @@
* @exception ClassCastException if any element of attributes is not an
* interface of interfaceName
*/
- protected HashAttributeSet(AttributeSet attributes, Class interfaceName)
+ protected HashAttributeSet(AttributeSet attributes, Class<?> interfaceName)
{
this(interfaceName);
@@ -256,7 +256,7 @@
* @return <code>true</code> if an attribute of the category is contained
* in the set, <code>false</code> otherwise.
*/
- public boolean containsKey(Class category)
+ public boolean containsKey(Class<?> category)
{
return attributeMap.containsKey(category);
}
@@ -301,7 +301,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");
@@ -359,7 +359,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;
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/Chromaticity.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/Chromaticity.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/Chromaticity.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -94,7 +95,7 @@
*
* @return The class <code>Chromaticity</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Chromaticity.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/ColorSupported.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/ColorSupported.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/ColorSupported.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -88,7 +89,7 @@
*
* @return The class <code>ColorSupported</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return ColorSupported.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/Compression.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/Compression.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/Compression.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.EnumSyntax;
@@ -91,7 +92,7 @@
*
* @return The class <code>Compression</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Compression.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/Copies.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/Copies.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/Copies.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -97,7 +98,7 @@
*
* @return The class <code>Copies</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Copies.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/CopiesSupported.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/CopiesSupported.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/CopiesSupported.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -112,7 +113,7 @@
*
* @return The class <code>CopiesSupported</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return CopiesSupported.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtCompleted.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtCompleted.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtCompleted.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Date;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -92,7 +93,7 @@
*
* @return The class <code>DateTimeAtCompleted</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return DateTimeAtCompleted.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtCreation.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtCreation.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtCreation.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Date;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -92,7 +93,7 @@
*
* @return The class <code>DateTimeAtCreation</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return DateTimeAtCreation.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtProcessing.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtProcessing.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/DateTimeAtProcessing.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Date;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -92,7 +93,7 @@
*
* @return The class <code>DateTimeAtProcessing</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return DateTimeAtProcessing.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/Destination.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/Destination.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/Destination.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -104,7 +105,7 @@
*
* @return The class <code>Destination</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Destination.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/DocumentName.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/DocumentName.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/DocumentName.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.TextSyntax;
@@ -98,7 +99,7 @@
*
* @return The class <code>DocumentName</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return DocumentName.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/Fidelity.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/Fidelity.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/Fidelity.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -38,6 +38,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;
@@ -107,7 +108,7 @@
*
* @return The class <code>Fidelity</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Fidelity.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/Finishings.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/Finishings.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/Finishings.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -238,7 +239,7 @@
*
* @return the class <code>Finishings</code> itself
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Finishings.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobHoldUntil.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobHoldUntil.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobHoldUntil.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -98,7 +99,7 @@
*
* @return The class <code>JobHoldUntil</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobHoldUntil.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressions.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressions.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressions.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -110,7 +111,7 @@
*
* @return The class <code>JobImpressions</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobImpressions.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressionsCompleted.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressionsCompleted.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressionsCompleted.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -101,7 +102,7 @@
*
* @return The class <code>JobImpressionsCompleted</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobImpressionsCompleted.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressionsSupported.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressionsSupported.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobImpressionsSupported.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -96,7 +97,7 @@
*
* @return The class <code>JobImpressionsSupported</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobImpressionsSupported.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctets.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctets.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctets.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -110,7 +111,7 @@
*
* @return The class <code>JobKOctets</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobKOctets.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctetsProcessed.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctetsProcessed.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctetsProcessed.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -102,7 +103,7 @@
*
* @return The class <code>JobKOctetsProcessed</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobKOctetsProcessed.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctetsSupported.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctetsSupported.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobKOctetsSupported.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -96,7 +97,7 @@
*
* @return The class <code>JobKOctetsSupported</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobKOctetsSupported.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheets.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheets.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheets.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -107,7 +108,7 @@
*
* @return The class <code>JobMediaSheets</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobMediaSheets.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheetsCompleted.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheetsCompleted.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheetsCompleted.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -96,7 +97,7 @@
*
* @return The class <code>JobMediaSheetsCompleted</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobMediaSheetsCompleted.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheetsSupported.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheetsSupported.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMediaSheetsSupported.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -96,7 +97,7 @@
*
* @return The class <code>JobMediaSheetsSupported</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobMediaSheetsSupported.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMessageFromOperator.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMessageFromOperator.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobMessageFromOperator.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
@@ -95,7 +96,7 @@
*
* @return The class <code>JobMessageFromOperator</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobMessageFromOperator.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobName.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobName.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobName.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -93,7 +94,7 @@
*
* @return The class <code>JobName</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobName.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobOriginatingUserName.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobOriginatingUserName.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobOriginatingUserName.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
@@ -92,7 +93,7 @@
*
* @return The class <code>JobOriginatingUserName</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobOriginatingUserName.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobPriority.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobPriority.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobPriority.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -97,7 +98,7 @@
*
* @return The class <code>JobPriority</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobPriority.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobPrioritySupported.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobPrioritySupported.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobPrioritySupported.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -99,7 +100,7 @@
*
* @return The class <code>JobPrioritySupported</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobPrioritySupported.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobSheets.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobSheets.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobSheets.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -88,7 +89,7 @@
*
* @return The class <code>JobSheets</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobSheets.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobState.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobState.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobState.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -137,7 +138,7 @@
*
* @return The class <code>JobState</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobState.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobStateReason.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobStateReason.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobStateReason.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -262,7 +262,7 @@
*
* @return The class <code>JobStateReason</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobStateReason.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/JobStateReasons.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/JobStateReasons.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/JobStateReasons.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -42,6 +42,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
/**
@@ -56,7 +57,7 @@
* @author Michael Koch (kon...@gm...)
* @author Wolfgang Baer (WB...@gm...)
*/
-public final class JobStateReasons extends HashSet
+public final class JobStateReasons extends HashSet<JobStateReason>
implements PrintJobAttribute
{
private static final long serialVersionUID = 8849088261264331812L;
@@ -108,12 +109,11 @@
* @throws ClassCastException if values of collection are not of type
* <code>JobStateReason</code>.
*/
- public JobStateReasons(Collection collection)
+ public JobStateReasons(Collection<JobStateReason> collection)
{
super(collection.size(), 0.75f);
- Iterator it = collection.iterator();
- while (it.hasNext())
- add(it.next());
+ for (JobStateReason reason : collection)
+ add(reason);
}
/**
@@ -126,12 +126,12 @@
* @throws ClassCastException if given object is not an instance of
* <code>JobStateReason</code>.
*/
- public boolean add(Object o)
+ public boolean add(JobStateReason o)
{
if (o == null)
throw new NullPointerException("reason is null");
- return super.add((JobStateReason) o);
+ return add(o);
}
/**
@@ -139,7 +139,7 @@
*
* @return The class <code>JobStateReasons</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return JobStateReasons.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/Media.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/Media.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/Media.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -105,7 +106,7 @@
*
* @return The class <code>Media</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return Media.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/MediaPrintableArea.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/MediaPrintableArea.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/MediaPrintableArea.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -152,7 +153,7 @@
*
* @return The class <code>MediaPrintableArea</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return MediaPrintableArea.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/MediaSize.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/MediaSize.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/MediaSize.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -67,11 +67,11 @@
{
private static final long serialVersionUID = -1967958664615414771L;
- private static ArrayList mediaCache;
+ private static ArrayList<MediaSize> mediaCache;
static
{
- mediaCache = new ArrayList();
+ mediaCache = new ArrayList<MediaSize>();
// We call one instance of every container class to make sure it gets
// loaded during class initialization and therefore all other static
@@ -180,11 +180,12 @@
*
* @return The class <code>MediaSize</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return MediaSize.class;
}
+
/**
* Searches for a MediaSize object with the given dimensions.
* If none is found with exact dimensions, the closest match is used.
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/MultipleDocumentHandling.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/MultipleDocumentHandling.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/MultipleDocumentHandling.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -108,7 +109,7 @@
*
* @return The class <code>MultipleDocumentHandling</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return MultipleDocumentHandling.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberOfDocuments.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberOfDocuments.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberOfDocuments.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -90,7 +91,7 @@
*
* @return The class <code>NumberOfDocuments</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return NumberOfDocuments.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberOfInterveningJobs.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberOfInterveningJobs.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberOfInterveningJobs.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
@@ -91,7 +92,7 @@
*
* @return The class <code>NumberOfInterveningJobs</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return NumberOfInterveningJobs.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberUp.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberUp.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberUp.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -95,7 +96,7 @@
*
* @return The class <code>NumberUp</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return NumberUp.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberUpSupported.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberUpSupported.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/NumberUpSupported.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
@@ -128,7 +129,7 @@
*
* @return The class <code>NumberUpSupported</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return NumberUpSupported.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/OrientationRequested.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/OrientationRequested.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/OrientationRequested.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -112,7 +113,7 @@
*
* @return The class <code>OrientationRequested</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return OrientationRequested.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/OutputDeviceAssigned.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/OutputDeviceAssigned.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/OutputDeviceAssigned.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
@@ -98,7 +99,7 @@
*
* @return The class <code>OutputDeviceAssigned</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return OutputDeviceAssigned.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PDLOverrideSupported.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PDLOverrideSupported.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PDLOverrideSupported.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -91,7 +92,7 @@
*
* @return The class <code>PDLOverrideSupported</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PDLOverrideSupported.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PageRanges.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PageRanges.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PageRanges.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -154,7 +155,7 @@
*
* @return The class <code>PageRanges</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PageRanges.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PagesPerMinute.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PagesPerMinute.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PagesPerMinute.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -38,6 +38,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -92,7 +93,7 @@
*
* @return The class <code>PagesPerMinute</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PagesPerMinute.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PagesPerMinuteColor.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PagesPerMinuteColor.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PagesPerMinuteColor.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -91,7 +92,7 @@
*
* @return The class <code>PagesPerMinuteColor</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PagesPerMinuteColor.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PresentationDirection.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PresentationDirection.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PresentationDirection.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -138,7 +139,7 @@
*
* @return The class <code>PresentationDirection</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PresentationDirection.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PrintQuality.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PrintQuality.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PrintQuality.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -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;
@@ -92,7 +93,7 @@
*
* @return The class <code>PrintQuality</code> itself.
*/
- public final Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrintQuality.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterInfo.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterInfo.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterInfo.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -92,7 +93,7 @@
*
* @return The class <code>PrinterInfo</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterInfo.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterIsAcceptingJobs.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterIsAcceptingJobs.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -37,6 +37,7 @@
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintServiceAttribute;
@@ -93,7 +94,7 @@
*
* @return The class <code>PrinterIsAcceptingJobs</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterIsAcceptingJobs.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterLocation.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterLocation.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterLocation.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -92,7 +93,7 @@
*
* @return The class <code>PrinterLocation</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterLocation.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMakeAndModel.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMakeAndModel.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMakeAndModel.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -92,7 +93,7 @@
*
* @return The class <code>PrinterMakeAndModel</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterMakeAndModel.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMessageFromOperator.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMessageFromOperator.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMessageFromOperator.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java.util.Locale;
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
@@ -95,7 +96,7 @@
*
* @return The class <code>PrinterMessageFromOperator</code> itself.
*/
- public Class getCategory()
+ public Class< ? extends Attribute> getCategory()
{
return PrinterMessageFromOperator.class;
}
Modified: trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMoreInfo.java
===================================================================
--- trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMoreInfo.java 2007-01-07 12:54:15 UTC (rev 3023)
+++ trunk/core/src/classpath/javax/javax/print/attribute/standard/PrinterMoreInfo.java 2007-01-07 12:55:51 UTC (rev 3024)
@@ -40,6 +40,7 @@
import java....
[truncated message content] |
