From 377b2709c64b32fe93905b466482216c2cc0581c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Mar 2014 16:30:32 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index eb39153..d99722b 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -102,7 +102,7 @@
import org.opends.server.tools.ImportLDIF;
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.makeldif.MakeLDIF;
-import org.opends.server.types.AttributeValue;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
@@ -1381,12 +1381,10 @@
Attributes attrs = new BasicAttributes();
BasicAttribute oc = new BasicAttribute("objectClass");
- Iterator<AttributeValue> it =
- indexEntry.getObjectClassAttribute().iterator();
-
+ Iterator<ByteString> it = indexEntry.getObjectClassAttribute().iterator();
while (it.hasNext())
{
- oc.add(it.next().getValue().toString());
+ oc.add(it.next().toString());
}
attrs.put(oc);
@@ -1399,16 +1397,14 @@
it = odsAttr.iterator();
while (it.hasNext())
{
- attr.add(it.next().getValue().toString());
+ attr.add(it.next().toString());
}
attrs.put(attr);
if (attrName.equalsIgnoreCase("ds-cfg-attribute"))
{
args.add("--index-name");
- AttributeValue value =
- odsAttr.iterator().next();
- args.add(value.getValue().toString());
+ args.add(odsAttr.iterator().next().toString());
}
else if (attrName.equalsIgnoreCase("ds-cfg-index-type"))
{
@@ -1416,7 +1412,7 @@
while (it.hasNext())
{
args.add("--set");
- args.add("index-type:"+it.next().getValue().toString());
+ args.add("index-type:" + it.next().toString());
}
}
}
--
Gitblit v1.10.0