From 0460023ee24e681de8ca5df2353065bcfc2bec84 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 22 Oct 2004 17:14:29 +0000 Subject: 2004-10-22 Michael Koch * java/lang/Math.java * java/lang/StackTraceElement.java * java/nio/Buffer.java * java/nio/ByteBuffer.java * java/nio/CharBuffer.java * java/nio/DoubleBuffer.java * java/nio/FloatBuffer.java * java/nio/IntBuffer.java * java/nio/LongBuffer.java * java/nio/ShortBuffer.java * java/nio/charset/Charset.java * java/rmi/server/RMIClassLoader.java * java/rmi/server/RMISocketFactory.java * java/security/Policy.java * java/text/ChoiceFormat.java * java/text/CollationElementIterator.java * java/text/DateFormat.java * java/text/DecimalFormat.java * java/text/DecimalFormatSymbols.java * java/text/MessageFormat.java * java/text/NumberFormat.java * java/text/RuleBasedCollator.java * java/text/SimpleDateFormat.java * java/util/BitSet.java * java/util/Calendar.java * java/util/Collections.java * java/util/IdentityHashMap.java * java/util/Locale.java * java/util/TreeMap.java * java/util/logging/LogRecord.java * java/util/logging/XMLFormatter.java * java/util/prefs/AbstractPreferences.java * java/util/prefs/Preferences.java * javax/crypto/interfaces/DHPrivateKey.java * javax/crypto/interfaces/DHPublicKey.java * javax/crypto/interfaces/PBEKey.java * javax/net/ssl/HandshakeCompletedEvent.java * javax/security/auth/Subject.java From-SVN: r89454 --- libjava/javax/crypto/interfaces/DHPrivateKey.java | 3 +-- libjava/javax/crypto/interfaces/DHPublicKey.java | 3 +-- libjava/javax/crypto/interfaces/PBEKey.java | 3 +-- libjava/javax/net/ssl/HandshakeCompletedEvent.java | 3 +-- libjava/javax/security/auth/Subject.java | 11 +++-------- 5 files changed, 7 insertions(+), 16 deletions(-) (limited to 'libjava/javax') diff --git a/libjava/javax/crypto/interfaces/DHPrivateKey.java b/libjava/javax/crypto/interfaces/DHPrivateKey.java index 63b9c15..7f9ea39 100644 --- a/libjava/javax/crypto/interfaces/DHPrivateKey.java +++ b/libjava/javax/crypto/interfaces/DHPrivateKey.java @@ -57,9 +57,8 @@ import java.security.PrivateKey; */ public interface DHPrivateKey extends DHKey, PrivateKey { - /** Compatible with JDK1.4. */ - static final long serialVersionUID = 2211791113380396553L; + long serialVersionUID = 2211791113380396553L; /** * Returns the private value x. diff --git a/libjava/javax/crypto/interfaces/DHPublicKey.java b/libjava/javax/crypto/interfaces/DHPublicKey.java index 5e0b35b..1fcb814 100644 --- a/libjava/javax/crypto/interfaces/DHPublicKey.java +++ b/libjava/javax/crypto/interfaces/DHPublicKey.java @@ -56,9 +56,8 @@ import java.security.PublicKey; */ public interface DHPublicKey extends DHKey, PublicKey { - /** Compatible with JDK1.4. */ - static final long serialVersionUID = -6628103563352519193L; + long serialVersionUID = -6628103563352519193L; /** * Get the public value y. diff --git a/libjava/javax/crypto/interfaces/PBEKey.java b/libjava/javax/crypto/interfaces/PBEKey.java index 5334918..30d2532 100644 --- a/libjava/javax/crypto/interfaces/PBEKey.java +++ b/libjava/javax/crypto/interfaces/PBEKey.java @@ -51,9 +51,8 @@ import javax.crypto.SecretKey; */ public interface PBEKey extends SecretKey { - /** Compatible with JDK1.4. */ - static final long serialVersionUID = -1430015993304333921L; + long serialVersionUID = -1430015993304333921L; /** * Retruns the iteration count, or 0 if not specified. diff --git a/libjava/javax/net/ssl/HandshakeCompletedEvent.java b/libjava/javax/net/ssl/HandshakeCompletedEvent.java index f19dd6a..ecb0ac9 100644 --- a/libjava/javax/net/ssl/HandshakeCompletedEvent.java +++ b/libjava/javax/net/ssl/HandshakeCompletedEvent.java @@ -52,7 +52,6 @@ import javax.security.cert.X509Certificate; */ public class HandshakeCompletedEvent extends java.util.EventObject { - // Fields. // ------------------------------------------------------------------- @@ -60,7 +59,7 @@ public class HandshakeCompletedEvent extends java.util.EventObject private static final long serialVersionUID = 7914963744257769778L; /** The session. */ - private transient final SSLSession session; + private final transient SSLSession session; // Constructor. // ------------------------------------------------------------------- diff --git a/libjava/javax/security/auth/Subject.java b/libjava/javax/security/auth/Subject.java index 264a41c..5391ace 100644 --- a/libjava/javax/security/auth/Subject.java +++ b/libjava/javax/security/auth/Subject.java @@ -59,12 +59,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Set; -/** - * - */ public final class Subject implements Serializable { - // Fields. // ------------------------------------------------------------------------- @@ -81,8 +77,8 @@ public final class Subject implements Serializable */ private boolean readOnly; - private transient final SecureSet pubCred; - private transient final SecureSet privCred; + private final transient SecureSet pubCred; + private final transient SecureSet privCred; // Constructors. // ------------------------------------------------------------------------- @@ -371,7 +367,6 @@ public final class Subject implements Serializable */ private static class SecureSet extends AbstractSet implements Serializable { - // Fields. // ----------------------------------------------------------------------- @@ -383,7 +378,7 @@ public final class Subject implements Serializable private final Subject subject; private final LinkedList elements; - private transient final int type; + private final transient int type; // Constructors. // ----------------------------------------------------------------------- -- cgit v1.1