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/CustomAttributePanel.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 4eb3f82..1555a50 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -85,9 +85,8 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.opends.server.api.ApproximateMatchingRule;
-import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.MatchingRule;
+import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.types.AttributeType;
@@ -765,19 +764,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);
}
@@ -1180,7 +1179,7 @@
}
}
- private ApproximateMatchingRule getApproximateMatchingRule()
+ private MatchingRule getApproximateMatchingRule()
{
if (approximate.getSelectedIndex() == 0)
{
@@ -1188,7 +1187,7 @@
}
else
{
- return (ApproximateMatchingRule)approximate.getSelectedItem();
+ return (MatchingRule)approximate.getSelectedItem();
}
}
--
Gitblit v1.10.0