From 5203374a1e5dc294088749071cf5350d2f82787d Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 20 Mar 2014 10:06:11 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support Code Review : CR-3230
---
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index f7021c4..7f3832c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -71,7 +71,7 @@
private MatchingRule defaultEqualityMatchingRule;
// The default ordering matching rule for this syntax.
- private OrderingMatchingRule defaultOrderingMatchingRule;
+ private MatchingRule defaultOrderingMatchingRule;
// The default substring matching rule for this syntax.
private SubstringMatchingRule defaultSubstringMatchingRule;
@@ -186,7 +186,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public OrderingMatchingRule getOrderingMatchingRule()
+ public MatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
}
@@ -1040,7 +1040,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public OrderingMatchingRule getOrderingMatchingRule()
+ public MatchingRule getOrderingMatchingRule()
{
return subSyntax.getOrderingMatchingRule();
}
@@ -1107,7 +1107,7 @@
private SubstringMatchingRule substringMatchingRule;
//The ordering matching rule.
- private OrderingMatchingRule orderingMatchingRule;
+ private MatchingRule orderingMatchingRule;
//The approximate matching rule.
private MatchingRule approximateMatchingRule;
@@ -1223,7 +1223,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public OrderingMatchingRule getOrderingMatchingRule()
+ public MatchingRule getOrderingMatchingRule()
{
if(orderingMatchingRule == null)
{
@@ -1303,7 +1303,7 @@
private SubstringMatchingRule substringMatchingRule;
//The ordering matching rule.
- private OrderingMatchingRule orderingMatchingRule;
+ private MatchingRule orderingMatchingRule;
//The approximate matching rule.
private MatchingRule approximateMatchingRule;
@@ -1432,7 +1432,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public OrderingMatchingRule getOrderingMatchingRule()
+ public MatchingRule getOrderingMatchingRule()
{
if(orderingMatchingRule == null)
{
--
Gitblit v1.10.0