mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
18.26.2015 ca669ae54f86dbeea277280690584d9f591c7571
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -666,13 +666,10 @@
          if (index != null)
          {
            IndexType type = indexTypes[i];
            if (type != null)
            if (type != null && !index.getTypes().contains(type))
            {
              if (!index.getTypes().contains(type))
              {
                msgs.add(INFO_CTRL_PANEL_MUST_UPDATE_INDEX_DEFINITION_TYPE.get(
                    filter.getAttributeType(), indexTypeNames[i]));
              }
              msgs.add(INFO_CTRL_PANEL_MUST_UPDATE_INDEX_DEFINITION_TYPE.get(
                  filter.getAttributeType(), indexTypeNames[i]));
            }
          }
          else
@@ -1214,15 +1211,13 @@
              model.getElementAt(j);
              if (o.getType() == CategorizedComboBoxElement.Type.REGULAR)
              {
                if (dealingWithCustom == isCustom)
                if (dealingWithCustom == isCustom
                    && attrName.compareTo(o.getValue().toString()) < 0)
                {
                  if (attrName.compareTo(o.getValue().toString()) < 0)
                  {
                    model.insertElementAt(new CategorizedComboBoxElement(
                        attrName,
                        CategorizedComboBoxElement.Type.REGULAR), j);
                    break;
                  }
                  model.insertElementAt(new CategorizedComboBoxElement(
                      attrName,
                      CategorizedComboBoxElement.Type.REGULAR), j);
                  break;
                }
              }
              else if (!o.getValue().equals(CUSTOM_ATTRIBUTES))