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/ViewEntryPanel.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 0d9e369..4970c1d 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -56,7 +56,7 @@
 import org.opends.server.replication.plugin.EntryHistorical;
 import org.opends.server.schema.SchemaConstants;
 import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.forgerock.opendj.ldap.ByteString;
 import org.opends.server.types.Attributes;
 import org.opends.server.types.Entry;
 import org.opends.server.types.ObjectClass;
@@ -346,7 +346,7 @@
     for (int i=0; i<rdn.getNumValues(); i++)
     {
       String attrName = rdn.getAttributeName(i);
-      AttributeValue value = rdn.getAttributeValue(i);
+      ByteString value = rdn.getAttributeValue(i);
       List<org.opends.server.types.Attribute> attrs =
         entry.getAttribute(attrName.toLowerCase());
       boolean done = false;
@@ -356,9 +356,8 @@
         {
           if (attr.getNameWithOptions().equals(attrName))
           {
-            ArrayList<AttributeValue> newValues =
-              new ArrayList<AttributeValue>();
-            Iterator<AttributeValue> it = attr.iterator();
+            ArrayList<ByteString> newValues = new ArrayList<ByteString>();
+            Iterator<ByteString> it = attr.iterator();
             while (it.hasNext())
             {
               newValues.add(it.next());
@@ -374,8 +373,7 @@
       {
         org.opends.server.types.Attribute attr =
           Attributes.create(rdn.getAttributeType(i), value);
-        ArrayList<AttributeValue> newValues =
-          new ArrayList<AttributeValue>();
+        ArrayList<ByteString> newValues = new ArrayList<ByteString>();
         newValues.add(value);
         entry.addAttribute(attr, newValues);
       }

--
Gitblit v1.10.0