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/DoubleMetaphoneApproximateMatchingRule.java |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java b/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
index 4a79b64..7f2dc7b 100644
--- a/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
@@ -28,19 +28,18 @@
 
 
 
-import java.util.Arrays;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.schema.SchemaConstants.*;
 
 import java.util.Collection;
 import java.util.Collections;
-import org.opends.server.api.ApproximateMatchingRule;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DebugLogLevel;
 
-import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.api.ApproximateMatchingRule;
 import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.schema.SchemaConstants.*;
+import org.opends.server.types.ByteSequence;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.DebugLogLevel;
+import org.opends.server.types.DirectoryException;
 
 
 
@@ -86,6 +85,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public Collection<String> getAllNames()
   {
     return Collections.singleton(getName());
@@ -99,6 +99,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 AMR_DOUBLE_METAPHONE_NAME;
@@ -111,6 +112,7 @@
    *
    * @return  The OID for this matching rule.
    */
+  @Override
   public String getOID()
   {
     return AMR_DOUBLE_METAPHONE_OID;
@@ -124,6 +126,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.
@@ -138,6 +141,7 @@
    *
    * @return  The OID of the syntax with which this matching rule is associated.
    */
+  @Override
   public String getSyntaxOID()
   {
     // Approximate matching is really only appropriate for DirectoryString
@@ -158,15 +162,16 @@
    * @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
   {
-    String valueString = value.stringValue();
+    String valueString = value.toString();
     int length = valueString.length();
     if (length == 0)
     {
       // The value is empty, so it is already normalized.
-      return new ASN1OctetString();
+      return ByteString.empty();
     }
 
     int last = length - 1;
@@ -1144,7 +1149,7 @@
     }
 
 
-    return new ASN1OctetString(metaphone.toString());
+    return ByteString.valueOf(metaphone.toString());
   }
 
 
@@ -1159,11 +1164,12 @@
    * @return  <CODE>true</CODE> if the provided values are approximately equal,
    *          or <CODE>false</CODE> if not.
    */
-  public boolean approximatelyMatch(ByteString value1, ByteString value2)
+  @Override
+  public boolean approximatelyMatch(ByteSequence value1, ByteSequence value2)
   {
     // If the values have been normalized, then we just need to compare their
     // byte arrays.
-    return Arrays.equals(value1.value(), value2.value());
+    return value1.equals(value2);
   }
 
 

--
Gitblit v1.10.0