9 files changed, 32 insertions, 16 deletions
diff --git a/libjava/javax/crypto/CipherInputStream.java b/libjava/javax/crypto/CipherInputStream.java
index c01cb47..35d4956 100644
--- a/libjava/javax/crypto/CipherInputStream.java
+++ b/libjava/javax/crypto/CipherInputStream.java
@@ -294,7 +294,7 @@ public class CipherInputStream extends FilterInputStream
    *
    * @param mark Is ignored.
    */
-  public void mark(long mark)
+  public void mark(int mark)
   {
   }
 
diff --git a/libjava/javax/crypto/ExemptionMechanism.java b/libjava/javax/crypto/ExemptionMechanism.java
index 2b2091e..b00ff0d 100644
--- a/libjava/javax/crypto/ExemptionMechanism.java
+++ b/libjava/javax/crypto/ExemptionMechanism.java
@@ -222,4 +222,8 @@ public class ExemptionMechanism
   {
     return true;
   }
+
+  protected void finalize()
+  {
+  }
 }
diff --git a/libjava/javax/crypto/Mac.java b/libjava/javax/crypto/Mac.java
index 301ec32..9bbd68c 100644
--- a/libjava/javax/crypto/Mac.java
+++ b/libjava/javax/crypto/Mac.java
@@ -290,7 +290,7 @@ public class Mac implements Cloneable
    *
    * @return The MAC length.
    */
-  public int getMacLength()
+  public final int getMacLength()
   {
     return macSpi.engineGetMacLength();
   }
@@ -404,7 +404,7 @@ public class Mac implements Cloneable
    * @throws java.lang.CloneNotSupportedException If the underlying
    *         implementation is not cloneable.
    */
-  public Object clone() throws CloneNotSupportedException
+  public final Object clone() throws CloneNotSupportedException
   {
     Mac result = new Mac((MacSpi) macSpi.clone(), provider, algorithm);
     result.virgin = virgin;
diff --git a/libjava/javax/imageio/ImageIO.java b/libjava/javax/imageio/ImageIO.java
index 5cc7c92..6aa5558 100644
--- a/libjava/javax/imageio/ImageIO.java
+++ b/libjava/javax/imageio/ImageIO.java
@@ -51,6 +51,11 @@ import javax.imageio.spi.ServiceRegistry;
 
 public final class ImageIO
 {
+  /**
+   * This class isn't intended to be instantiated.
+   */
+  private ImageIO() {}
+
   private static final class ReaderFormatFilter implements ServiceRegistry.Filter
   {
     private String formatName;
diff --git a/libjava/javax/imageio/stream/ImageInputStreamImpl.java b/libjava/javax/imageio/stream/ImageInputStreamImpl.java
index 27cb6c5..3a5d6dc 100644
--- a/libjava/javax/imageio/stream/ImageInputStreamImpl.java
+++ b/libjava/javax/imageio/stream/ImageInputStreamImpl.java
@@ -58,7 +58,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
     // Do nothing here.
   }
 
-  protected void checkClosed()
+  protected final void checkClosed()
     throws IOException
   {
     if (closed)
diff --git a/libjava/javax/net/ssl/SSLPermission.java b/libjava/javax/net/ssl/SSLPermission.java
index 3771eaf..0fa4a59 100644
--- a/libjava/javax/net/ssl/SSLPermission.java
+++ b/libjava/javax/net/ssl/SSLPermission.java
@@ -43,7 +43,7 @@ import java.security.BasicPermission;
 /**
  * A permission used for accessing SSL classes.
  */
-public class SSLPermission extends BasicPermission
+public final class SSLPermission extends BasicPermission
 {
 
   // Constant.
diff --git a/libjava/javax/print/DocFlavor.java b/libjava/javax/print/DocFlavor.java
index 381e288..11cc36d 100644
--- a/libjava/javax/print/DocFlavor.java
+++ b/libjava/javax/print/DocFlavor.java
@@ -217,7 +217,9 @@ public class DocFlavor implements Cloneable, Serializable
   
   private static final long serialVersionUID = -4512080796965449721L;
   
-  public static final String hostEncoding = "US-ASCII";
+  // FIXME: Get the host encoding from somewhere. Note that the new String is to make
+  // sure the field won't be a compile time constant.
+  public static final String hostEncoding = new String("US-ASCII");
 
   private String mediaSubtype;
   private String mediaType;
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities.java b/libjava/javax/print/attribute/AttributeSetUtilities.java
index 3c72480..32bee51 100644
--- a/libjava/javax/print/attribute/AttributeSetUtilities.java
+++ b/libjava/javax/print/attribute/AttributeSetUtilities.java
@@ -41,6 +41,11 @@ import java.io.Serializable;
 
 public final class AttributeSetUtilities
 {
+  /**
+   * This class isn't intended to be instantiated.
+   */
+  private AttributeSetUtilities() {}
+
   private static class UnmodifiableAttributeSet
     implements AttributeSet, Serializable
   {
@@ -120,7 +125,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class UnmodifiableDocAttributeSet
+  private static class UnmodifiableDocAttributeSet
     extends UnmodifiableAttributeSet
     implements DocAttributeSet, Serializable
   {
@@ -130,7 +135,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class UnmodifiablePrintJobAttributeSet
+  private static class UnmodifiablePrintJobAttributeSet
     extends UnmodifiableAttributeSet
     implements PrintJobAttributeSet, Serializable
   {
@@ -140,7 +145,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class UnmodifiablePrintRequestAttributeSet
+  private static class UnmodifiablePrintRequestAttributeSet
     extends UnmodifiableAttributeSet
     implements PrintRequestAttributeSet, Serializable
   {
@@ -150,7 +155,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class UnmodifiablePrintServiceAttributeSet
+  private static class UnmodifiablePrintServiceAttributeSet
     extends UnmodifiableAttributeSet
     implements PrintServiceAttributeSet, Serializable
   {
@@ -160,7 +165,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class SynchronizedAttributeSet
+  private static class SynchronizedAttributeSet
     implements AttributeSet, Serializable
   {
     private AttributeSet set;
@@ -239,7 +244,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class SynchronizedDocAttributeSet
+  private static class SynchronizedDocAttributeSet
     extends SynchronizedAttributeSet
     implements DocAttributeSet, Serializable
   {
@@ -249,7 +254,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class SynchronizedPrintJobAttributeSet
+  private static class SynchronizedPrintJobAttributeSet
     extends SynchronizedAttributeSet
     implements PrintJobAttributeSet, Serializable
   {
@@ -259,7 +264,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class SynchronizedPrintRequestAttributeSet
+  private static class SynchronizedPrintRequestAttributeSet
     extends SynchronizedAttributeSet
     implements PrintRequestAttributeSet, Serializable
   {
@@ -269,7 +274,7 @@ public final class AttributeSetUtilities
     }
   }
 
-  public static class SynchronizedPrintServiceAttributeSet
+  private static class SynchronizedPrintServiceAttributeSet
     extends SynchronizedAttributeSet
     implements PrintServiceAttributeSet, Serializable
   {
diff --git a/libjava/javax/security/auth/PrivateCredentialPermission.java b/libjava/javax/security/auth/PrivateCredentialPermission.java
index cc370ae..c8573f7 100644
--- a/libjava/javax/security/auth/PrivateCredentialPermission.java
+++ b/libjava/javax/security/auth/PrivateCredentialPermission.java
@@ -63,7 +63,7 @@ import java.util.StringTokenizer;
  * <i>PrincipalName</i> is a string representing the principal, or the
  * wildcard character.</p>
  */
-public class PrivateCredentialPermission extends Permission
+public final class PrivateCredentialPermission extends Permission
   implements Serializable
 {
   /**