2004-10-20 Michael Koch <konqueror@gmx.de>

	* javax/print/attribute/standard/ColorSupported.java,
	javax/print/attribute/standard/Compression.java,
	javax/print/attribute/standard/Copies.java,
	javax/print/attribute/standard/CopiesSupported.java,
	javax/print/attribute/standard/DateTimeAtCompleted.java,
	javax/print/attribute/standard/DateTimeAtCreation.java,
	javax/print/attribute/standard/DateTimeAtProcessing.java,
	javax/print/attribute/standard/DocumentName.java,
	javax/print/attribute/standard/Fidelity.java,
	javax/print/attribute/standard/Finishings.java,
	javax/print/attribute/standard/JobHoldUntil.java,
	javax/print/attribute/standard/JobImpressions.java,
	javax/print/attribute/standard/JobImpressionsCompleted.java,
	javax/print/attribute/standard/JobImpressionsSupported.java,
	javax/print/attribute/standard/JobKOctets.java,
	javax/print/attribute/standard/JobKOctetsProcessed.java,
	javax/print/attribute/standard/JobKOctetsSupported.java,
	javax/print/attribute/standard/JobMediaSheets.java,
	javax/print/attribute/standard/JobMediaSheetsCompleted.java,
	javax/print/attribute/standard/JobMediaSheetsSupported.java,
	javax/print/attribute/standard/JobMessageFromOperator.java,
	javax/print/attribute/standard/JobName.java,
	javax/print/attribute/standard/JobOriginatingUserName.java,
	javax/print/attribute/standard/JobPriority.java,
	javax/print/attribute/standard/JobPrioritySupported.java,
	javax/print/attribute/standard/JobSheets.java,
	javax/print/attribute/standard/JobState.java,
	javax/print/attribute/standard/JobStateReason.java,
	javax/print/attribute/standard/JobStateReasons.java,
	javax/print/attribute/standard/Media.java,
	javax/print/attribute/standard/MultipleDocumentHandling.java,
	javax/print/attribute/standard/NumberOfDocuments.java,
	javax/print/attribute/standard/NumberOfInterveningJobs.java,
	javax/print/attribute/standard/NumberUp.java,
	javax/print/attribute/standard/NumberUpSupported.java,
	javax/print/attribute/standard/OrientationRequested.java,
	javax/print/attribute/standard/OutputDeviceAssigned.java,
	javax/print/attribute/standard/PDLOverrideSupported.java,
	javax/print/attribute/standard/PageRanges.java,
	javax/print/attribute/standard/PagesPerMinute.java,
	javax/print/attribute/standard/PagesPerMinuteColor.java,
	javax/print/attribute/standard/PrintQuality.java,
	javax/print/attribute/standard/PrinterInfo.java,
	javax/print/attribute/standard/PrinterIsAcceptingJobs.java,
	javax/print/attribute/standard/PrinterLocation.java,
	javax/print/attribute/standard/PrinterMakeAndModel.java,
	javax/print/attribute/standard/PrinterMessageFromOperator.java,
	javax/print/attribute/standard/PrinterMoreInfo.java,
	javax/print/attribute/standard/PrinterMoreInfoManufacturer.java,
	javax/print/attribute/standard/PrinterName.java,
	javax/print/attribute/standard/PrinterStateReason.java,
	javax/print/attribute/standard/PrinterStateReasons.java,
	javax/print/attribute/standard/PrinterURI.java,
	javax/print/attribute/standard/ReferenceUriSchemesSupported.java,
	javax/print/attribute/standard/RequestingUserName.java:
	Reorganized imports and removed redundant final modifiers.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89330 138bc75d-0d04-0410-961f-82ee72b054a4

55 files changed, 134 insertions, 109 deletions

diff --git a/libjava/javax/print/attribute/standard/ColorSupported.java b/libjava/javax/print/attribute/standard/ColorSupported.java
index 2d732aaea53..7999d9f158f 100644
--- a/libjava/javax/print/attribute/standard/ColorSupported.java
+++ b/libjava/javax/print/attribute/standard/ColorSupported.java
@@ -67,7 +67,7 @@ public final class ColorSupported extends EnumSyntax
    *
    * @return the class <code>ColorSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return ColorSupported.class;
   }
@@ -77,7 +77,7 @@ public final class ColorSupported extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "color-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/Compression.java b/libjava/javax/print/attribute/standard/Compression.java
index a034b929095..743e6701fec 100644
--- a/libjava/javax/print/attribute/standard/Compression.java
+++ b/libjava/javax/print/attribute/standard/Compression.java
@@ -69,7 +69,7 @@ public class Compression extends EnumSyntax
    *
    * @return the class <code>Compression</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return Compression.class;
   }
@@ -79,7 +79,7 @@ public class Compression extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "compression";
   }
diff --git a/libjava/javax/print/attribute/standard/Copies.java b/libjava/javax/print/attribute/standard/Copies.java
index 329049d831f..ad2a85ec21a 100644
--- a/libjava/javax/print/attribute/standard/Copies.java
+++ b/libjava/javax/print/attribute/standard/Copies.java
@@ -84,7 +84,7 @@ public final class Copies extends IntegerSyntax
    *
    * @return the class <code>Copies</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return Copies.class;
   }
@@ -94,7 +94,7 @@ public final class Copies extends IntegerSyntax
    *
    * @return the string "copies"
    */
-  public final String getName()
+  public String getName()
   {
     return "copies";
   }
diff --git a/libjava/javax/print/attribute/standard/CopiesSupported.java b/libjava/javax/print/attribute/standard/CopiesSupported.java
index d44b385b903..15ed3b56deb 100644
--- a/libjava/javax/print/attribute/standard/CopiesSupported.java
+++ b/libjava/javax/print/attribute/standard/CopiesSupported.java
@@ -70,7 +70,7 @@ public final class CopiesSupported extends SetOfIntegerSyntax
    *
    * @return the class <code>CopiesSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return CopiesSupported.class;
   }
@@ -80,7 +80,7 @@ public final class CopiesSupported extends SetOfIntegerSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "copies-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtCompleted.java b/libjava/javax/print/attribute/standard/DateTimeAtCompleted.java
index a81b8f0de2a..7553989e275 100644
--- a/libjava/javax/print/attribute/standard/DateTimeAtCompleted.java
+++ b/libjava/javax/print/attribute/standard/DateTimeAtCompleted.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Date;
+
 import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
@@ -82,7 +83,7 @@ public final class DateTimeAtCompleted extends DateTimeSyntax
    *
    * @return the class <code>DateTimeAtCompleted</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return DateTimeAtCompleted.class;
   }
@@ -92,7 +93,7 @@ public final class DateTimeAtCompleted extends DateTimeSyntax
    *
    * @return the string "date-time-at-completed"
    */
-  public final String getName()
+  public String getName()
   {
     return "date-time-at-completed";
   }
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtCreation.java b/libjava/javax/print/attribute/standard/DateTimeAtCreation.java
index 3e94c675a6a..df8463b2cfa 100644
--- a/libjava/javax/print/attribute/standard/DateTimeAtCreation.java
+++ b/libjava/javax/print/attribute/standard/DateTimeAtCreation.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Date;
+
 import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
@@ -82,7 +83,7 @@ public final class DateTimeAtCreation extends DateTimeSyntax
    *
    * @return the class <code>DateTimeAtCreation</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return DateTimeAtCreation.class;
   }
@@ -92,7 +93,7 @@ public final class DateTimeAtCreation extends DateTimeSyntax
    *
    * @return the string "date-time-at-creation"
    */
-  public final String getName()
+  public String getName()
   {
     return "date-time-at-creation";
   }
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtProcessing.java b/libjava/javax/print/attribute/standard/DateTimeAtProcessing.java
index 0cdeb935b29..b2a96be360a 100644
--- a/libjava/javax/print/attribute/standard/DateTimeAtProcessing.java
+++ b/libjava/javax/print/attribute/standard/DateTimeAtProcessing.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Date;
+
 import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
@@ -82,7 +83,7 @@ public final class DateTimeAtProcessing extends DateTimeSyntax
    *
    * @return the class <code>DateTimeAtProcessing</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return DateTimeAtProcessing.class;
   }
@@ -92,7 +93,7 @@ public final class DateTimeAtProcessing extends DateTimeSyntax
    *
    * @return the string "date-time-at-processing"
    */
-  public final String getName()
+  public String getName()
   {
     return "date-time-at-processing";
   }
diff --git a/libjava/javax/print/attribute/standard/DocumentName.java b/libjava/javax/print/attribute/standard/DocumentName.java
index 7ca04026786..91f41c48f16 100644
--- a/libjava/javax/print/attribute/standard/DocumentName.java
+++ b/libjava/javax/print/attribute/standard/DocumentName.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.DocAttribute;
 import javax.print.attribute.TextSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
@@ -82,7 +83,7 @@ public final class DocumentName extends TextSyntax
    *
    * @return the class <code>DocumentName</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return DocumentName.class;
   }
@@ -92,7 +93,7 @@ public final class DocumentName extends TextSyntax
    *
    * @return the string "document-name"
    */
-  public final String getName()
+  public String getName()
   {
     return "document-name";
   }
diff --git a/libjava/javax/print/attribute/standard/Fidelity.java b/libjava/javax/print/attribute/standard/Fidelity.java
index b0aa0eec044..d10077ff505 100644
--- a/libjava/javax/print/attribute/standard/Fidelity.java
+++ b/libjava/javax/print/attribute/standard/Fidelity.java
@@ -68,7 +68,7 @@ public final class Fidelity extends EnumSyntax
    *
    * @return the class <code>Fidelity</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return Fidelity.class;
   }
@@ -78,7 +78,7 @@ public final class Fidelity extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "fidelity";
   }
diff --git a/libjava/javax/print/attribute/standard/Finishings.java b/libjava/javax/print/attribute/standard/Finishings.java
index 1704fc51da1..117e6b200a2 100644
--- a/libjava/javax/print/attribute/standard/Finishings.java
+++ b/libjava/javax/print/attribute/standard/Finishings.java
@@ -85,7 +85,7 @@ public class Finishings extends EnumSyntax
    *
    * @return the class <code>Finishings</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return Finishings.class;
   }
@@ -95,7 +95,7 @@ public class Finishings extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "finishings";
   }
diff --git a/libjava/javax/print/attribute/standard/JobHoldUntil.java b/libjava/javax/print/attribute/standard/JobHoldUntil.java
index c285dc785af..31f9b924f90 100644
--- a/libjava/javax/print/attribute/standard/JobHoldUntil.java
+++ b/libjava/javax/print/attribute/standard/JobHoldUntil.java
@@ -35,9 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Date;
+
 import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
@@ -82,7 +84,7 @@ public final class JobHoldUntil extends DateTimeSyntax
    *
    * @return the class <code>JobHoldUntil</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobHoldUntil.class;
   }
@@ -92,7 +94,7 @@ public final class JobHoldUntil extends DateTimeSyntax
    *
    * @return the string "job-hold-until"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-hold-until";
   }
diff --git a/libjava/javax/print/attribute/standard/JobImpressions.java b/libjava/javax/print/attribute/standard/JobImpressions.java
index 0a02be9482f..e06c4a4fc2c 100644
--- a/libjava/javax/print/attribute/standard/JobImpressions.java
+++ b/libjava/javax/print/attribute/standard/JobImpressions.java
@@ -84,7 +84,7 @@ public final class JobImpressions extends IntegerSyntax
    *
    * @return the class <code>JobImpressions</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobImpressions.class;
   }
@@ -94,7 +94,7 @@ public final class JobImpressions extends IntegerSyntax
    *
    * @return the string "job-impressions"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-impressions";
   }
diff --git a/libjava/javax/print/attribute/standard/JobImpressionsCompleted.java b/libjava/javax/print/attribute/standard/JobImpressionsCompleted.java
index a494a27f2ee..0d41b1eaff1 100644
--- a/libjava/javax/print/attribute/standard/JobImpressionsCompleted.java
+++ b/libjava/javax/print/attribute/standard/JobImpressionsCompleted.java
@@ -83,7 +83,7 @@ public final class JobImpressionsCompleted extends IntegerSyntax
    *
    * @return the class <code>JobImpressionsCompleted</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobImpressionsCompleted.class;
   }
@@ -93,7 +93,7 @@ public final class JobImpressionsCompleted extends IntegerSyntax
    *
    * @return the string "job-impressions-completed"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-impressions";
   }
diff --git a/libjava/javax/print/attribute/standard/JobImpressionsSupported.java b/libjava/javax/print/attribute/standard/JobImpressionsSupported.java
index 6dce380701f..9090cbc96da 100644
--- a/libjava/javax/print/attribute/standard/JobImpressionsSupported.java
+++ b/libjava/javax/print/attribute/standard/JobImpressionsSupported.java
@@ -62,7 +62,7 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
    *
    * @return the class <code>JobImpressionsSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobImpressionsSupported.class;
   }
@@ -72,7 +72,7 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "job-impressions-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/JobKOctets.java b/libjava/javax/print/attribute/standard/JobKOctets.java
index fb6279f8dd2..b26ba11774e 100644
--- a/libjava/javax/print/attribute/standard/JobKOctets.java
+++ b/libjava/javax/print/attribute/standard/JobKOctets.java
@@ -84,7 +84,7 @@ public final class JobKOctets extends IntegerSyntax
    *
    * @return the class <code>JobKOctets</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobKOctets.class;
   }
@@ -94,7 +94,7 @@ public final class JobKOctets extends IntegerSyntax
    *
    * @return the string "job-k-octets"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-k-octets";
   }
diff --git a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java b/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java
index 90ed2de5107..319856eae9d 100644
--- a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java
+++ b/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java
@@ -83,7 +83,7 @@ public final class JobKOctetsProcessed extends IntegerSyntax
    *
    * @return the class <code>JobKOctetsProcessed</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobKOctetsProcessed.class;
   }
@@ -93,7 +93,7 @@ public final class JobKOctetsProcessed extends IntegerSyntax
    *
    * @return the string "job-k-octets-processed"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-k-octets-processed";
   }
diff --git a/libjava/javax/print/attribute/standard/JobKOctetsSupported.java b/libjava/javax/print/attribute/standard/JobKOctetsSupported.java
index 3a40dfda97d..ba03898012e 100644
--- a/libjava/javax/print/attribute/standard/JobKOctetsSupported.java
+++ b/libjava/javax/print/attribute/standard/JobKOctetsSupported.java
@@ -62,7 +62,7 @@ public final class JobKOctetsSupported extends SetOfIntegerSyntax
    *
    * @return the class <code>ColorSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobKOctetsSupported.class;
   }
@@ -72,7 +72,7 @@ public final class JobKOctetsSupported extends SetOfIntegerSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "job-k-octets-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheets.java b/libjava/javax/print/attribute/standard/JobMediaSheets.java
index 814fef67cf6..be73b8844b2 100644
--- a/libjava/javax/print/attribute/standard/JobMediaSheets.java
+++ b/libjava/javax/print/attribute/standard/JobMediaSheets.java
@@ -84,7 +84,7 @@ public class JobMediaSheets extends IntegerSyntax
    *
    * @return the class <code>JobMediaSheets</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobMediaSheets.class;
   }
@@ -94,7 +94,7 @@ public class JobMediaSheets extends IntegerSyntax
    *
    * @return the string "job-media-sheets"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-media-sheets";
   }
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java b/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java
index bc02b5fba17..c28488ee80f 100644
--- a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java
+++ b/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java
@@ -83,7 +83,7 @@ public final class JobMediaSheetsCompleted extends IntegerSyntax
    *
    * @return the class <code>JobMediaSheetsCompleted</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobMediaSheetsCompleted.class;
   }
@@ -93,7 +93,7 @@ public final class JobMediaSheetsCompleted extends IntegerSyntax
    *
    * @return the string "job-media-sheets-completed"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-media-sheets-completed";
   }
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.java b/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.java
index 00f3b61fee1..93900653bec 100644
--- a/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.java
+++ b/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.java
@@ -62,7 +62,7 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
    *
    * @return the class <code>JobMediaSheetsSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobMediaSheetsSupported.class;
   }
@@ -72,7 +72,7 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "job-media-sheets-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/JobMessageFromOperator.java b/libjava/javax/print/attribute/standard/JobMessageFromOperator.java
index b99cce1eeb2..66429cae93f 100644
--- a/libjava/javax/print/attribute/standard/JobMessageFromOperator.java
+++ b/libjava/javax/print/attribute/standard/JobMessageFromOperator.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
@@ -82,7 +83,7 @@ public final class JobMessageFromOperator extends TextSyntax
    *
    * @return the class <code>JobMessageFromOperator</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobMessageFromOperator.class;
   }
@@ -92,7 +93,7 @@ public final class JobMessageFromOperator extends TextSyntax
    *
    * @return the string "job-message-from-operator"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-message-from-operator";
   }
diff --git a/libjava/javax/print/attribute/standard/JobName.java b/libjava/javax/print/attribute/standard/JobName.java
index ba751b15f49..ca430389421 100644
--- a/libjava/javax/print/attribute/standard/JobName.java
+++ b/libjava/javax/print/attribute/standard/JobName.java
@@ -35,14 +35,15 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.TextSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
@@ -83,7 +84,7 @@ public final class JobName extends TextSyntax
    *
    * @return the class <code>JobName</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobName.class;
   }
@@ -93,7 +94,7 @@ public final class JobName extends TextSyntax
    *
    * @return the string "job-name"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-name";
   }
diff --git a/libjava/javax/print/attribute/standard/JobOriginatingUserName.java b/libjava/javax/print/attribute/standard/JobOriginatingUserName.java
index e0f404552a6..1810df808fe 100644
--- a/libjava/javax/print/attribute/standard/JobOriginatingUserName.java
+++ b/libjava/javax/print/attribute/standard/JobOriginatingUserName.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
@@ -82,7 +83,7 @@ public final class JobOriginatingUserName extends TextSyntax
    *
    * @return the class <code>JobOriginatingUserName</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobOriginatingUserName.class;
   }
@@ -92,7 +93,7 @@ public final class JobOriginatingUserName extends TextSyntax
    *
    * @return the string "job-originating-user-name"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-originating-user-name";
   }
diff --git a/libjava/javax/print/attribute/standard/JobPriority.java b/libjava/javax/print/attribute/standard/JobPriority.java
index 5f539c9315e..e4e4bf70c0c 100644
--- a/libjava/javax/print/attribute/standard/JobPriority.java
+++ b/libjava/javax/print/attribute/standard/JobPriority.java
@@ -85,7 +85,7 @@ public final class JobPriority extends IntegerSyntax
    *
    * @return the class <code>JobPriority</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobPriority.class;
   }
@@ -95,7 +95,7 @@ public final class JobPriority extends IntegerSyntax
    *
    * @return the string "job-priority"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-priority";
   }
diff --git a/libjava/javax/print/attribute/standard/JobPrioritySupported.java b/libjava/javax/print/attribute/standard/JobPrioritySupported.java
index 1b080306397..0ff1aa5ac38 100644
--- a/libjava/javax/print/attribute/standard/JobPrioritySupported.java
+++ b/libjava/javax/print/attribute/standard/JobPrioritySupported.java
@@ -84,7 +84,7 @@ public final class JobPrioritySupported extends IntegerSyntax
    *
    * @return the class <code>JobPrioritySupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobPrioritySupported.class;
   }
@@ -94,7 +94,7 @@ public final class JobPrioritySupported extends IntegerSyntax
    *
    * @return the string "job-priority-supported"
    */
-  public final String getName()
+  public String getName()
   {
     return "job-priority-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/JobSheets.java b/libjava/javax/print/attribute/standard/JobSheets.java
index db47b7ee6d7..0e1d12e4ccf 100644
--- a/libjava/javax/print/attribute/standard/JobSheets.java
+++ b/libjava/javax/print/attribute/standard/JobSheets.java
@@ -66,7 +66,7 @@ public class JobSheets extends EnumSyntax
    *
    * @return the class <code>JobSheets</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobSheets.class;
   }
@@ -76,7 +76,7 @@ public class JobSheets extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "job-sheets";
   }
diff --git a/libjava/javax/print/attribute/standard/JobState.java b/libjava/javax/print/attribute/standard/JobState.java
index f8eb15c3484..c0b2ac02b45 100644
--- a/libjava/javax/print/attribute/standard/JobState.java
+++ b/libjava/javax/print/attribute/standard/JobState.java
@@ -71,7 +71,7 @@ public class JobState extends EnumSyntax
    *
    * @return the class <code>JobState</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobState.class;
   }
@@ -81,7 +81,7 @@ public class JobState extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "job-state";
   }
diff --git a/libjava/javax/print/attribute/standard/JobStateReason.java b/libjava/javax/print/attribute/standard/JobStateReason.java
index aa2fd098cd5..a7038431606 100644
--- a/libjava/javax/print/attribute/standard/JobStateReason.java
+++ b/libjava/javax/print/attribute/standard/JobStateReason.java
@@ -64,7 +64,7 @@ public class JobStateReason extends EnumSyntax
    *
    * @return the class <code>JobStateReason</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobStateReason.class;
   }
@@ -74,7 +74,7 @@ public class JobStateReason extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "job-state-reason";
   }
diff --git a/libjava/javax/print/attribute/standard/JobStateReasons.java b/libjava/javax/print/attribute/standard/JobStateReasons.java
index fcfaff516ac..4b82002f9bf 100644
--- a/libjava/javax/print/attribute/standard/JobStateReasons.java
+++ b/libjava/javax/print/attribute/standard/JobStateReasons.java
@@ -35,11 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.HashSet;
-import javax.print.attribute.PrintJobAttribute;
 
+import javax.print.attribute.PrintJobAttribute;
 
 /**
  * @author Michael Koch (konqueror@gmx.de)
@@ -54,7 +55,7 @@ public final class JobStateReasons extends HashSet
    *
    * @return the class <code>ColorSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return JobStateReasons.class;
   }
@@ -64,7 +65,7 @@ public final class JobStateReasons extends HashSet
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "job-state-reasons";
   }
diff --git a/libjava/javax/print/attribute/standard/Media.java b/libjava/javax/print/attribute/standard/Media.java
index c9604570b8b..c56da91ee3b 100644
--- a/libjava/javax/print/attribute/standard/Media.java
+++ b/libjava/javax/print/attribute/standard/Media.java
@@ -64,7 +64,7 @@ public abstract class Media extends EnumSyntax
    *
    * @return the class <code>Media</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return Media.class;
   }
@@ -74,7 +74,7 @@ public abstract class Media extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "media";
   }
diff --git a/libjava/javax/print/attribute/standard/MultipleDocumentHandling.java b/libjava/javax/print/attribute/standard/MultipleDocumentHandling.java
index a064b214ae1..c6f3caadc8a 100644
--- a/libjava/javax/print/attribute/standard/MultipleDocumentHandling.java
+++ b/libjava/javax/print/attribute/standard/MultipleDocumentHandling.java
@@ -66,7 +66,7 @@ public class MultipleDocumentHandling extends EnumSyntax
    *
    * @return the class <code>MultipleDocumentHandling</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return MultipleDocumentHandling.class;
   }
@@ -76,7 +76,7 @@ public class MultipleDocumentHandling extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "multiple-document-handling";
   }
diff --git a/libjava/javax/print/attribute/standard/NumberOfDocuments.java b/libjava/javax/print/attribute/standard/NumberOfDocuments.java
index 22b15aba50f..9369e7e03bf 100644
--- a/libjava/javax/print/attribute/standard/NumberOfDocuments.java
+++ b/libjava/javax/print/attribute/standard/NumberOfDocuments.java
@@ -83,7 +83,7 @@ public final class NumberOfDocuments extends IntegerSyntax
    *
    * @return the class <code>NumberOfDocuments</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return NumberOfDocuments.class;
   }
@@ -93,7 +93,7 @@ public final class NumberOfDocuments extends IntegerSyntax
    *
    * @return the string "number-of-documents"
    */
-  public final String getName()
+  public String getName()
   {
     return "number-of-documents";
   }
diff --git a/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.java b/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.java
index b54089a71e1..fd3f1e14d6c 100644
--- a/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.java
+++ b/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.java
@@ -83,7 +83,7 @@ public final class NumberOfInterveningJobs extends IntegerSyntax
    *
    * @return the class <code>NumberOfInterveningJobs</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return NumberOfInterveningJobs.class;
   }
@@ -93,7 +93,7 @@ public final class NumberOfInterveningJobs extends IntegerSyntax
    *
    * @return the string "number-of-intervening-jobs"
    */
-  public final String getName()
+  public String getName()
   {
     return "number-of-intervening-jobs";
   }
diff --git a/libjava/javax/print/attribute/standard/NumberUp.java b/libjava/javax/print/attribute/standard/NumberUp.java
index 681207bd9cc..8770cdd6221 100644
--- a/libjava/javax/print/attribute/standard/NumberUp.java
+++ b/libjava/javax/print/attribute/standard/NumberUp.java
@@ -83,7 +83,7 @@ public final class NumberUp extends IntegerSyntax
    *
    * @return the class <code>NumberUp</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return NumberUp.class;
   }
@@ -93,7 +93,7 @@ public final class NumberUp extends IntegerSyntax
    *
    * @return the string "number-up"
    */
-  public final String getName()
+  public String getName()
   {
     return "number-up";
   }
diff --git a/libjava/javax/print/attribute/standard/NumberUpSupported.java b/libjava/javax/print/attribute/standard/NumberUpSupported.java
index 8418325e714..70fbab2deb9 100644
--- a/libjava/javax/print/attribute/standard/NumberUpSupported.java
+++ b/libjava/javax/print/attribute/standard/NumberUpSupported.java
@@ -78,7 +78,7 @@ public final class NumberUpSupported extends SetOfIntegerSyntax
    *
    * @return the class <code>NumberUpSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return NumberUpSupported.class;
   }
@@ -88,7 +88,7 @@ public final class NumberUpSupported extends SetOfIntegerSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "number-up-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/OrientationRequested.java b/libjava/javax/print/attribute/standard/OrientationRequested.java
index 76aef1d066e..41f6b50c213 100644
--- a/libjava/javax/print/attribute/standard/OrientationRequested.java
+++ b/libjava/javax/print/attribute/standard/OrientationRequested.java
@@ -73,7 +73,7 @@ public final class OrientationRequested extends EnumSyntax
    *
    * @return the class <code>OrientationRequested</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return OrientationRequested.class;
   }
@@ -83,7 +83,7 @@ public final class OrientationRequested extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "orientation-requested";
   }
diff --git a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java b/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java
index f41b36646fa..93a53e0c681 100644
--- a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java
+++ b/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java
@@ -35,9 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
@@ -81,7 +83,7 @@ public final class OutputDeviceAssigned extends TextSyntax
    *
    * @return the class <code>OutputDeviceAssigned</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return OutputDeviceAssigned.class;
   }
@@ -91,7 +93,7 @@ public final class OutputDeviceAssigned extends TextSyntax
    *
    * @return the string "output-device-assigned"
    */
-  public final String getName()
+  public String getName()
   {
     return "output-device-assigned";
   }
diff --git a/libjava/javax/print/attribute/standard/PDLOverrideSupported.java b/libjava/javax/print/attribute/standard/PDLOverrideSupported.java
index 64bc0584466..e65b67f4ff4 100644
--- a/libjava/javax/print/attribute/standard/PDLOverrideSupported.java
+++ b/libjava/javax/print/attribute/standard/PDLOverrideSupported.java
@@ -67,7 +67,7 @@ public class PDLOverrideSupported extends EnumSyntax
    *
    * @return the class <code>PDLOverrideSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return PDLOverrideSupported.class;
   }
@@ -77,7 +77,7 @@ public class PDLOverrideSupported extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "pdl-override-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/PageRanges.java b/libjava/javax/print/attribute/standard/PageRanges.java
index e981fe261bf..3445c93f02b 100644
--- a/libjava/javax/print/attribute/standard/PageRanges.java
+++ b/libjava/javax/print/attribute/standard/PageRanges.java
@@ -80,7 +80,7 @@ public final class PageRanges extends SetOfIntegerSyntax
    *
    * @return the class <code>PageRanges</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return PageRanges.class;
   }
@@ -90,7 +90,7 @@ public final class PageRanges extends SetOfIntegerSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "page-ranges";
   }
diff --git a/libjava/javax/print/attribute/standard/PagesPerMinute.java b/libjava/javax/print/attribute/standard/PagesPerMinute.java
index 9bb3b5fd7e5..b6b7a1d0868 100644
--- a/libjava/javax/print/attribute/standard/PagesPerMinute.java
+++ b/libjava/javax/print/attribute/standard/PagesPerMinute.java
@@ -1,5 +1,5 @@
 /* PagesPerMinute.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * @author Michael Koch
+ * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PagesPerMinute extends IntegerSyntax
   implements PrintServiceAttribute
@@ -83,7 +84,7 @@ public final class PagesPerMinute extends IntegerSyntax
    *
    * @return the class <code>PagesPerMinute</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return PagesPerMinute.class;
   }
@@ -93,7 +94,7 @@ public final class PagesPerMinute extends IntegerSyntax
    *
    * @return the string "pages-per-minute"
    */
-  public final String getName()
+  public String getName()
   {
     return "pages-per-minute";
   }
diff --git a/libjava/javax/print/attribute/standard/PagesPerMinuteColor.java b/libjava/javax/print/attribute/standard/PagesPerMinuteColor.java
index b85262abb15..12c4f338e9d 100644
--- a/libjava/javax/print/attribute/standard/PagesPerMinuteColor.java
+++ b/libjava/javax/print/attribute/standard/PagesPerMinuteColor.java
@@ -83,7 +83,7 @@ public final class PagesPerMinuteColor extends IntegerSyntax
    *
    * @return the class <code>PagesPerMinuteColor</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return PagesPerMinuteColor.class;
   }
@@ -93,7 +93,7 @@ public final class PagesPerMinuteColor extends IntegerSyntax
    *
    * @return the string "pages-per-minute-color"
    */
-  public final String getName()
+  public String getName()
   {
     return "pages-per-minute-color";
   }
diff --git a/libjava/javax/print/attribute/standard/PrintQuality.java b/libjava/javax/print/attribute/standard/PrintQuality.java
index e25329300bd..be78cab9eed 100644
--- a/libjava/javax/print/attribute/standard/PrintQuality.java
+++ b/libjava/javax/print/attribute/standard/PrintQuality.java
@@ -68,7 +68,7 @@ public class PrintQuality extends EnumSyntax
    *
    * @return the class <code>PrintQuality</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return PrintQuality.class;
   }
@@ -78,7 +78,7 @@ public class PrintQuality extends EnumSyntax
    *
    * @return the string "print-quality"
    */
-  public final String getName()
+  public String getName()
   {
     return "print-quality";
   }
diff --git a/libjava/javax/print/attribute/standard/PrinterInfo.java b/libjava/javax/print/attribute/standard/PrinterInfo.java
index c61d118c7c6..cca88c1e8f8 100644
--- a/libjava/javax/print/attribute/standard/PrinterInfo.java
+++ b/libjava/javax/print/attribute/standard/PrinterInfo.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
diff --git a/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.java b/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
index eafc643d9b8..dac5672624f 100644
--- a/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
+++ b/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
@@ -67,7 +67,7 @@ public class PrinterIsAcceptingJobs extends EnumSyntax
    *
    * @return the class <code>PrinterIsAcceptingJobs</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return PrinterIsAcceptingJobs.class;
   }
@@ -77,7 +77,7 @@ public class PrinterIsAcceptingJobs extends EnumSyntax
    *
    * @return the name
    */
-  public final String getName()
+  public String getName()
   {
     return "printer-is-accepting-jobs";
   }
diff --git a/libjava/javax/print/attribute/standard/PrinterLocation.java b/libjava/javax/print/attribute/standard/PrinterLocation.java
index 4f6976bc0d5..1037677f605 100644
--- a/libjava/javax/print/attribute/standard/PrinterLocation.java
+++ b/libjava/javax/print/attribute/standard/PrinterLocation.java
@@ -35,9 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
diff --git a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.java b/libjava/javax/print/attribute/standard/PrinterMakeAndModel.java
index 8c8eea8bf56..517fa420562 100644
--- a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.java
+++ b/libjava/javax/print/attribute/standard/PrinterMakeAndModel.java
@@ -35,9 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
diff --git a/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.java b/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.java
index 92599a8c150..50e9273c03f 100644
--- a/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.java
+++ b/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
diff --git a/libjava/javax/print/attribute/standard/PrinterMoreInfo.java b/libjava/javax/print/attribute/standard/PrinterMoreInfo.java
index 06b128744e8..5aa53cc6829 100644
--- a/libjava/javax/print/attribute/standard/PrinterMoreInfo.java
+++ b/libjava/javax/print/attribute/standard/PrinterMoreInfo.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.net.URI;
+
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
diff --git a/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java b/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
index 1a6508779c4..83dba0871ad 100644
--- a/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
+++ b/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.net.URI;
+
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
diff --git a/libjava/javax/print/attribute/standard/PrinterName.java b/libjava/javax/print/attribute/standard/PrinterName.java
index c502fbe9a7c..a2bdc9b8e85 100644
--- a/libjava/javax/print/attribute/standard/PrinterName.java
+++ b/libjava/javax/print/attribute/standard/PrinterName.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReason.java b/libjava/javax/print/attribute/standard/PrinterStateReason.java
index f144f73279b..c471d8f4115 100644
--- a/libjava/javax/print/attribute/standard/PrinterStateReason.java
+++ b/libjava/javax/print/attribute/standard/PrinterStateReason.java
@@ -35,12 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import javax.print.attribute.Attribute;
 import javax.print.attribute.EnumSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
@@ -123,7 +123,7 @@ public class PrinterStateReason extends EnumSyntax
    *
    * @return the class <code>PrintStateReason</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return PrinterStateReason.class;
   }
@@ -133,7 +133,7 @@ public class PrinterStateReason extends EnumSyntax
    *
    * @return the string "printer-state-reason"
    */
-  public final String getName()
+  public String getName()
   {
     return "printer-state-reason";
   }
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReasons.java b/libjava/javax/print/attribute/standard/PrinterStateReasons.java
index 88124b86a1b..7e33e776148 100644
--- a/libjava/javax/print/attribute/standard/PrinterStateReasons.java
+++ b/libjava/javax/print/attribute/standard/PrinterStateReasons.java
@@ -35,11 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.HashMap;
-import javax.print.attribute.PrintServiceAttribute;
 
+import javax.print.attribute.PrintServiceAttribute;
 
 /**
  * @author Michael Koch (konqueror@gmx.de)
diff --git a/libjava/javax/print/attribute/standard/PrinterURI.java b/libjava/javax/print/attribute/standard/PrinterURI.java
index ff55123b39a..a3e2ceb589a 100644
--- a/libjava/javax/print/attribute/standard/PrinterURI.java
+++ b/libjava/javax/print/attribute/standard/PrinterURI.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.net.URI;
+
 import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
diff --git a/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
index 0b10cdd3a60..096d2fefdef 100644
--- a/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
+++ b/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
@@ -79,7 +79,7 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
    *
    * @return the class <code>ReferenceUriSchemesSupported</code> itself
    */
-  public final Class getCategory()
+  public Class getCategory()
   {
     return ReferenceUriSchemesSupported.class;
   }
@@ -89,7 +89,7 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
    *
    * @return the string "reference-uri-schemes-supported"
    */
-  public final String getName()
+  public String getName()
   {
     return "reference-uri-schemes-supported";
   }
diff --git a/libjava/javax/print/attribute/standard/RequestingUserName.java b/libjava/javax/print/attribute/standard/RequestingUserName.java
index cc0bee8f7c9..3de3903f700 100644
--- a/libjava/javax/print/attribute/standard/RequestingUserName.java
+++ b/libjava/javax/print/attribute/standard/RequestingUserName.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.print.attribute.standard;
 
 import java.util.Locale;
+
 import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.TextSyntax;
 
-
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */