diff options
| author | Jeroen Frijters <jeroen@frijters.net> | 2004-11-18 15:26:45 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-11-18 15:26:45 +0000 |
| commit | a73498160839a23ebcda694c117be41ddb197528 (patch) | |
| tree | 9338ba46e1d50f05eca700161824c4a97dbb3435 /libjava/javax/crypto | |
| parent | 9ef8069a0cc1e5071ca40a5685247b56be5a68d4 (diff) | |
| download | gcc-a73498160839a23ebcda694c117be41ddb197528.zip gcc-a73498160839a23ebcda694c117be41ddb197528.tar.gz gcc-a73498160839a23ebcda694c117be41ddb197528.tar.bz2 | |
StackTraceElement.java: Made final.
2004-11-18 Jeroen Frijters <address@bogus.example.com>
* java/lang/StackTraceElement.java: Made final.
* java/nio/channels/Channels.java: Added private constructor.
* java/rmi/Naming.java: Added private constructor.
* java/rmi/registry/LocateRegistry.java: Added private constructor.
* java/rmi/server/RMIClassLoader.java: Added private constructor.
* java/security/KeyPairGeneratorSpi.java
(clone): Made protected and simplified implementation.
* java/text/DateFormat.java
(allFields): Made package accessible.
* java/text/DecimalFormat.java
(formatInternal): Made private.
* java/text/Format.java
(formatInternal): Made private.
* java/util/logging/Handler.java: Made constructor protected.
* java/util/regex/Matcher.java: Made final.
* java/util/regex/Pattern.java: Made final.
* javax/crypto/CipherInputStream.java
(mark): Corrected mark parameter type (from long to int).
* javax/crypto/ExemptionMechanism.java
(finalize): Added.
* javax/crypto/Mac.java
(getMacLength): Made final.
(clone): Made final.
* javax/imageio/ImageIO.java: Added private constructor.
* javax/imageio/stream/ImageInputStreamImpl.java
(checkClosed): Made final.
* javax/net/ssl/SSLPermission.java: Made final.
* javax/print/DocFlavor.java
(hostEncoding): Added work-around to prevent the field from being
a compile time constant.
* javax/print/attribute/AttributeSetUtilities.java: Added private
constructor.
(UnmodifiableDocAttributeSet): Made private.
(UnmodifiablePrintJobAttributeSet): Made private.
(UnmodifiablePrintRequestAttributeSet): Made private.
(UnmodifiablePrintServiceAttributeSet): Made private.
(SynchronizedAttributeSet): Made private.
(SynchronizedDocAttributeSet): Made private.
(SynchronizedPrintJobAttributeSet): Made private.
(SynchronizedPrintRequestAttributeSet): Made private.
(SynchronizedPrintServiceAttributeSet): Made private.
* javax/security/auth/PrivateCredentialPermission.java: Made final.
From-SVN: r90866
Diffstat (limited to 'libjava/javax/crypto')
| -rw-r--r-- | libjava/javax/crypto/CipherInputStream.java | 2 | ||||
| -rw-r--r-- | libjava/javax/crypto/ExemptionMechanism.java | 4 | ||||
| -rw-r--r-- | libjava/javax/crypto/Mac.java | 4 |
3 files changed, 7 insertions, 3 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; |