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/server/org/opends/server/tools/LDIFDiff.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
index c10c04a..bb9c220 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
@@ -46,8 +46,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.AttributeValues;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
@@ -789,7 +788,7 @@
AttributeBuilder builder = new AttributeBuilder(attrType);
for (ObjectClass oc : sourceClasses)
{
- builder.add(AttributeValues.create(attrType, oc.getNameOrOID()));
+ builder.add(oc.getNameOrOID());
}
modifications.add(new Modification(ModificationType.DELETE, builder
@@ -803,7 +802,7 @@
AttributeBuilder builder = new AttributeBuilder(attrType);
for (ObjectClass oc : targetClasses)
{
- builder.add(AttributeValues.create(attrType, oc.getNameOrOID()));
+ builder.add(oc.getNameOrOID());
}
modifications.add(new Modification(ModificationType.ADD, builder
@@ -940,7 +939,7 @@
else
{
LinkedList<Modification> attrMods = new LinkedList<Modification>();
- for (AttributeValue v : a)
+ for (ByteString v : a)
{
AttributeBuilder builder = new AttributeBuilder(a, true);
builder.add(v);
--
Gitblit v1.10.0