From 2dece15900c587dcc5fcfaf35c2acdbfb026de1f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 14 Mar 2014 15:06:25 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support
---
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 551c278..85e8c75 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
@@ -68,7 +68,7 @@
// The default equality matching rule for this syntax.
- private EqualityMatchingRule defaultEqualityMatchingRule;
+ private MatchingRule defaultEqualityMatchingRule;
// The default ordering matching rule for this syntax.
private OrderingMatchingRule defaultOrderingMatchingRule;
@@ -170,7 +170,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public EqualityMatchingRule getEqualityMatchingRule()
+ public MatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
}
@@ -1024,7 +1024,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public EqualityMatchingRule getEqualityMatchingRule()
+ public MatchingRule getEqualityMatchingRule()
{
return subSyntax.getEqualityMatchingRule();
}
@@ -1101,7 +1101,7 @@
private String definition;
//The equality matching rule.
- private EqualityMatchingRule equalityMatchingRule;
+ private MatchingRule equalityMatchingRule;
//The substring matching rule.
private SubstringMatchingRule substringMatchingRule;
@@ -1201,7 +1201,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public EqualityMatchingRule getEqualityMatchingRule()
+ public MatchingRule getEqualityMatchingRule()
{
if(equalityMatchingRule == null)
{
@@ -1297,7 +1297,7 @@
private String oid;
//The equality matching rule.
- private EqualityMatchingRule equalityMatchingRule;
+ private MatchingRule equalityMatchingRule;
//The substring matching rule.
private SubstringMatchingRule substringMatchingRule;
@@ -1410,7 +1410,7 @@
* matches will not be allowed for this type by default.
*/
@Override
- public EqualityMatchingRule getEqualityMatchingRule()
+ public MatchingRule getEqualityMatchingRule()
{
if(equalityMatchingRule == null)
{
--
Gitblit v1.10.0