Merge ASN1 branch to trunk

matthew_swift

05.42.2009 35c5f651a0c5c658a4bc67614e815405fcc6a830

 opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java

@@ -1293,7 +1293,7 @@

          while (it.hasNext())
          {
            oc.add(it.next().getStringValue());
            oc.add(it.next().getValue().toString());
          }
          attrs.put(oc);

@@ -1306,7 +1306,7 @@
            it = odsAttr.iterator();
            while (it.hasNext())
            {
              attr.add(it.next().getStringValue());
              attr.add(it.next().getValue().toString());
            }
            attrs.put(attr);

@@ -1315,7 +1315,7 @@
              args.add("--index-name");
              AttributeValue value =
                odsAttr.iterator().next();
              args.add(value.getStringValue());
              args.add(value.getValue().toString());
            }
            else if (attrName.equalsIgnoreCase("ds-cfg-index-type"))
            {
@@ -1323,7 +1323,7 @@
              while (it.hasNext())
              {
                args.add("--set");
                args.add("index-type:"+it.next().getStringValue());
                args.add("index-type:"+it.next().getValue().toString());
              }
            }
          }