2006-02-06 Wolfgang Baer <WBaer@gmx.de>

	* javax/print/attribute/standard/Compression.java,
	* javax/print/attribute/standard/Finishings.java,
	* javax/print/attribute/standard/JobMediaSheets.java,
	* javax/print/attribute/standard/JobSheets.java,
	* javax/print/attribute/standard/JobState.java,
	* javax/print/attribute/standard/JobStateReason.java,
	* javax/print/attribute/standard/ReferenceUriSchemesSupported.java,
	* javax/print/attribute/standard/PrintQuality.java,
	* javax/print/attribute/standard/Media.java,
	* javax/print/attribute/standard/MultipleDocumentHandling.java,
	* javax/print/attribute/standard/PrinterStateReason.java,
	* javax/print/attribute/standard/PDLOverrideSupported.java:
	(getName): Make method final.
	(getCategory): Likewise.
	* javax/print/attribute/standard/MediaSize.java:
	(getName): Make method final.
	(getCategory): Likewise.
	(ISO): Added private default constructor.
	(NA): Likewise.
	(JIS): Likewise.
	(Other): Likewise.
	(Engineering): Likewise.

13 files changed, 63 insertions, 39 deletions

diff --git a/javax/print/attribute/standard/Compression.java b/javax/print/attribute/standard/Compression.java
index d29ffa0fc..01891fe23 100644
--- a/javax/print/attribute/standard/Compression.java
+++ b/javax/print/attribute/standard/Compression.java
@@ -1,5 +1,5 @@
 /* Compression.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -91,7 +91,7 @@ public class Compression extends EnumSyntax
    *
    * @return The class <code>Compression</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return Compression.class;
   }
@@ -101,7 +101,7 @@ public class Compression extends EnumSyntax
    *
    * @return The name "compression".
    */
-  public String getName()
+  public final String getName()
   {
     return "compression";
   }
diff --git a/javax/print/attribute/standard/Finishings.java b/javax/print/attribute/standard/Finishings.java
index 6d474a6ea..963485e7b 100644
--- a/javax/print/attribute/standard/Finishings.java
+++ b/javax/print/attribute/standard/Finishings.java
@@ -1,5 +1,5 @@
 /* Finishings.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -238,7 +238,7 @@ public class Finishings extends EnumSyntax
    *
    * @return the class <code>Finishings</code> itself
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return Finishings.class;
   }
@@ -248,7 +248,7 @@ public class Finishings extends EnumSyntax
    *
    * @return The name "finishings".
    */
-  public String getName()
+  public final String getName()
   {
     return "finishings";
   }
diff --git a/javax/print/attribute/standard/JobMediaSheets.java b/javax/print/attribute/standard/JobMediaSheets.java
index 75e072c54..04b83069c 100644
--- a/javax/print/attribute/standard/JobMediaSheets.java
+++ b/javax/print/attribute/standard/JobMediaSheets.java
@@ -1,5 +1,5 @@
 /* JobMediaSheets.java -- 
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -107,7 +107,7 @@ public class JobMediaSheets extends IntegerSyntax
    *
    * @return The class <code>JobMediaSheets</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return JobMediaSheets.class;
   }
@@ -117,7 +117,7 @@ public class JobMediaSheets extends IntegerSyntax
    *
    * @return The name "job-media-sheets".
    */
-  public String getName()
+  public final String getName()
   {
     return "job-media-sheets";
   }
diff --git a/javax/print/attribute/standard/JobSheets.java b/javax/print/attribute/standard/JobSheets.java
index d61acfee9..f2cfacc9e 100644
--- a/javax/print/attribute/standard/JobSheets.java
+++ b/javax/print/attribute/standard/JobSheets.java
@@ -1,5 +1,5 @@
 /* JobSheets.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -88,7 +88,7 @@ public class JobSheets extends EnumSyntax
    *
    * @return The class <code>JobSheets</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return JobSheets.class;
   }
@@ -98,7 +98,7 @@ public class JobSheets extends EnumSyntax
    *
    * @return The name "job-sheets".
    */
-  public String getName()
+  public final String getName()
   {
     return "job-sheets";
   }
diff --git a/javax/print/attribute/standard/JobState.java b/javax/print/attribute/standard/JobState.java
index bd09e1fb1..8289569c3 100644
--- a/javax/print/attribute/standard/JobState.java
+++ b/javax/print/attribute/standard/JobState.java
@@ -1,5 +1,5 @@
 /* JobState.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -137,7 +137,7 @@ public class JobState extends EnumSyntax
    *
    * @return The class <code>JobState</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return JobState.class;
   }
@@ -147,7 +147,7 @@ public class JobState extends EnumSyntax
    *
    * @return The name "job-state".
    */
-  public String getName()
+  public final String getName()
   {
     return "job-state";
   }
diff --git a/javax/print/attribute/standard/JobStateReason.java b/javax/print/attribute/standard/JobStateReason.java
index bd831cda5..967a6bf2e 100644
--- a/javax/print/attribute/standard/JobStateReason.java
+++ b/javax/print/attribute/standard/JobStateReason.java
@@ -1,5 +1,5 @@
 /* JobStateReason.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -262,7 +262,7 @@ public class JobStateReason extends EnumSyntax
    *
    * @return The class <code>JobStateReason</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return JobStateReason.class;
   }
@@ -272,7 +272,7 @@ public class JobStateReason extends EnumSyntax
    *
    * @return The name "job-state-reason".
    */
-  public String getName()
+  public final String getName()
   {
     return "job-state-reason";
   }
diff --git a/javax/print/attribute/standard/Media.java b/javax/print/attribute/standard/Media.java
index 202a3f3f0..37132e727 100644
--- a/javax/print/attribute/standard/Media.java
+++ b/javax/print/attribute/standard/Media.java
@@ -1,5 +1,5 @@
 /* Media.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -105,7 +105,7 @@ public abstract class Media extends EnumSyntax
    *
    * @return The class <code>Media</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return Media.class;
   }
@@ -115,7 +115,7 @@ public abstract class Media extends EnumSyntax
    *
    * @return The name "media".
    */
-  public String getName()
+  public final String getName()
   {
     return "media";
   }
diff --git a/javax/print/attribute/standard/MediaSize.java b/javax/print/attribute/standard/MediaSize.java
index 2434b6260..e094f8081 100644
--- a/javax/print/attribute/standard/MediaSize.java
+++ b/javax/print/attribute/standard/MediaSize.java
@@ -180,7 +180,7 @@ public class MediaSize extends Size2DSyntax
    *
    * @return The class <code>MediaSize</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return MediaSize.class;
   }
@@ -281,7 +281,7 @@ public class MediaSize extends Size2DSyntax
    *
    * @return The name "media-size".
    */
-  public String getName()
+  public final String getName()
   {
     return "media-size";
   }
@@ -293,7 +293,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class ISO 
   {
-
+    private ISO()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * ISO A0 paper, 841 mm x 1189 mm.
      */
@@ -442,6 +446,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class NA
   {
+    private NA()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * US Legal paper size, 8.5 inch x 14 inch
      */
@@ -557,6 +566,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class Engineering 
   {
+    private Engineering()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * ANSI A paper size. 8.5 inch x 11 inch
      */
@@ -595,6 +609,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class JIS 
   {
+    private JIS()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * JIS B0 paper. 1030 mm x 1456 mm
      * Note: The JIS B-series is not identical to the ISO B-series.
@@ -789,6 +808,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class Other
   {
+    private Other()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * US Executive paper size, 7.25 inch x 10.5 inch
      */
diff --git a/javax/print/attribute/standard/MultipleDocumentHandling.java b/javax/print/attribute/standard/MultipleDocumentHandling.java
index 1ed0c9138..1a89fd01a 100644
--- a/javax/print/attribute/standard/MultipleDocumentHandling.java
+++ b/javax/print/attribute/standard/MultipleDocumentHandling.java
@@ -1,5 +1,5 @@
 /* MultipleDocumentHandling.java --
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -108,7 +108,7 @@ public class MultipleDocumentHandling extends EnumSyntax
    *
    * @return The class <code>MultipleDocumentHandling</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return MultipleDocumentHandling.class;
   }
@@ -118,7 +118,7 @@ public class MultipleDocumentHandling extends EnumSyntax
    *
    * @return The name "multiple-document-handling".
    */
-  public String getName()
+  public final String getName()
   {
     return "multiple-document-handling";
   }
diff --git a/javax/print/attribute/standard/PDLOverrideSupported.java b/javax/print/attribute/standard/PDLOverrideSupported.java
index d3be3e552..ee07edb1a 100644
--- a/javax/print/attribute/standard/PDLOverrideSupported.java
+++ b/javax/print/attribute/standard/PDLOverrideSupported.java
@@ -1,5 +1,5 @@
 /* PDLOverrideSupported.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -91,7 +91,7 @@ public class PDLOverrideSupported extends EnumSyntax
    *
    * @return The class  <code>PDLOverrideSupported</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return PDLOverrideSupported.class;
   }
@@ -101,7 +101,7 @@ public class PDLOverrideSupported extends EnumSyntax
    *
    * @return The name "pdl-override-supported".
    */
-  public String getName()
+  public final String getName()
   {
     return "pdl-override-supported";
   }
diff --git a/javax/print/attribute/standard/PrintQuality.java b/javax/print/attribute/standard/PrintQuality.java
index 2f1a105ce..c581d5f9d 100644
--- a/javax/print/attribute/standard/PrintQuality.java
+++ b/javax/print/attribute/standard/PrintQuality.java
@@ -1,5 +1,5 @@
 /* PrintQuality.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -92,7 +92,7 @@ public class PrintQuality extends EnumSyntax
    *
    * @return The class <code>PrintQuality</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return PrintQuality.class;
   }
@@ -102,7 +102,7 @@ public class PrintQuality extends EnumSyntax
    *
    * @return The name "print-quality".
    */
-  public String getName()
+  public final String getName()
   {
     return "print-quality";
   }
diff --git a/javax/print/attribute/standard/PrinterStateReason.java b/javax/print/attribute/standard/PrinterStateReason.java
index 3a1358544..340bfbabf 100644
--- a/javax/print/attribute/standard/PrinterStateReason.java
+++ b/javax/print/attribute/standard/PrinterStateReason.java
@@ -1,5 +1,5 @@
 /* PrinterStateReason.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -293,7 +293,7 @@ public class PrinterStateReason extends EnumSyntax
    *
    * @return The class <code>PrintStateReason</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return PrinterStateReason.class;
   }
@@ -303,7 +303,7 @@ public class PrinterStateReason extends EnumSyntax
    *
    * @return The name "printer-state-reason".
    */
-  public String getName()
+  public final String getName()
   {
     return "printer-state-reason";
   }
diff --git a/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
index 8a00218b8..aeccaac5b 100644
--- a/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
+++ b/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
@@ -1,5 +1,5 @@
 /* ReferenceUriSchemesSupported.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -128,7 +128,7 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
    *
    * @return The class <code>ReferenceUriSchemesSupported</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return ReferenceUriSchemesSupported.class;
   }
@@ -138,7 +138,7 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
    *
    * @return The name "reference-uri-schemes-supported".
    */
-  public String getName()
+  public final String getName()
   {
     return "reference-uri-schemes-supported";
   }