From 8ca638034127ea5c5911ebcd13ff33e742e06784 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 13:23:02 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 5d04d6b..3f32f56 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
@@ -17,8 +17,10 @@
package org.opends.guitools.controlpanel.ui;
+import static com.forgerock.opendj.cli.Utils.*;
+
import static org.opends.messages.AdminToolMessages.*;
-import static com.forgerock.opendj.cli.Utils.isDN;
+import static org.opends.server.util.ServerConstants.*;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -37,6 +39,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
+import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.browser.BrowserController;
@@ -47,7 +50,6 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.util.Base64;
import org.opends.server.util.LDIFException;
-import org.opends.server.util.ServerConstants;
/** The panel used to duplicate an entry. */
public class DuplicateEntryPanel extends AbstractNewEntryPanel
@@ -344,8 +346,8 @@
sb.append("dn: ").append(dn);
for (String attrName : entryToDuplicate.getAttributeNames())
{
- List<Object> values = entryToDuplicate.getAttributeValues(attrName);
- if (attrName.equalsIgnoreCase(ServerConstants.ATTR_USER_PASSWORD))
+ List<ByteString> values = entryToDuplicate.getAttributeValues(attrName);
+ if (attrName.equalsIgnoreCase(ATTR_USER_PASSWORD))
{
sb.append("\n");
String pwd = new String(password.getPassword());
@@ -361,12 +363,12 @@
{
continue;
}
- for (Object value : values)
+ for (ByteString value : values)
{
sb.append("\n");
- if (value instanceof byte[])
+ if (isBinary(attrName))
{
- final String base64 = Base64.encode((byte[]) value);
+ final String base64 = Base64.encode(value.toByteArray());
sb.append(attrName).append(":: ").append(base64);
}
else
@@ -386,7 +388,7 @@
else
{
String oldValue = getFirstValue(entryToDuplicate.getDN());
- for (Object value : values)
+ for (ByteString value : values)
{
sb.append("\n");
if (oldValue.equals(value))
@@ -470,8 +472,7 @@
rdnAttribute = sr.getDN().rdn().getFirstAVA().getAttributeType().getNameOrOID();
updateDNValue();
- Boolean hasPassword = !sr.getAttributeValues(
- ServerConstants.ATTR_USER_PASSWORD).isEmpty();
+ boolean hasPassword = !sr.getAttributeValues(ATTR_USER_PASSWORD).isEmpty();
lPassword.setVisible(hasPassword);
password.setVisible(hasPassword);
lconfirmPassword.setVisible(hasPassword);
--
Gitblit v1.10.0