From a435d43b65859fa6384fd1edb2dd6e7f38f095fe Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 17 Mar 2014 14:38:12 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support

---
 opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 85e8c75..f7021c4 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
@@ -218,7 +218,7 @@
    *          matches will not be allowed for this type by default.
    */
   @Override
-  public ApproximateMatchingRule getApproximateMatchingRule()
+  public MatchingRule getApproximateMatchingRule()
   {
     // There is no approximate matching rule by default.
     return null;
@@ -1072,7 +1072,7 @@
      *          matches will not be allowed for this type by default.
      */
     @Override
-    public ApproximateMatchingRule getApproximateMatchingRule()
+    public MatchingRule getApproximateMatchingRule()
     {
       return subSyntax.getApproximateMatchingRule();
     }
@@ -1110,7 +1110,7 @@
     private OrderingMatchingRule orderingMatchingRule;
 
     //The approximate matching rule.
-    private ApproximateMatchingRule approximateMatchingRule;
+    private MatchingRule approximateMatchingRule;
 
 
     //Creates a new instance of this syntax.
@@ -1265,7 +1265,7 @@
      *          matches will not be allowed for this type by default.
      */
     @Override
-    public ApproximateMatchingRule getApproximateMatchingRule()
+    public MatchingRule getApproximateMatchingRule()
     {
       if(approximateMatchingRule == null)
       {
@@ -1306,7 +1306,7 @@
     private OrderingMatchingRule orderingMatchingRule;
 
     //The approximate matching rule.
-    private ApproximateMatchingRule approximateMatchingRule;
+    private MatchingRule approximateMatchingRule;
 
     //The definition of this syntax.
     private String definition;
@@ -1481,7 +1481,7 @@
      *          matches will not be allowed for this type by default.
      */
     @Override
-    public ApproximateMatchingRule getApproximateMatchingRule()
+    public MatchingRule getApproximateMatchingRule()
     {
       if(approximateMatchingRule == null)
       {

--
Gitblit v1.10.0