Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 55043 invoked from network); 22 Apr 2007 06:42:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Apr 2007 06:42:03 -0000 Received: (qmail 58992 invoked by uid 500); 22 Apr 2007 06:42:10 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 58952 invoked by uid 500); 22 Apr 2007 06:42:09 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 58941 invoked by uid 99); 22 Apr 2007 06:42:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Apr 2007 23:42:09 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Apr 2007 23:42:02 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 204311A9838; Sat, 21 Apr 2007 23:41:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r531149 - in /directory/sandbox/adc/asn1-compiler/asn1-runtime/src: main/java/org/apache/asn1/encoding/ber/ test/java/com/acme/spnego/ Date: Sun, 22 Apr 2007 06:41:41 -0000 To: commits@directory.apache.org From: adc@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070422064142.204311A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: adc Date: Sat Apr 21 23:41:41 2007 New Revision: 531149 URL: http://svn.apache.org/viewvc?view=rev&rev=531149 Log: The compiler that will eventually generate these things will not generate imports Modified: directory/sandbox/adc/asn1-compiler/asn1-runtime/src/main/java/org/apache/asn1/encoding/ber/TypeClass.java directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/ContextFlags.java directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechType.java directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechTypeList.java directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenInit.java directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenTarg.java directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegotiationToken.java Modified: directory/sandbox/adc/asn1-compiler/asn1-runtime/src/main/java/org/apache/asn1/encoding/ber/TypeClass.java URL: http://svn.apache.org/viewvc/directory/sandbox/adc/asn1-compiler/asn1-runtime/src/main/java/org/apache/asn1/encoding/ber/TypeClass.java?view=diff&rev=531149&r1=531148&r2=531149 ============================================================================== --- directory/sandbox/adc/asn1-compiler/asn1-runtime/src/main/java/org/apache/asn1/encoding/ber/TypeClass.java (original) +++ directory/sandbox/adc/asn1-compiler/asn1-runtime/src/main/java/org/apache/asn1/encoding/ber/TypeClass.java Sat Apr 21 23:41:41 2007 @@ -135,8 +135,7 @@ return TypeClass.CONTEXT_SPECIFIC; } - throw new IllegalArgumentException( "Unknown type class name" - + className ); + throw new IllegalArgumentException( "Unknown type class name" + className ); } Modified: directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/ContextFlags.java URL: http://svn.apache.org/viewvc/directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/ContextFlags.java?view=diff&rev=531149&r1=531148&r2=531149 ============================================================================== --- directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/ContextFlags.java (original) +++ directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/ContextFlags.java Sat Apr 21 23:41:41 2007 @@ -17,13 +17,11 @@ */ package com.acme.spnego; -import org.apache.asn1.types.com.acme.spnego.ContextFlagsType; - /** * @version $Revision$ $Date: $ */ -public final class ContextFlags extends org.apache.asn1.runtime.ASN1BitString implements ContextFlagsType +public final class ContextFlags extends org.apache.asn1.runtime.ASN1BitString implements org.apache.asn1.types.com.acme.spnego.ContextFlagsType { public static final int delegFlag = 0; public static final int mutualFlag = 1; Modified: directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechType.java URL: http://svn.apache.org/viewvc/directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechType.java?view=diff&rev=531149&r1=531148&r2=531149 ============================================================================== --- directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechType.java (original) +++ directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechType.java Sat Apr 21 23:41:41 2007 @@ -17,13 +17,11 @@ */ package com.acme.spnego; -import org.apache.asn1.types.com.acme.spnego.MechTypeType; - /** * @version $Revision$ $Date: $ */ -public final class MechType extends org.apache.asn1.runtime.ASN1ObjectIdentifier implements MechTypeType +public final class MechType extends org.apache.asn1.runtime.ASN1ObjectIdentifier implements org.apache.asn1.types.com.acme.spnego.MechTypeType { public MechType( String oid ) { Modified: directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechTypeList.java URL: http://svn.apache.org/viewvc/directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechTypeList.java?view=diff&rev=531149&r1=531148&r2=531149 ============================================================================== --- directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechTypeList.java (original) +++ directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/MechTypeList.java Sat Apr 21 23:41:41 2007 @@ -17,13 +17,11 @@ */ package com.acme.spnego; -import org.apache.asn1.types.com.acme.spnego.MechTypeListType; - /** * @version $Revision$ $Date: $ */ -public final class MechTypeList extends org.apache.asn1.runtime.ASN1SequenceOf implements MechTypeListType +public final class MechTypeList extends org.apache.asn1.runtime.ASN1SequenceOf implements org.apache.asn1.types.com.acme.spnego.MechTypeListType { protected boolean instanceOf( Object o ) { Modified: directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenInit.java URL: http://svn.apache.org/viewvc/directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenInit.java?view=diff&rev=531149&r1=531148&r2=531149 ============================================================================== --- directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenInit.java (original) +++ directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenInit.java Sat Apr 21 23:41:41 2007 @@ -17,13 +17,11 @@ */ package com.acme.spnego; -import org.apache.asn1.types.com.acme.spnego.NegTokenInitType; - /** * @version $Revision$ $Date: $ */ -public final class NegTokenInit implements NegTokenInitType, org.apache.asn1.runtime.ASN1Type +public final class NegTokenInit implements org.apache.asn1.types.com.acme.spnego.NegTokenInitType, org.apache.asn1.runtime.ASN1Type { private MechTypeList mechTypes; private ContextFlags reqFlags; @@ -126,13 +124,11 @@ public int hashCode() { - int result = 0; - - if ( mechTypes != null ) result ^= mechTypes.hashCode(); - if ( reqFlags != null ) result ^= reqFlags.hashCode(); - if ( mechToken != null ) result ^= mechToken.hashCode(); - if ( mechListMIC != null ) result ^= mechListMIC.hashCode(); - + int result; + result = ( mechTypes != null ? mechTypes.hashCode() : 0 ); + result = 29 * result + ( reqFlags != null ? reqFlags.hashCode() : 0 ); + result = 29 * result + ( mechToken != null ? mechToken.hashCode() : 0 ); + result = 29 * result + ( mechListMIC != null ? mechListMIC.hashCode() : 0 ); return result; } } Modified: directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenTarg.java URL: http://svn.apache.org/viewvc/directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenTarg.java?view=diff&rev=531149&r1=531148&r2=531149 ============================================================================== --- directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenTarg.java (original) +++ directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegTokenTarg.java Sat Apr 21 23:41:41 2007 @@ -17,16 +17,12 @@ */ package com.acme.spnego; -import org.apache.asn1.types.com.acme.spnego.NegTokenTargType; -import org.apache.asn1.runtime.ValuedEnum; - /** * @version $Revision$ $Date: $ */ -public final class NegTokenTarg implements NegTokenTargType, org.apache.asn1.runtime.ASN1Type +public final class NegTokenTarg implements org.apache.asn1.types.com.acme.spnego.NegTokenTargType, org.apache.asn1.runtime.ASN1Type { - private negResultEnum negResult; private MechType supportedMech; private org.apache.asn1.runtime.ASN1OctetString responseToken; @@ -93,7 +89,7 @@ return true; } - public static class negResultEnum extends ValuedEnum implements org.apache.asn1.runtime.ASN1Type + public static class negResultEnum extends org.apache.asn1.runtime.ValuedEnum implements org.apache.asn1.runtime.ASN1Type { public static final negResultEnum ACCEPTCOMPLETED = new negResultEnum( "accept_completed", 0 ); public static final negResultEnum ACCEPTINCOMPLETE = new negResultEnum( "accept_incomplete", 1 ); Modified: directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegotiationToken.java URL: http://svn.apache.org/viewvc/directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegotiationToken.java?view=diff&rev=531149&r1=531148&r2=531149 ============================================================================== --- directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegotiationToken.java (original) +++ directory/sandbox/adc/asn1-compiler/asn1-runtime/src/test/java/com/acme/spnego/NegotiationToken.java Sat Apr 21 23:41:41 2007 @@ -17,13 +17,11 @@ */ package com.acme.spnego; -import org.apache.asn1.types.com.acme.spnego.NegotiationTokenType; - /** * @version $Revision$ $Date: $ */ -public final class NegotiationToken implements NegotiationTokenType, org.apache.asn1.runtime.ASN1Type +public final class NegotiationToken implements org.apache.asn1.types.com.acme.spnego.NegotiationTokenType, org.apache.asn1.runtime.ASN1Type { private NegTokenInit negTokenInit; private NegTokenTarg negTokenTarg; @@ -90,11 +88,9 @@ public int hashCode() { - int result = 0; - - if ( negTokenInit != null ) result ^= negTokenInit.hashCode(); - if ( negTokenTarg != null ) result ^= negTokenTarg.hashCode(); - + int result; + result = ( negTokenInit != null ? negTokenInit.hashCode() : 0 ); + result = 29 * result + ( negTokenTarg != null ? negTokenTarg.hashCode() : 0 ); return result; } }