You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2007/07/18 02:28:34 UTC
svn commit: r557095 - in
/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared:
crypto/checksum/ crypto/encryption/ exceptions/ messages/
messages/components/ messages/value/
Author: erodriguez
Date: Tue Jul 17 17:28:32 2007
New Revision: 557095
URL: http://svn.apache.org/viewvc?view=rev&rev=557095
Log:
Warnings clean-up: Generics for Comparable classes in kerberos-shared.
Modified:
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/EncryptionType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/MessageType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/MessageComponentType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddressType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/LastRequestType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PreAuthenticationDataType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/SamType.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncodingType.java
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java Tue Jul 17 17:28:32 2007
@@ -31,7 +31,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class ChecksumType implements Comparable
+public final class ChecksumType implements Comparable<ChecksumType>
{
/**
* The "unknown" checksum type.
@@ -134,7 +134,7 @@
/**
* A List of all the checksum type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<ChecksumType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the checksum type.
@@ -188,9 +188,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( ChecksumType that )
{
- return ordinal - ( ( ChecksumType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/EncryptionType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/EncryptionType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/EncryptionType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/EncryptionType.java Tue Jul 17 17:28:32 2007
@@ -31,7 +31,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class EncryptionType implements Comparable
+public final class EncryptionType implements Comparable<EncryptionType>
{
/**
* The "unknown" encryption type.
@@ -238,9 +238,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( EncryptionType that )
{
- return ordinal - ( ( EncryptionType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java Tue Jul 17 17:28:32 2007
@@ -39,7 +39,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class KeyUsage implements Comparable
+public final class KeyUsage implements Comparable<KeyUsage>
{
/**
* AS-REQ PA-ENC-TIMESTAMP padata timestamp, encrypted with the client key (Section 5.2.7.2)
@@ -131,7 +131,7 @@
/**
* VALUES needs to be located here, otherwise illegal forward reference.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<KeyUsage> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
private final int ordinal;
private final String name;
@@ -178,9 +178,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( KeyUsage that )
{
- return ordinal - ( ( KeyUsage ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java Tue Jul 17 17:28:32 2007
@@ -31,7 +31,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class ErrorType implements Comparable
+public final class ErrorType implements Comparable<ErrorType>
{
/**
* No error.
@@ -406,7 +406,7 @@
/**
* A List of all the error type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<ErrorType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the error type.
@@ -458,9 +458,9 @@
* @param that the object to compare this KerberosError to
* @return ordinal - ( ( KerberosError ) that ).ordinal;
*/
- public int compareTo( Object that )
+ public int compareTo( ErrorType that )
{
- return ordinal - ( ( ErrorType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/MessageType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/MessageType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/MessageType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/MessageType.java Tue Jul 17 17:28:32 2007
@@ -29,7 +29,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class MessageType implements Comparable
+public final class MessageType implements Comparable<MessageType>
{
/**
* Constant for the "null" message type.
@@ -107,7 +107,7 @@
/**
* A list of all the message type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<MessageType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the message type.
@@ -161,9 +161,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( MessageType that )
{
- return ordinal - ( ( MessageType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/MessageComponentType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/MessageComponentType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/MessageComponentType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/MessageComponentType.java Tue Jul 17 17:28:32 2007
@@ -31,7 +31,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class MessageComponentType implements Comparable
+public class MessageComponentType implements Comparable<MessageComponentType>
{
/**
* Constant for the "null" message component type.
@@ -93,7 +93,7 @@
/**
* A List of all the message component type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<MessageComponentType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the message component type.
@@ -147,9 +147,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( MessageComponentType that )
{
- return ordinal - ( ( MessageComponentType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationType.java Tue Jul 17 17:28:32 2007
@@ -29,7 +29,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class AuthorizationType implements Comparable
+public final class AuthorizationType implements Comparable<AuthorizationType>
{
/**
* Constant for the "null" authorization type.
@@ -93,7 +93,7 @@
/**
* A List of all the authorization type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<AuthorizationType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the authorization type.
@@ -145,9 +145,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( AuthorizationType that )
{
- return ordinal - ( ( AuthorizationType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddressType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddressType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddressType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddressType.java Tue Jul 17 17:28:32 2007
@@ -31,7 +31,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class HostAddressType implements Comparable
+public final class HostAddressType implements Comparable<HostAddressType>
{
/**
* Constant for the "IPv4" host address type.
@@ -142,9 +142,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( HostAddressType that )
{
- return ordinal - ( ( HostAddressType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/LastRequestType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/LastRequestType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/LastRequestType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/LastRequestType.java Tue Jul 17 17:28:32 2007
@@ -29,7 +29,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class LastRequestType implements Comparable
+public final class LastRequestType implements Comparable<LastRequestType>
{
/**
* Constant for the "none" last request type.
@@ -76,7 +76,7 @@
/**
* A List of all the last request type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<LastRequestType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the checksum type.
@@ -130,9 +130,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( LastRequestType that )
{
- return ordinal - ( ( LastRequestType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PreAuthenticationDataType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PreAuthenticationDataType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PreAuthenticationDataType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PreAuthenticationDataType.java Tue Jul 17 17:28:32 2007
@@ -29,7 +29,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class PreAuthenticationDataType implements Comparable
+public class PreAuthenticationDataType implements Comparable<PreAuthenticationDataType>
{
/**
* Constant for the "null" pre-authentication data type.
@@ -138,7 +138,7 @@
/**
* A list of all the pre-authentication type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<PreAuthenticationDataType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the pre-authentication type.
@@ -192,9 +192,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( PreAuthenticationDataType that )
{
- return ordinal - ( ( PreAuthenticationDataType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameType.java Tue Jul 17 17:28:32 2007
@@ -29,7 +29,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class PrincipalNameType implements Comparable
+public final class PrincipalNameType implements Comparable<PrincipalNameType>
{
/**
* Constant for the "unknown name type" principal name type.
@@ -80,7 +80,7 @@
/**
* A List of all the principal name type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<PrincipalNameType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the principal name type.
@@ -134,9 +134,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( PrincipalNameType that )
{
- return ordinal - ( ( PrincipalNameType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/SamType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/SamType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/SamType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/SamType.java Tue Jul 17 17:28:32 2007
@@ -31,7 +31,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public final class SamType implements Comparable
+public final class SamType implements Comparable<SamType>
{
/*
* Enumeration elements are constructed once upon class loading.
@@ -65,7 +65,7 @@
PA_SAM_TYPE_CRYPTOCARD, PA_SAM_TYPE_APACHE };
/** a list of all the sam type constants */
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<SamType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/** the name of the sam type */
private final String name;
@@ -77,7 +77,7 @@
/**
* Private constructor prevents construction outside of this class.
*/
- private SamType(int ordinal, String name)
+ private SamType( int ordinal, String name )
{
this.ordinal = ordinal;
this.name = name;
@@ -102,9 +102,9 @@
* @param that the object to compare this SamType to
* @return ordinal - ( ( SamType ) that ).ordinal;
*/
- public int compareTo( Object that )
+ public int compareTo( SamType that )
{
- return ordinal - ( ( SamType ) that ).ordinal;
+ return ordinal - that.ordinal;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncodingType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncodingType.java?view=diff&rev=557095&r1=557094&r2=557095
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncodingType.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncodingType.java Tue Jul 17 17:28:32 2007
@@ -29,7 +29,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class TransitedEncodingType implements Comparable
+public final class TransitedEncodingType implements Comparable<TransitedEncodingType>
{
/**
* Constant for the "null" transited encoding type.
@@ -51,7 +51,7 @@
/**
* A List of all the transited encoding type constants.
*/
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ public static final List<TransitedEncodingType> VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
/**
* The name of the transited encoding type.
@@ -105,9 +105,9 @@
}
- public int compareTo( Object that )
+ public int compareTo( TransitedEncodingType that )
{
- return ordinal - ( ( TransitedEncodingType ) that ).ordinal;
+ return ordinal - that.ordinal;
}