From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java b/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
index d54d1c0..496f3b4 100644
--- a/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
+++ b/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
@@ -33,14 +33,7 @@
import java.util.List;
import org.opends.server.core.DirectoryServer;
-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.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.ObjectClass;
-import org.opends.server.types.RDN;
+import org.opends.server.types.*;
import static org.opends.server.util.StaticUtils.*;
@@ -168,7 +161,8 @@
return null;
}
- AttributeValue value = new AttributeValue(t, v.getValue().toString());
+ AttributeValue value =
+ AttributeValues.create(t, v.getValue().toString());
rdn = new RDN(t, value);
}
else
@@ -185,7 +179,7 @@
}
names[i] = t.getPrimaryName();
- values[i] = new AttributeValue(t, v.getValue().toString());
+ values[i] = AttributeValues.create(t, v.getValue().toString());
}
rdn = new RDN(rdnAttrs, names, values);
@@ -312,7 +306,7 @@
AttributeBuilder builder = new AttributeBuilder(t, t.getNameOrOID());
for (TemplateValue v : valueList)
{
- builder.add(new AttributeValue(t, v.getValue().toString()));
+ builder.add(AttributeValues.create(t, v.getValue().toString()));
}
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
@@ -324,7 +318,7 @@
AttributeBuilder builder = new AttributeBuilder(t, t.getNameOrOID());
for (TemplateValue v : valueList)
{
- builder.add(new AttributeValue(t, v.getValue().toString()));
+ builder.add(AttributeValues.create(t, v.getValue().toString()));
}
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
--
Gitblit v1.10.0