Checkpoint commit for OPENDJ-1308 Migrate schema support

Nicolas Capponi

17.38.2014 a435d43b65859fa6384fd1edb2dd6e7f38f095fe

 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();
    }
  }