You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2006/11/01 04:58:09 UTC
svn commit: r469773 [1/3] - in
/incubator/harmony/enhanced/classlib/trunk/modules/print/src:
main/java/common/javax/print/attribute/standard/
main/java/common/org/apache/harmony/x/print/ipp/util/
test/api/java/common/javax/print/attribute/standard/
Author: ndbeyer
Date: Tue Oct 31 19:58:05 2006
New Revision: 469773
URL: http://svn.apache.org/viewvc?view=rev&rev=469773
Log:
Cleanup 'javax.print.attribute.standard'
* Uplift API to Java 5 spec
* Format code
* Add explicit serialVersionUID fields
* Make sure all returned constant arrays are cloned
* Fix affected test cases
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Chromaticity.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ColorSupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Compression.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Copies.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/CopiesSupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCompleted.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCreation.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtProcessing.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Destination.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DocumentName.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Fidelity.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Finishings.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobHoldUntil.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressions.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsCompleted.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsSupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctets.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsProcessed.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsSupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheets.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsCompleted.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsSupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMessageFromOperator.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobName.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobOriginatingUserName.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPriority.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPrioritySupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobSheets.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobState.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobStateReason.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobStateReasons.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Media.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/MediaName.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/MediaPrintableArea.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/MediaSize.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/MediaSizeName.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/MediaTray.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/MultipleDocumentHandling.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/NumberOfDocuments.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/NumberOfInterveningJobs.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/NumberUp.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/NumberUpSupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OrientationRequested.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/OutputDeviceAssigned.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PDLOverrideSupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PageRanges.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinute.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PagesPerMinuteColor.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PresentationDirection.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrintQuality.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterLocation.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMakeAndModel.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMessageFromOperator.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterName.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterResolution.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterState.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReason.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReasons.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterURI.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/QueuedJobCount.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/RequestingUserName.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Severity.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/SheetCollate.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Sides.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/util/Ipp2Java.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/JobStateReasonsTest.java
incubator/harmony/enhanced/classlib/trunk/modules/print/src/test/api/java/common/javax/print/attribute/standard/PrinterStateReasonsTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Chromaticity.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Chromaticity.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Chromaticity.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Chromaticity.java Tue Oct 31 19:58:05 2006
@@ -14,56 +14,46 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public final class Chromaticity extends EnumSyntax
- implements DocAttribute, PrintJobAttribute, PrintRequestAttribute {
-
+public final class Chromaticity extends EnumSyntax implements DocAttribute, PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = 4660543931355214012L;
public static final Chromaticity MONOCHROME = new Chromaticity(0);
public static final Chromaticity COLOR = new Chromaticity(1);
+ private static final Chromaticity[] enumValueTable = { MONOCHROME, COLOR };
- private static final Chromaticity[] enumValueTable = { MONOCHROME,
- COLOR };
+ private static final String[] stringTable = { "monochrome", "color" };
- private static final String[] stringTable = { "monochrome",
- "color" };
-
-
protected Chromaticity(int value) {
super(value);
}
-
-
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+
+ public final Class<? extends Attribute> getCategory() {
return Chromaticity.class;
}
-
+
+ @Override
protected EnumSyntax[] getEnumValueTable() {
return enumValueTable;
}
-
+
+ @Override
protected String[] getStringTable() {
- return stringTable;
+ return stringTable.clone();
}
public final String getName() {
return "chromaticity";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ColorSupported.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ColorSupported.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ColorSupported.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/ColorSupported.java Tue Oct 31 19:58:05 2006
@@ -14,53 +14,43 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintServiceAttribute;
-public final class ColorSupported extends EnumSyntax
- implements PrintServiceAttribute {
-
+public final class ColorSupported extends EnumSyntax implements PrintServiceAttribute {
+ private static final long serialVersionUID = -2700555589688535545L;
public static final ColorSupported NOT_SUPPORTED = new ColorSupported(0);
public static final ColorSupported SUPPORTED = new ColorSupported(1);
-
-
- private static final String[] stringTable = { "false",
- "true" };
- private static final ColorSupported[] enumValueTable = { NOT_SUPPORTED,
- SUPPORTED };
+ private static final String[] stringTable = { "false", "true" };
+
+ private static final ColorSupported[] enumValueTable = { NOT_SUPPORTED, SUPPORTED };
-
protected ColorSupported(int value) {
super(value);
}
-
-
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+
+ public final Class<? extends Attribute> getCategory() {
return ColorSupported.class;
}
-
+
+ @Override
protected EnumSyntax[] getEnumValueTable() {
return enumValueTable;
}
-
+
public final String getName() {
return "color-supported";
}
-
+
+ @Override
protected String[] getStringTable() {
- return stringTable;
+ return stringTable.clone();
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Compression.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Compression.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Compression.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Compression.java Tue Oct 31 19:58:05 2006
@@ -14,18 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.EnumSyntax;
public class Compression extends EnumSyntax implements DocAttribute {
-
+ private static final long serialVersionUID = -5716748913324997674L;
public static final Compression NONE = new Compression(0);
@@ -34,40 +31,30 @@
public static final Compression GZIP = new Compression(2);
public static final Compression COMPRESS = new Compression(3);
-
- private static final Compression[] enumValueTable = { NONE,
- DEFLATE,
- GZIP,
- COMPRESS };
-
- private static final String[] stringTable = { "none",
- "deflate",
- "gzip",
- "compress" };
+ private static final Compression[] enumValueTable = { NONE, DEFLATE, GZIP, COMPRESS };
+
+ private static final String[] stringTable = { "none", "deflate", "gzip", "compress" };
-
protected Compression(int value) {
super(value);
}
-
-
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+
+ public final Class<? extends Attribute> getCategory() {
return Compression.class;
}
-
+
+ @Override
protected EnumSyntax[] getEnumValueTable() {
- return (EnumSyntax[]) enumValueTable.clone();
+ return enumValueTable.clone();
}
-
+
public final String getName() {
return "compression";
}
-
+
+ @Override
protected String[] getStringTable() {
- return (String[]) stringTable.clone();
- }
-
+ return stringTable.clone();
+ }
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Copies.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Copies.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Copies.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Copies.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public final class Copies extends IntegerSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public final class Copies extends IntegerSyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = -6426631521680023833L;
public Copies(int value) {
super(value, 1, Integer.MAX_VALUE);
}
-
+ @Override
public boolean equals(Object object) {
-
- if ( !(object instanceof Copies) ) {
+ if (!(object instanceof Copies)) {
return false;
}
return super.equals(object);
}
-
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return Copies.class;
}
public final String getName() {
return "copies";
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/CopiesSupported.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/CopiesSupported.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/CopiesSupported.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/CopiesSupported.java Tue Oct 31 19:58:05 2006
@@ -14,25 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
-public final class CopiesSupported extends SetOfIntegerSyntax
- implements SupportedValuesAttribute {
-
+public final class CopiesSupported extends SetOfIntegerSyntax implements
+ SupportedValuesAttribute {
+ private static final long serialVersionUID = 6927711687034846001L;
public CopiesSupported(int value) {
super(value);
if (value < 1) {
- throw new IllegalArgumentException("Value" + value +
- "is less than 1");
+ throw new IllegalArgumentException("Value" + value + "is less than 1");
}
}
@@ -41,27 +37,23 @@
if (lowerBound > upperBound) {
throw new IllegalArgumentException("Null range");
} else if (lowerBound < 1) {
- throw new IllegalArgumentException("Lower bound" + lowerBound +
- "is less than 1");
+ throw new IllegalArgumentException("Lower bound" + lowerBound + "is less than 1");
}
}
-
+ @Override
public boolean equals(Object object) {
- if( !(object instanceof CopiesSupported) ) {
+ if (!(object instanceof CopiesSupported)) {
return false;
}
return super.equals(object);
}
- public Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public Class<? extends Attribute> getCategory() {
return CopiesSupported.class;
}
public String getName() {
return "copies-supported";
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCompleted.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCompleted.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCompleted.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCompleted.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.util.Date;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
-public final class DateTimeAtCompleted extends DateTimeSyntax
- implements PrintJobAttribute {
+public final class DateTimeAtCompleted extends DateTimeSyntax implements PrintJobAttribute {
+ private static final long serialVersionUID = 6497399708058490000L;
-
public DateTimeAtCompleted(Date value) {
- super (value);
+ super(value);
}
-
- public boolean equals (Object object) {
-
- if ( !(object instanceof DateTimeAtCompleted) ) {
+ @Override
+ public boolean equals(Object object) {
+ if (!(object instanceof DateTimeAtCompleted)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return DateTimeAtCompleted.class;
}
public final String getName() {
return "date-time-at-completed";
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCreation.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCreation.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCreation.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtCreation.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.util.Date;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
-
-public final class DateTimeAtCreation extends DateTimeSyntax
- implements PrintJobAttribute {
-
+public final class DateTimeAtCreation extends DateTimeSyntax implements PrintJobAttribute {
+ private static final long serialVersionUID = -2923732231056647903L;
public DateTimeAtCreation(Date value) {
- super (value);
+ super(value);
}
-
+ @Override
public boolean equals(Object object) {
-
- if ( !(object instanceof DateTimeAtCreation) ) {
+ if (!(object instanceof DateTimeAtCreation)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return DateTimeAtCreation.class;
}
public final String getName() {
return "date-time-at-creation";
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtProcessing.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtProcessing.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtProcessing.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DateTimeAtProcessing.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.util.Date;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
-public final class DateTimeAtProcessing extends DateTimeSyntax
- implements PrintJobAttribute {
-
+public final class DateTimeAtProcessing extends DateTimeSyntax implements PrintJobAttribute {
+ private static final long serialVersionUID = -3710068197278263244L;
public DateTimeAtProcessing(Date value) {
super(value);
}
-
- public boolean equals (Object object) {
-
- if ( !(object instanceof DateTimeAtProcessing) ) {
+ @Override
+ public boolean equals(Object object) {
+ if (!(object instanceof DateTimeAtProcessing)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return DateTimeAtProcessing.class;
}
public final String getName() {
return "date-time-at-processing";
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Destination.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Destination.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Destination.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Destination.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.net.URI;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
import javax.print.attribute.URISyntax;
-public final class Destination extends URISyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public final class Destination extends URISyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = 6776739171700415321L;
public Destination(URI uri) {
super(uri);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof Destination) ) {
+ if (!(object instanceof Destination)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return Destination.class;
}
public final String getName() {
return "spool-data-destination";
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DocumentName.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DocumentName.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DocumentName.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/DocumentName.java Tue Oct 31 19:58:05 2006
@@ -14,41 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.util.Locale;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.TextSyntax;
public final class DocumentName extends TextSyntax implements DocAttribute {
-
+ private static final long serialVersionUID = 7883105848533280430L;
public DocumentName(String documentName, Locale locale) {
- super (documentName, locale);
+ super(documentName, locale);
}
-
+ @Override
public boolean equals(Object object) {
- if ( ! (object instanceof DocumentName) ) {
+ if (!(object instanceof DocumentName)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return DocumentName.class;
}
public final String getName() {
return "document-name";
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Fidelity.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Fidelity.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Fidelity.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Fidelity.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public final class Fidelity extends EnumSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public final class Fidelity extends EnumSyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = 6320827847329172308L;
public static final Fidelity FIDELITY_TRUE = new Fidelity(0);
public static final Fidelity FIDELITY_FALSE = new Fidelity(1);
+ private static final Fidelity[] enumValueTable = { FIDELITY_TRUE, FIDELITY_FALSE };
- private static final Fidelity[] enumValueTable = { FIDELITY_TRUE,
- FIDELITY_FALSE };
-
- private static final String[] stringTable = { "true",
- "false" };
-
+ private static final String[] stringTable = { "true", "false" };
- protected Fidelity (int value) {
+ protected Fidelity(int value) {
super(value);
}
-
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return Fidelity.class;
}
+ @Override
protected EnumSyntax[] getEnumValueTable() {
return enumValueTable;
}
@@ -60,8 +51,8 @@
return "ipp-attribute-fidelity";
}
+ @Override
protected String[] getStringTable() {
return stringTable;
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Finishings.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Finishings.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Finishings.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/Finishings.java Tue Oct 31 19:58:05 2006
@@ -14,26 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.DocAttribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
- /*
- * Table values are obtained from RFC2911: Internet Printing Protocol/1.1:
- * Model and Semantics, section 4.2.6, http://ietf.org/rfc/rfc2911.txt?number=2911
- */
-
-public class Finishings extends EnumSyntax
- implements DocAttribute, PrintJobAttribute, PrintRequestAttribute {
-
+/*
+ * Table values are obtained from RFC2911: Internet Printing Protocol/1.1:
+ * Model and Semantics, section 4.2.6, http://ietf.org/rfc/rfc2911.txt?number=2911
+ */
+public class Finishings extends EnumSyntax implements DocAttribute, PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = -627840419548391754L;
public static final Finishings NONE = new Finishings(3);
@@ -56,13 +52,13 @@
public static final Finishings STAPLE_BOTTOM_RIGHT = new Finishings(23);
public static final Finishings EDGE_STITCH_LEFT = new Finishings(24);
-
+
public static final Finishings EDGE_STITCH_TOP = new Finishings(25);
public static final Finishings EDGE_STITCH_RIGHT = new Finishings(26);
-
+
public static final Finishings EDGE_STITCH_BOTTOM = new Finishings(27);
-
+
public static final Finishings STAPLE_DUAL_LEFT = new Finishings(28);
public static final Finishings STAPLE_DUAL_TOP = new Finishings(29);
@@ -71,93 +67,43 @@
public static final Finishings STAPLE_DUAL_BOTTOM = new Finishings(31);
-
- private static final Finishings[] enumValueTable = { NONE,
- STAPLE,
- null,
- COVER,
- BIND,
- SADDLE_STITCH,
- EDGE_STITCH,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- STAPLE_TOP_LEFT,
- STAPLE_BOTTOM_LEFT,
- STAPLE_TOP_RIGHT,
- STAPLE_BOTTOM_RIGHT,
- EDGE_STITCH_LEFT,
- EDGE_STITCH_TOP,
- EDGE_STITCH_RIGHT,
- EDGE_STITCH_BOTTOM,
- STAPLE_DUAL_LEFT,
- STAPLE_DUAL_TOP,
- STAPLE_DUAL_RIGHT,
- STAPLE_DUAL_BOTTOM };
-
-
- private static final String[] stringTable = { "none",
- "staple",
- null,
- "cover",
- "bind",
- "saddle-stitch",
- "edge-stitch",
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- "staple-top-left",
- "staple-bottom-left",
- "staple-top-right",
- "staple-bottom-right",
- "edge-stitch-left",
- "edge-stitch-top",
- "edge-stitch-right",
- "edge-stitch-bottom",
- "staple-dual-left",
- "staple-dual-top",
- "staple-dual-right",
- "staple-dual-bottom" };
-
- protected Finishings(int value){
+ private static final Finishings[] enumValueTable = { NONE, STAPLE, null, COVER, BIND,
+ SADDLE_STITCH, EDGE_STITCH, null, null, null, null, null, null, null, null, null,
+ null, STAPLE_TOP_LEFT, STAPLE_BOTTOM_LEFT, STAPLE_TOP_RIGHT, STAPLE_BOTTOM_RIGHT,
+ EDGE_STITCH_LEFT, EDGE_STITCH_TOP, EDGE_STITCH_RIGHT, EDGE_STITCH_BOTTOM,
+ STAPLE_DUAL_LEFT, STAPLE_DUAL_TOP, STAPLE_DUAL_RIGHT, STAPLE_DUAL_BOTTOM };
+
+ private static final String[] stringTable = { "none", "staple", null, "cover", "bind",
+ "saddle-stitch", "edge-stitch", null, null, null, null, null, null, null, null,
+ null, null, "staple-top-left", "staple-bottom-left", "staple-top-right",
+ "staple-bottom-right", "edge-stitch-left", "edge-stitch-top", "edge-stitch-right",
+ "edge-stitch-bottom", "staple-dual-left", "staple-dual-top", "staple-dual-right",
+ "staple-dual-bottom" };
+
+ protected Finishings(int value) {
super(value);
}
-
-
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+
+ public final Class<? extends Attribute> getCategory() {
return Finishings.class;
}
-
+
+ @Override
protected EnumSyntax[] getEnumValueTable() {
- return (EnumSyntax[]) enumValueTable.clone();
+ return enumValueTable.clone();
}
-
+
public final String getName() {
return "finishings";
}
-
+
+ @Override
protected int getOffset() {
return 3;
}
-
+
+ @Override
protected String[] getStringTable() {
- return (String[]) stringTable.clone();
+ return stringTable.clone();
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobHoldUntil.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobHoldUntil.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobHoldUntil.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobHoldUntil.java Tue Oct 31 19:58:05 2006
@@ -14,45 +14,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.util.Date;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public final class JobHoldUntil extends DateTimeSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public final class JobHoldUntil extends DateTimeSyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = -1664471048860415024L;
- public JobHoldUntil(Date date){
+ public JobHoldUntil(Date date) {
super(date);
}
-
+ @Override
public boolean equals(Object object) {
-
- if ( !(object instanceof JobHoldUntil) ) {
+ if (!(object instanceof JobHoldUntil)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobHoldUntil.class;
}
public final String getName() {
return "job-hold-until";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressions.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressions.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressions.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressions.java Tue Oct 31 19:58:05 2006
@@ -14,42 +14,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public final class JobImpressions extends IntegerSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public final class JobImpressions extends IntegerSyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = 8225537206784322464L;
public JobImpressions(int value) {
super(value, 0, Integer.MAX_VALUE);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobImpressions) ) {
+ if (!(object instanceof JobImpressions)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobImpressions.class;
}
public final String getName() {
return "job-impressions";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsCompleted.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsCompleted.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsCompleted.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsCompleted.java Tue Oct 31 19:58:05 2006
@@ -14,41 +14,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
-public final class JobImpressionsCompleted extends IntegerSyntax
- implements PrintJobAttribute {
-
+public final class JobImpressionsCompleted extends IntegerSyntax implements PrintJobAttribute {
+ private static final long serialVersionUID = 6722648442432393294L;
public JobImpressionsCompleted(int value) {
super(value, 0, Integer.MAX_VALUE);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobImpressionsCompleted) ) {
+ if (!(object instanceof JobImpressionsCompleted)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobImpressionsCompleted.class;
}
public final String getName() {
return "job-impressions-completed";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsSupported.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsSupported.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsSupported.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsSupported.java Tue Oct 31 19:58:05 2006
@@ -14,48 +14,39 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
-public final class JobImpressionsSupported extends SetOfIntegerSyntax
- implements SupportedValuesAttribute {
-
+public final class JobImpressionsSupported extends SetOfIntegerSyntax implements
+ SupportedValuesAttribute {
+ private static final long serialVersionUID = -4887354803843173692L;
public JobImpressionsSupported(int lowerBound, int upperBound) {
super(lowerBound, upperBound);
if (lowerBound > upperBound) {
- throw new IllegalArgumentException("Null range: lowerBound " +
- "> upperBound");
+ throw new IllegalArgumentException("Null range: lowerBound " + "> upperBound");
} else if (lowerBound < 0) {
- throw new IllegalArgumentException("Lower bound " + lowerBound +
- " is less than 0");
+ throw new IllegalArgumentException("Lower bound " + lowerBound + " is less than 0");
}
}
-
+ @Override
public boolean equals(Object object) {
- if( !(object instanceof JobImpressionsSupported) ) {
+ if (!(object instanceof JobImpressionsSupported)) {
return false;
}
return super.equals(object);
}
- public Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public Class<? extends Attribute> getCategory() {
return JobImpressionsSupported.class;
}
public String getName() {
return "job-impressions-supported";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctets.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctets.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctets.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctets.java Tue Oct 31 19:58:05 2006
@@ -14,42 +14,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public final class JobKOctets extends IntegerSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public final class JobKOctets extends IntegerSyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = -8959710146498202869L;
public JobKOctets(int value) {
super(value, 0, Integer.MAX_VALUE);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobKOctets) ) {
+ if (!(object instanceof JobKOctets)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobKOctets.class;
}
public final String getName() {
return "job-k-octets";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsProcessed.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsProcessed.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsProcessed.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsProcessed.java Tue Oct 31 19:58:05 2006
@@ -14,41 +14,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
-public final class JobKOctetsProcessed extends IntegerSyntax
- implements PrintJobAttribute {
-
+public final class JobKOctetsProcessed extends IntegerSyntax implements PrintJobAttribute {
+ private static final long serialVersionUID = -6265238509657881806L;
public JobKOctetsProcessed(int value) {
super(value, 0, Integer.MAX_VALUE);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobKOctetsProcessed) ) {
+ if (!(object instanceof JobKOctetsProcessed)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobKOctetsProcessed.class;
}
public final String getName() {
return "job-k-octets-processed";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsSupported.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsSupported.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsSupported.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsSupported.java Tue Oct 31 19:58:05 2006
@@ -14,48 +14,39 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
-public final class JobKOctetsSupported extends SetOfIntegerSyntax
- implements SupportedValuesAttribute {
-
+public final class JobKOctetsSupported extends SetOfIntegerSyntax implements
+ SupportedValuesAttribute {
+ private static final long serialVersionUID = -2867871140549897443L;
public JobKOctetsSupported(int lowerBound, int upperBound) {
super(lowerBound, upperBound);
if (lowerBound > upperBound) {
- throw new IllegalArgumentException("Null range: lowerBound " +
- "> upperBound");
+ throw new IllegalArgumentException("Null range: lowerBound " + "> upperBound");
} else if (lowerBound < 0) {
- throw new IllegalArgumentException("Lower bound " + lowerBound +
- " is less than 0");
+ throw new IllegalArgumentException("Lower bound " + lowerBound + " is less than 0");
}
}
-
+ @Override
public boolean equals(Object object) {
- if( !(object instanceof JobKOctetsSupported) ) {
+ if (!(object instanceof JobKOctetsSupported)) {
return false;
}
return super.equals(object);
}
- public Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public Class<? extends Attribute> getCategory() {
return JobKOctetsSupported.class;
}
public String getName() {
return "job-k-octets-supported";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheets.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheets.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheets.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheets.java Tue Oct 31 19:58:05 2006
@@ -14,42 +14,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public class JobMediaSheets extends IntegerSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public class JobMediaSheets extends IntegerSyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = 408871131531979741L;
public JobMediaSheets(int value) {
super(value, 0, Integer.MAX_VALUE);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobMediaSheets) ) {
+ if (!(object instanceof JobMediaSheets)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobMediaSheets.class;
}
public final String getName() {
return "job-media-sheets";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsCompleted.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsCompleted.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsCompleted.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsCompleted.java Tue Oct 31 19:58:05 2006
@@ -14,40 +14,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
-public final class JobMediaSheetsCompleted extends IntegerSyntax
- implements PrintJobAttribute {
-
+public final class JobMediaSheetsCompleted extends IntegerSyntax implements PrintJobAttribute {
+ private static final long serialVersionUID = 1739595973810840475L;
public JobMediaSheetsCompleted(int value) {
super(value, 0, Integer.MAX_VALUE);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobMediaSheetsCompleted) ) {
+ if (!(object instanceof JobMediaSheetsCompleted)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobMediaSheetsCompleted.class;
}
public final String getName() {
return "job-media-sheets-completed";
}
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsSupported.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsSupported.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsSupported.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsSupported.java Tue Oct 31 19:58:05 2006
@@ -14,48 +14,39 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.SetOfIntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
-public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
- implements SupportedValuesAttribute {
-
+public final class JobMediaSheetsSupported extends SetOfIntegerSyntax implements
+ SupportedValuesAttribute {
+ private static final long serialVersionUID = 2953685470388672940L;
public JobMediaSheetsSupported(int lowerBound, int upperBound) {
super(lowerBound, upperBound);
if (lowerBound > upperBound) {
- throw new IllegalArgumentException("Null range: lowerBound " +
- "> upperBound");
+ throw new IllegalArgumentException("Null range: lowerBound " + "> upperBound");
} else if (lowerBound < 0) {
- throw new IllegalArgumentException("Lower bound " + lowerBound +
- " is less then 0");
+ throw new IllegalArgumentException("Lower bound " + lowerBound + " is less then 0");
}
}
-
+ @Override
public boolean equals(Object object) {
- if( !(object instanceof JobMediaSheetsSupported) ) {
+ if (!(object instanceof JobMediaSheetsSupported)) {
return false;
}
return super.equals(object);
}
- public Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public Class<? extends Attribute> getCategory() {
return JobMediaSheetsSupported.class;
}
public String getName() {
return "job-media-sheets-supported";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMessageFromOperator.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMessageFromOperator.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMessageFromOperator.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobMessageFromOperator.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.util.Locale;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
-public final class JobMessageFromOperator extends TextSyntax
- implements PrintJobAttribute {
-
+public final class JobMessageFromOperator extends TextSyntax implements PrintJobAttribute {
+ private static final long serialVersionUID = -4620751846003142047L;
public JobMessageFromOperator(String message, Locale locale) {
super(message, locale);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobMessageFromOperator) ) {
+ if (!(object instanceof JobMessageFromOperator)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobMessageFromOperator.class;
}
public final String getName() {
return "job-message-from-operator";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobName.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobName.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobName.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobName.java Tue Oct 31 19:58:05 2006
@@ -14,44 +14,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.util.Locale;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
import javax.print.attribute.TextSyntax;
-public final class JobName extends TextSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public final class JobName extends TextSyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = 4660359192078689545L;
public JobName(String jobName, Locale locale) {
super(jobName, locale);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobName) ) {
+ if (!(object instanceof JobName)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobName.class;
}
public final String getName() {
return "job-name";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobOriginatingUserName.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobOriginatingUserName.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobOriginatingUserName.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobOriginatingUserName.java Tue Oct 31 19:58:05 2006
@@ -14,43 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
import java.util.Locale;
-
+import javax.print.attribute.Attribute;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
-public final class JobOriginatingUserName extends TextSyntax
- implements PrintJobAttribute {
-
+public final class JobOriginatingUserName extends TextSyntax implements PrintJobAttribute {
+ private static final long serialVersionUID = -8052537926362933477L;
public JobOriginatingUserName(String jobName, Locale locale) {
super(jobName, locale);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobOriginatingUserName) ) {
+ if (!(object instanceof JobOriginatingUserName)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobOriginatingUserName.class;
}
public final String getName() {
return "job-originating-user-name";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPriority.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPriority.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPriority.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPriority.java Tue Oct 31 19:58:05 2006
@@ -14,42 +14,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public final class JobPriority extends IntegerSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public final class JobPriority extends IntegerSyntax implements PrintJobAttribute,
+ PrintRequestAttribute {
+ private static final long serialVersionUID = -4599900369040602769L;
public JobPriority(int value) {
super(value, 1, 100);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobPriority) ) {
+ if (!(object instanceof JobPriority)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobPriority.class;
}
public final String getName() {
return "job-priority";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPrioritySupported.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPrioritySupported.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPrioritySupported.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobPrioritySupported.java Tue Oct 31 19:58:05 2006
@@ -14,41 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
-public final class JobPrioritySupported extends IntegerSyntax
- implements SupportedValuesAttribute {
-
+public final class JobPrioritySupported extends IntegerSyntax implements
+ SupportedValuesAttribute {
+ private static final long serialVersionUID = 2564840378013555894L;
public JobPrioritySupported(int value) {
super(value, 1, 100);
}
-
+ @Override
public boolean equals(Object object) {
- if ( !(object instanceof JobPrioritySupported) ) {
+ if (!(object instanceof JobPrioritySupported)) {
return false;
}
return super.equals(object);
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobPrioritySupported.class;
}
public final String getName() {
return "job-priority-supported";
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobSheets.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobSheets.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobSheets.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobSheets.java Tue Oct 31 19:58:05 2006
@@ -14,55 +14,44 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
-public class JobSheets extends EnumSyntax
- implements PrintJobAttribute, PrintRequestAttribute {
-
+public class JobSheets extends EnumSyntax implements PrintJobAttribute, PrintRequestAttribute {
+ private static final long serialVersionUID = -4735258056132519759L;
public static final JobSheets NONE = new JobSheets(0);
public static final JobSheets STANDARD = new JobSheets(1);
+ private static final JobSheets[] enumValueTable = { NONE, STANDARD };
- private static final JobSheets[] enumValueTable = { NONE,
- STANDARD };
-
- private static final String[] stringTable = { "none",
- "standard" };
-
+ private static final String[] stringTable = { "none", "standard" };
protected JobSheets(int value) {
super(value);
}
-
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobSheets.class;
}
+ @Override
protected EnumSyntax[] getEnumValueTable() {
- return (EnumSyntax[]) enumValueTable.clone();
+ return enumValueTable.clone();
}
public final String getName() {
return "job-sheets";
}
+ @Override
protected String[] getStringTable() {
- return (String[]) stringTable.clone();
+ return stringTable.clone();
}
-
-
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobState.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobState.java?view=diff&rev=469773&r1=469772&r2=469773
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobState.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/java/common/javax/print/attribute/standard/JobState.java Tue Oct 31 19:58:05 2006
@@ -14,78 +14,53 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Elena V. Sayapina
- * @version $Revision: 1.5 $
- */
package javax.print.attribute.standard;
+import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.PrintJobAttribute;
/*
- * @author esayapin
- */
-
-/*
* Table values are obtained from RFC2911: Internet Printing Protocol/1.1:
* Model and Semantics, section 4.3.7, http://ietf.org/rfc/rfc2911.txt?number=2911
*/
-
public class JobState extends EnumSyntax implements PrintJobAttribute {
-
+ private static final long serialVersionUID = 400465010094018920L;
public static final JobState UNKNOWN = new JobState(0);
public static final JobState PENDING = new JobState(3);
public static final JobState PENDING_HELD = new JobState(4);
-
+
public static final JobState PROCESSING = new JobState(5);
public static final JobState PROCESSING_STOPPED = new JobState(6);
-
+
public static final JobState CANCELED = new JobState(7);
-
+
public static final JobState ABORTED = new JobState(8);
public static final JobState COMPLETED = new JobState(9);
- private static final JobState[] enumValueTable = { UNKNOWN,
- null,
- null,
- PENDING,
- PENDING_HELD,
- PROCESSING,
- PROCESSING_STOPPED,
- CANCELED,
- ABORTED,
- COMPLETED };
-
- private static final String[] stringTable = { "unknown",
- null,
- null,
- "pending",
- "pending-held",
- "processing",
- "processing-stopped",
- "canceled",
- "aborted",
- "completed" };
-
+ private static final JobState[] enumValueTable = { UNKNOWN, null, null, PENDING,
+ PENDING_HELD, PROCESSING, PROCESSING_STOPPED, CANCELED, ABORTED, COMPLETED };
+
+ private static final String[] stringTable = { "unknown", null, null, "pending",
+ "pending-held", "processing", "processing-stopped", "canceled", "aborted",
+ "completed" };
+
protected JobState(int value) {
super(value);
}
-
+ @Override
protected EnumSyntax[] getEnumValueTable() {
- return enumValueTable;
+ return enumValueTable.clone();
}
- public final Class getCategory() {
- /* 1.5 support requires the following changes
- Class<? extends Attribute> getCategory() { */
+ public final Class<? extends Attribute> getCategory() {
return JobState.class;
}
@@ -93,9 +68,8 @@
return "job-state";
}
+ @Override
protected String[] getStringTable() {
- return stringTable;
+ return stringTable.clone();
}
-
-
}