directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r263887 - in /directory/shared/ldap/branches/new-codec-integration/apache2-provider/src: java/main/org/apache/asn1new/ldap/pojo/AbandonRequest.java test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java
Date Sun, 28 Aug 2005 16:47:27 GMT
Author: elecharny
Date: Sun Aug 28 09:46:52 2005
New Revision: 263887

URL: http://svn.apache.org/viewcvs?rev=263887&view=rev
Log:
Changed the MessageId to AbandonedMessageId, to avoid confusion with the LdapMessage MessageId

Modified:
    directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/AbandonRequest.java
    directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java

Modified: directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/AbandonRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/AbandonRequest.java?rev=263887&r1=263886&r2=263887&view=diff
==============================================================================
--- directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/AbandonRequest.java
(original)
+++ directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/AbandonRequest.java
Sun Aug 28 09:46:52 2005
@@ -35,8 +35,8 @@
 {
     //~ Instance fields ----------------------------------------------------------------------------
 
-    /** The abandonned message ID  */
-    private int messageId;
+    /** The abandoned message ID  */
+    private int abandonedMessageId;
 
     //~ Constructors -------------------------------------------------------------------------------
 
@@ -51,13 +51,13 @@
     //~ Methods ------------------------------------------------------------------------------------
 
     /**
-     * Get the abandonned message ID
+     * Get the abandoned message ID
      *
-     * @return Returns the MessageId.
+     * @return Returns the abandoned MessageId.
      */
-    public int getMessageId()
+    public int getAbandonedMessageId()
     {
-        return messageId;
+        return abandonedMessageId;
     }
 
     /**
@@ -71,13 +71,13 @@
     }
 
     /**
-     * Set the abandonned message ID
+     * Set the abandoned message ID
      *
-     * @param messageId The messageID to set.
+     * @param abandonedMessageId The abandoned messageID to set.
      */
-    public void setMessageId( int messageId )
+    public void setAbandonedMessageId( int abandonedMessageId )
     {
-        this.messageId = messageId;
+        this.abandonedMessageId = abandonedMessageId;
     }
 
     /**
@@ -85,13 +85,13 @@
      * 
      * AbandonRequest :
      * 
-     * 0x50 0x0(1..4) MessageId
+     * 0x50 0x0(1..4) abandoned MessageId
      * 
-     * Length(AbandonRequest) = Length(0x50) + 1 + Length(MessageId)
+     * Length(AbandonRequest) = Length(0x50) + 1 + Length(abandoned MessageId)
      */
     public int computeLength()
     {
-        return 1 + 1 + Value.getNbBytes( messageId );
+        return 1 + 1 + Value.getNbBytes( abandonedMessageId );
     }
     
     /**
@@ -113,11 +113,11 @@
             buffer.put(LdapConstants.ABANDON_REQUEST_TAG);
             
             // The length. It has to be evaluated depending on 
-            // the messageId value.
-            buffer.put( (byte)Value.getNbBytes( messageId ) );
+            // the abandoned messageId value.
+            buffer.put( (byte)Value.getNbBytes( abandonedMessageId ) );
             
-            // The messageId
-            buffer.put( Value.getBytes( messageId ) );
+            // The abandoned messageId
+            buffer.put( Value.getBytes( abandonedMessageId ) );
         }
         catch ( BufferOverflowException boe )
         {
@@ -138,7 +138,7 @@
         StringBuffer sb = new StringBuffer();
 
         sb.append( "    Abandon Request :\n" );
-        sb.append( "        Message Id : " ).append( messageId ).append( '\n' );
+        sb.append( "        Message Id : " ).append( abandonedMessageId ).append( '\n' );
 
         return sb.toString();
     }

Modified: directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java?rev=263887&r1=263886&r2=263887&view=diff
==============================================================================
--- directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java
(original)
+++ directory/shared/ldap/branches/new-codec-integration/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java
Sun Aug 28 09:46:52 2005
@@ -85,7 +85,7 @@
         AbandonRequest abandonRequest = message.getAbandonRequest();
 
         Assert.assertEquals( 3, message.getMessageId() );
-        Assert.assertEquals( 2, abandonRequest.getMessageId() );
+        Assert.assertEquals( 2, abandonRequest.getAbandonedMessageId() );
         
         // Check the length
         Assert.assertEquals(8, message.computeLength());



Mime
View raw message