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/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index 8f57a62..6b21f9a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -257,19 +257,19 @@
       for (String key : orderedKeys)
       {
         MatchingRule matchingRule = matchingRuleNameMap.get(key);
-        if (matchingRule instanceof ApproximateMatchingRule)
+        if (Utilities.isApproximateMatchingRule(matchingRule))
         {
           approximateElements.add(matchingRule);
         }
-        else if (matchingRule instanceof MatchingRule)
+        else if (Utilities.isEqualityMatchingRule(matchingRule))
         {
           equalityElements.add(matchingRule);
         }
-        else if (matchingRule instanceof OrderingMatchingRule)
+        else if (Utilities.isOrderingMatchingRule(matchingRule))
         {
           orderingElements.add(matchingRule);
         }
-        else if (matchingRule instanceof SubstringMatchingRule)
+        else if (Utilities.isSubstringMatchingRule(matchingRule))
         {
           substringElements.add(matchingRule);
         }
@@ -777,7 +777,7 @@
     }
   }
 
-  private ApproximateMatchingRule getApproximateMatchingRule()
+  private MatchingRule getApproximateMatchingRule()
   {
     if (approximate.getSelectedIndex() == 0)
     {
@@ -785,7 +785,7 @@
     }
     else
     {
-      return (ApproximateMatchingRule)approximate.getSelectedItem();
+      return (MatchingRule)approximate.getSelectedItem();
     }
   }
 

--
Gitblit v1.10.0