From a73498160839a23ebcda694c117be41ddb197528 Mon Sep 17 00:00:00 2001 From: Jeroen Frijters Date: Thu, 18 Nov 2004 15:26:45 +0000 Subject: StackTraceElement.java: Made final. 2004-11-18 Jeroen Frijters * 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 --- libjava/java/lang/StackTraceElement.java | 2 +- libjava/java/nio/channels/Channels.java | 5 +++++ libjava/java/rmi/Naming.java | 4 ++++ libjava/java/rmi/registry/LocateRegistry.java | 4 ++++ libjava/java/rmi/server/RMIClassLoader.java | 5 +++++ libjava/java/security/KeyPairGeneratorSpi.java | 15 ++++----------- libjava/java/text/DateFormat.java | 2 +- libjava/java/text/DecimalFormat.java | 4 ++-- libjava/java/text/Format.java | 2 +- libjava/java/util/logging/Handler.java | 1 + libjava/java/util/regex/Matcher.java | 2 +- libjava/java/util/regex/Pattern.java | 2 +- 12 files changed, 30 insertions(+), 18 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/StackTraceElement.java b/libjava/java/lang/StackTraceElement.java index 02500d8..4495186 100644 --- a/libjava/java/lang/StackTraceElement.java +++ b/libjava/java/lang/StackTraceElement.java @@ -51,7 +51,7 @@ import java.io.Serializable; * @since 1.4 * @status updated to 1.4 */ -public class StackTraceElement implements Serializable +public final class StackTraceElement implements Serializable { /** * Compatible with JDK 1.4+. diff --git a/libjava/java/nio/channels/Channels.java b/libjava/java/nio/channels/Channels.java index 9b446e4..3e5316e 100644 --- a/libjava/java/nio/channels/Channels.java +++ b/libjava/java/nio/channels/Channels.java @@ -60,6 +60,11 @@ import java.nio.charset.CharsetEncoder; public final class Channels { /** + * This class isn't intended to be instantiated. + */ + private Channels() {} + + /** * Constructs a stream that reads bytes from the given channel. */ public static InputStream newInputStream(ReadableByteChannel ch) diff --git a/libjava/java/rmi/Naming.java b/libjava/java/rmi/Naming.java index 74ad962..4df9045 100644 --- a/libjava/java/rmi/Naming.java +++ b/libjava/java/rmi/Naming.java @@ -44,6 +44,10 @@ import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; public final class Naming { + /** + * This class isn't intended to be instantiated. + */ + private Naming() {} /** * Looks for the remote object that is associated with the named service. diff --git a/libjava/java/rmi/registry/LocateRegistry.java b/libjava/java/rmi/registry/LocateRegistry.java index aaf9333..5845215 100644 --- a/libjava/java/rmi/registry/LocateRegistry.java +++ b/libjava/java/rmi/registry/LocateRegistry.java @@ -50,6 +50,10 @@ import java.rmi.server.RMISocketFactory; import java.rmi.server.RemoteRef; public final class LocateRegistry { + /** + * This class isn't intended to be instantiated. + */ + private LocateRegistry() {} public static Registry getRegistry() throws RemoteException { return (getRegistry("localhost", Registry.REGISTRY_PORT)); diff --git a/libjava/java/rmi/server/RMIClassLoader.java b/libjava/java/rmi/server/RMIClassLoader.java index 006bc45..6add274 100644 --- a/libjava/java/rmi/server/RMIClassLoader.java +++ b/libjava/java/rmi/server/RMIClassLoader.java @@ -55,6 +55,11 @@ import java.util.StringTokenizer; */ public class RMIClassLoader { + /** + * This class isn't intended to be instantiated. + */ + private RMIClassLoader() {} + private static class MyClassLoader extends URLClassLoader { // Package-private to avoid a trampoline constructor. diff --git a/libjava/java/security/KeyPairGeneratorSpi.java b/libjava/java/security/KeyPairGeneratorSpi.java index 735dd64..07de178 100644 --- a/libjava/java/security/KeyPairGeneratorSpi.java +++ b/libjava/java/security/KeyPairGeneratorSpi.java @@ -92,18 +92,11 @@ public abstract class KeyPairGeneratorSpi public abstract KeyPair generateKeyPair(); /** - Returns a clone of this class. - - If cloning is not supported, then by default the class throws a - CloneNotSupportedException. The MessageDigestSpi provider - implementation has to overload this class in order to be - cloneable. + * We override clone here to make it accessible for use by + * DummyKeyPairGenerator. */ - public Object clone() throws CloneNotSupportedException + protected Object clone() throws CloneNotSupportedException { - if (this instanceof Cloneable) - return super.clone(); - else - throw new CloneNotSupportedException(); + return super.clone(); } } diff --git a/libjava/java/text/DateFormat.java b/libjava/java/text/DateFormat.java index 8b70566..6fe4461 100644 --- a/libjava/java/text/DateFormat.java +++ b/libjava/java/text/DateFormat.java @@ -137,7 +137,7 @@ public abstract class DateFormat extends Format implements Cloneable public static final DateFormat.Field TIME_ZONE = new Field("timezone", Calendar.ZONE_OFFSET); - public static final DateFormat.Field[] allFields = + static final DateFormat.Field[] allFields = { ERA, YEAR, MONTH, DAY_OF_MONTH, HOUR_OF_DAY1, HOUR_OF_DAY0, MINUTE, SECOND, MILLISECOND, diff --git a/libjava/java/text/DecimalFormat.java b/libjava/java/text/DecimalFormat.java index 94487c8..8b2c25c 100644 --- a/libjava/java/text/DecimalFormat.java +++ b/libjava/java/text/DecimalFormat.java @@ -447,8 +447,8 @@ public class DecimalFormat extends NumberFormat && useExponentialNotation == dup.useExponentialNotation); } - protected void formatInternal (double number, FormatBuffer dest, - FieldPosition fieldPos) + private void formatInternal (double number, FormatBuffer dest, + FieldPosition fieldPos) { // A very special case. if (Double.isNaN(number)) diff --git a/libjava/java/text/Format.java b/libjava/java/text/Format.java index 7310d55..2c75578 100644 --- a/libjava/java/text/Format.java +++ b/libjava/java/text/Format.java @@ -70,7 +70,7 @@ public abstract class Format implements Serializable, Cloneable { static final long serialVersionUID = 276966692217360283L; - public Field(String name) + protected Field(String name) { super(name); } diff --git a/libjava/java/util/logging/Handler.java b/libjava/java/util/logging/Handler.java index f4efebb..c781f09 100644 --- a/libjava/java/util/logging/Handler.java +++ b/libjava/java/util/logging/Handler.java @@ -85,6 +85,7 @@ h.setFormatter(h.getFormatter()); * supposed to provide a Formatter, but this is what the specification * says. */ + protected Handler() { level = Level.ALL; } diff --git a/libjava/java/util/regex/Matcher.java b/libjava/java/util/regex/Matcher.java index 8b2ac3e..994893a 100644 --- a/libjava/java/util/regex/Matcher.java +++ b/libjava/java/util/regex/Matcher.java @@ -45,7 +45,7 @@ import gnu.regexp.REMatch; * * @since 1.4 */ -public class Matcher +public final class Matcher { private Pattern pattern; private CharSequence input; diff --git a/libjava/java/util/regex/Pattern.java b/libjava/java/util/regex/Pattern.java index 174bdae..fa722cf 100644 --- a/libjava/java/util/regex/Pattern.java +++ b/libjava/java/util/regex/Pattern.java @@ -50,7 +50,7 @@ import java.util.ArrayList; * * @since 1.4 */ -public class Pattern implements Serializable +public final class Pattern implements Serializable { private static final long serialVersionUID = 5073258162644648461L; -- cgit v1.1