From 3c47c41e9ebd977095879ade126e348ee0b2d5d9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 09:05:10 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support

---
 opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
index 2560e56..ac542d2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
@@ -49,16 +49,11 @@
     mayInvoke = false)
 public abstract class AbstractMatchingRule implements MatchingRule
 {
-  /**
-   * {@inheritDoc}
-   */
-  public abstract String getName();
-
-
 
   /**
    * {@inheritDoc}
    */
+  @Override
   public abstract Collection<String> getNames();
 
 
@@ -66,6 +61,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public abstract String getOID();
 
 
@@ -73,6 +69,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public ByteString normalizeAssertionValue(ByteSequence value)
       throws DirectoryException
   {
@@ -85,17 +82,15 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public final String getNameOrOID()
   {
-    String name = getName();
-    if ((name == null) || (name.length() == 0))
+    Collection<String> names = getNames();
+    if (names != null && !names.isEmpty())
     {
-      return getOID();
+      return names.iterator().next();
     }
-    else
-    {
-      return name;
-    }
+    return getOID();
   }
 
 
@@ -103,6 +98,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public abstract String getDescription();
 
 
@@ -110,6 +106,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public abstract String getSyntaxOID();
 
 
@@ -117,6 +114,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isObsolete()
   {
     return false;
@@ -127,6 +125,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public abstract ByteString normalizeValue(ByteSequence value)
       throws DirectoryException;
 
@@ -135,6 +134,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public ConditionResult valuesMatch(
       ByteSequence attributeValue, ByteSequence assertionValue)
   {
@@ -220,6 +220,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public final void toString(StringBuilder buffer)
   {
     buffer.append("( ");
@@ -237,10 +238,10 @@
       }
      buffer.append(" )");
     }
-    else
+    else if (names.size() == 1)
     {
       buffer.append('\'');
-      buffer.append(getName());
+      buffer.append(names.iterator().next());
       buffer.append('\'');
     }
 

--
Gitblit v1.10.0