From 7a573aef4c0df5e52534320f8b911e54349f7921 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 15:02:41 +0000
Subject: [PATCH] Make CustomSearchResult closer to SDK's Entry
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index 62d8b31..aebb0fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -19,6 +19,7 @@
import static com.forgerock.opendj.cli.Utils.*;
+import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -28,7 +29,6 @@
import java.awt.event.ActionListener;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import javax.swing.JButton;
import javax.swing.JLabel;
@@ -39,6 +39,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
+import org.forgerock.opendj.ldap.Attribute;
+import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.opends.admin.ads.util.ConnectionWrapper;
@@ -344,10 +346,11 @@
String dn = this.dn.getText();
StringBuilder sb = new StringBuilder();
sb.append("dn: ").append(dn);
- for (String attrName : entryToDuplicate.getAttributeNames())
+ for (Attribute attr : entryToDuplicate.getAllAttributes())
{
- List<ByteString> values = entryToDuplicate.getAttributeValues(attrName);
- if (attrName.equalsIgnoreCase(ATTR_USER_PASSWORD))
+ AttributeDescription attrDesc = attr.getAttributeDescription();
+ String attrName = attr.getAttributeDescriptionAsString();
+ if (attrDesc.equals(getUserPasswordAttributeType()))
{
sb.append("\n");
String pwd = new String(password.getPassword());
@@ -358,12 +361,12 @@
}
else if (!attrName.equalsIgnoreCase(rdnAttribute))
{
- if (!ViewEntryPanel.isEditable(attrName,
+ if (!ViewEntryPanel.isEditable(attrDesc,
getInfo().getServerDescriptor().getSchema()))
{
continue;
}
- for (ByteString value : values)
+ for (ByteString value : attr)
{
sb.append("\n");
if (isBinary(attrName))
@@ -380,7 +383,7 @@
else
{
String newValue = getFirstValue(DN.valueOf(dn));
- if (values.size() == 1)
+ if (attr.size() == 1)
{
sb.append("\n");
sb.append(attrName).append(": ").append(newValue);
@@ -388,7 +391,7 @@
else
{
String oldValue = getFirstValue(entryToDuplicate.getName());
- for (ByteString value : values)
+ for (ByteString value : attr)
{
sb.append("\n");
if (oldValue.equals(value))
--
Gitblit v1.10.0