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/makeldif/Branch.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/Branch.java b/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/Branch.java
index 797424c..e8a7717 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/Branch.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/Branch.java
@@ -37,7 +37,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -146,15 +146,13 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a)
+ for (ByteString v : a)
{
try
{
- String[] valueStrings = new String[] { v.getValue().toString()};
- Tag[] tags = new Tag[1];
- tags[0] = new StaticTextTag();
- tags[0].initializeForBranch(templateFile, this, valueStrings, 0,
- warnings);
+ String[] valueStrings = new String[] { v.toString() };
+ Tag[] tags = new Tag[] { new StaticTextTag() };
+ tags[0].initializeForBranch(templateFile, this, valueStrings, 0, warnings);
lineList.add(new TemplateLine(a.getAttributeType(), 0, tags));
}
catch (Exception e)
@@ -170,15 +168,13 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a)
+ for (ByteString v : a)
{
try
{
- String[] valueStrings = new String[] { v.getValue().toString()};
- Tag[] tags = new Tag[1];
- tags[0] = new StaticTextTag();
- tags[0].initializeForBranch(templateFile, this, valueStrings, 0,
- warnings);
+ String[] valueStrings = new String[] { v.toString() };
+ Tag[] tags = new Tag[] { new StaticTextTag() };
+ tags[0].initializeForBranch(templateFile, this, valueStrings, 0, warnings);
lineList.add(new TemplateLine(a.getAttributeType(), 0, tags));
}
catch (Exception e)
--
Gitblit v1.10.0