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/schema/OctetStringOrderingMatchingRule.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
index 6bcad3d..113417c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.AbstractMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.AbstractMatchingRule;
+import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.StaticUtils;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -77,25 +77,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(OMR_OCTET_STRING_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return OMR_OCTET_STRING_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
@@ -171,6 +156,7 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
return value1.compareTo(value2);
@@ -191,6 +177,7 @@
* order, or zero if there is no difference between the values with
* regard to ordering.
*/
+ @Override
public int compare(byte[] b1, byte[] b2)
{
return StaticUtils.compare(b1, b2);
--
Gitblit v1.10.0