From eaee3f6a42c1a129f07e2364a4c32c59b9e03e19 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 09 Feb 2016 15:22:22 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for RDNs
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 9e88f04..a3d9659 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -44,6 +44,7 @@
import javax.swing.tree.TreePath;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
@@ -61,7 +62,6 @@
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.OpenDsException;
-import org.opends.server.types.RDN;
import org.opends.server.types.Schema;
import org.opends.server.util.Base64;
import org.opends.server.util.ServerConstants;
@@ -294,11 +294,10 @@
protected void addValuesInRDN(Entry entry)
{
// Add the values in the RDN if they are not there
- RDN rdn = entry.getName().rdn();
- for (int i=0; i<rdn.getNumValues(); i++)
+ for (AVA ava : entry.getName().rdn())
{
- String attrName = rdn.getAttributeName(i);
- ByteString value = rdn.getAttributeValue(i);
+ String attrName = ava.getAttributeName();
+ ByteString value = ava.getAttributeValue();
boolean done = false;
for (org.opends.server.types.Attribute attr : entry.getAttribute(attrName.toLowerCase()))
{
@@ -313,7 +312,7 @@
}
if (!done)
{
- entry.addAttribute(Attributes.create(rdn.getAttributeType(i), value), newArrayList(value));
+ entry.addAttribute(Attributes.create(ava.getAttributeType(), value), newArrayList(value));
}
}
}
--
Gitblit v1.10.0