From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk

---
 opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java |   50 +++++++++++++++++++++++++++++---------------------
 1 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java b/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
index 9f9f80e..595ae30 100644
--- a/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
@@ -28,17 +28,18 @@
 
 
 
-import java.util.Collection;
-import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.DirectoryException;
-
 import static org.opends.server.schema.SchemaConstants.*;
 import static org.opends.server.util.StaticUtils.*;
 
+import java.util.Collection;
+import java.util.Collections;
+
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.types.ByteSequence;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.util.ServerConstants;
+
 
 
 /**
@@ -66,6 +67,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public Collection<String> getAllNames()
   {
     return Collections.singleton(getName());
@@ -79,6 +81,7 @@
    * @return  The common name for this matching rule, or <CODE>null</CODE> if
    * it does not have a name.
    */
+  @Override
   public String getName()
   {
     return EMR_DIRECTORY_STRING_FIRST_COMPONENT_NAME;
@@ -91,6 +94,7 @@
    *
    * @return  The OID for this matching rule.
    */
+  @Override
   public String getOID()
   {
     return EMR_DIRECTORY_STRING_FIRST_COMPONENT_OID;
@@ -104,6 +108,7 @@
    * @return  The description for this matching rule, or <CODE>null</CODE> if
    *          there is none.
    */
+  @Override
   public String getDescription()
   {
     // There is no standard description for this matching rule.
@@ -118,6 +123,7 @@
    *
    * @return  The OID of the syntax with which this matching rule is associated.
    */
+  @Override
   public String getSyntaxOID()
   {
     return SYNTAX_DIRECTORY_STRING_OID;
@@ -136,25 +142,26 @@
    * @throws  DirectoryException  If the provided value is invalid according to
    *                              the associated attribute syntax.
    */
-  public ByteString normalizeValue(ByteString value)
+  @Override
+  public ByteString normalizeValue(ByteSequence value)
          throws DirectoryException
   {
     StringBuilder buffer = new StringBuilder();
-    toLowerCase(value.value(), buffer, true);
+    toLowerCase(value, buffer, true);
 
     int bufferLength = buffer.length();
     if (bufferLength == 0)
     {
-      if (value.value().length > 0)
+      if (value.length() > 0)
       {
         // This should only happen if the value is composed entirely of spaces.
         // In that case, the normalized value is a single space.
-        return new ASN1OctetString(" ");
+        return ServerConstants.SINGLE_SPACE_VALUE;
       }
       else
       {
         // The value is empty, so it is already normalized.
-        return new ASN1OctetString();
+        return ByteString.empty();
       }
     }
 
@@ -171,7 +178,7 @@
       }
     }
 
-    return new ASN1OctetString(buffer.toString());
+    return ByteString.valueOf(buffer.toString());
   }
 
 
@@ -186,12 +193,13 @@
    * @return  <CODE>true</CODE> if the provided values are equal, or
    *          <CODE>false</CODE> if not.
    */
-  public boolean areEqual(ByteString value1, ByteString value2)
+  @Override
+  public boolean areEqual(ByteSequence value1, ByteSequence value2)
   {
     // For this purpose, the first value will be considered the attribute value,
     // and the second the assertion value.  The attribute value must start with
     // an open parenthesis, followed by one or more spaces.
-    String value1String = value1.stringValue();
+    String value1String = value1.toString();
     int    value1Length = value1String.length();
 
     if ((value1Length == 0) || (value1String.charAt(0) != '('))
@@ -201,9 +209,8 @@
       return false;
     }
 
-    char c;
     int  pos = 1;
-    while ((pos < value1Length) && ((c = value1String.charAt(pos)) == ' '))
+    while ((pos < value1Length) && ((value1String.charAt(pos)) == ' '))
     {
       pos++;
     }
@@ -218,7 +225,7 @@
     // The current position must be the start position for the value.  Keep
     // reading until we find the next space.
     int startPos = pos++;
-    while ((pos < value1Length) && ((c = value1String.charAt(pos)) != ' '))
+    while ((pos < value1Length) && ((value1String.charAt(pos)) != ' '))
     {
       pos++;
     }
@@ -233,7 +240,7 @@
     // Grab the substring between the start pos and the current pos and compare
     // it with the assertion value.
     String compareStr   = value1String.substring(startPos, pos);
-    String value2String = value2.stringValue();
+    String value2String = value2.toString();
     return value2String.equals(compareStr);
   }
 
@@ -252,7 +259,8 @@
    *                         code.
    *
    * @return  The hash code generated for the provided attribute value.*/
-  public int generateHashCode(AttributeValue attributeValue)
+  @Override
+  public int generateHashCode(ByteSequence attributeValue)
   {
     // In this case, we'll always return the same value because the matching
     // isn't based on the entire value.

--
Gitblit v1.10.0