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/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
index eeed142..3cf0393 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
@@ -30,14 +30,14 @@
 
 import java.util.Collection;
 import java.util.Collections;
+
 import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.api.MatchingRule;
 import org.opends.server.schema.CaseIgnoreEqualityMatchingRuleFactory;
+import org.opends.server.types.ByteSequence;
 import org.opends.server.types.ByteString;
 import org.opends.server.types.DirectoryException;
 
 
-
 /**
  * This class implements an equality matching rule that is intended for testing
  * purposes within the server (e.g., in conjunction with matching rule uses).
@@ -48,16 +48,16 @@
        extends EqualityMatchingRule
 {
   // Indicates whether this matching rule should be considered OBSOLETE.
-  private boolean isObsolete;
+  private final boolean isObsolete;
 
   // The matching rule that will do all the real work behind the scenes.
-  private EqualityMatchingRule caseIgnoreMatchingRule;
+  private final EqualityMatchingRule caseIgnoreMatchingRule;
 
   // The name for this matching rule.
-  private String name;
+  private final String name;
 
   // The OID for this matching rule.
-  private String oid;
+  private final String oid;
 
 
 
@@ -118,6 +118,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public Collection<String> getAllNames()
   {
     return Collections.singleton(getName());
@@ -131,6 +132,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 name;
@@ -143,6 +145,7 @@
    *
    * @return  The OID for this matching rule.
    */
+  @Override
   public String getOID()
   {
     return oid;
@@ -156,6 +159,7 @@
    * @return  The description for this matching rule, or <CODE>null</CODE> if
    *          there is none.
    */
+  @Override
   public String getDescription()
   {
     return null;
@@ -169,6 +173,7 @@
    *
    * @return  The OID of the syntax with which this matching rule is associated.
    */
+  @Override
   public String getSyntaxOID()
   {
     return caseIgnoreMatchingRule.getSyntaxOID();
@@ -179,6 +184,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isObsolete()
   {
     return isObsolete;
@@ -197,7 +203,8 @@
    * @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
   {
     return caseIgnoreMatchingRule.normalizeValue(value);
@@ -215,7 +222,8 @@
    * @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)
   {
     return caseIgnoreMatchingRule.areEqual(value1, value2);
   }

--
Gitblit v1.10.0