From 758fa048a39b3c362776400a9373ebeef86700af Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Feb 2016 16:43:42 +0000
Subject: [PATCH] Removed Attribute.getOptions()
---
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
index 38d142f..e2d5ebe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
@@ -37,9 +37,16 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.tools.makeldif.TemplateEntry;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.types.*;
+import org.opends.server.tools.makeldif.TemplateEntry;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFExportConfig;
+import org.opends.server.types.Modification;
+import org.opends.server.types.RDN;
+import org.opends.server.types.RawAttribute;
+import org.opends.server.types.RawModification;
import static org.forgerock.util.Reject.*;
import static org.opends.server.util.StaticUtils.*;
@@ -434,13 +441,7 @@
{
for (Attribute a : entry.getUserAttribute(attrType))
{
- StringBuilder attrName = new StringBuilder(a.getName());
- for (String o : a.getOptions())
- {
- attrName.append(";");
- attrName.append(o);
- }
-
+ StringBuilder attrName = new StringBuilder(a.getNameWithOptions());
for (ByteString v : a)
{
writeAttribute(attrName, v, writer, wrapLines, wrapColumn);
@@ -506,12 +507,7 @@
{
StringBuilder attrName = new StringBuilder();
attrName.append("# ");
- attrName.append(a.getName());
- for (String o : a.getOptions())
- {
- attrName.append(";");
- attrName.append(o);
- }
+ attrName.append(a.getNameWithOptions());
for (ByteString v : a)
{
@@ -571,13 +567,7 @@
Modification m = iterator.next();
Attribute a = m.getAttribute();
- StringBuilder nameBuffer = new StringBuilder(a.getName());
- for (String o : a.getOptions())
- {
- nameBuffer.append(";");
- nameBuffer.append(o);
- }
- String name = nameBuffer.toString();
+ String name = a.getNameWithOptions();
StringBuilder modTypeLine = new StringBuilder();
modTypeLine.append(m.getModificationType());
--
Gitblit v1.10.0