From a8577a9c9961eb393fdb97884d217a316f685b1c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 10:39:13 +0000
Subject: [PATCH] Replace use of Base64 by ByteString.toBase64String()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 4 +---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 10 +---------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 2 +-
3 files changed, 3 insertions(+), 13 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 917ece8..ef93c8c 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
@@ -50,7 +50,6 @@
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.LDAPEntryReader;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.util.Base64;
import org.opends.server.util.LDIFException;
/** The panel used to duplicate an entry. */
@@ -371,8 +370,7 @@
sb.append("\n");
if (isBinary(attrName))
{
- final String base64 = Base64.encode(value.toByteArray());
- sb.append(attrName).append(":: ").append(base64);
+ sb.append(attrName).append(":: ").append(value.toBase64String());
}
else
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index a664d7d..3e847a8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -98,7 +98,6 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
-import org.opends.server.util.Base64;
import org.opends.server.util.LDIFReader;
/** The panel displaying a simplified view of an entry. */
@@ -1579,14 +1578,7 @@
private String getPasswordStringValue(String attrName, ByteString v)
{
- if (isBinary(attrName))
- {
- return Base64.encode(v.toByteArray());
- }
- else
- {
- return v.toString();
- }
+ return isBinary(attrName) ? v.toBase64String() : v.toString();
}
private void updatePanel(ObjectClassValue newValue)
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 1a40f1a..5ead6ff 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
@@ -381,7 +381,7 @@
ByteString v = (ByteString) value;
if (v.length() > 0)
{
- appendBase64(sb, attrName, Base64.encode(v.toByteArray()));
+ appendBase64(sb, attrName, v.toBase64String());
}
}
else if (value instanceof byte[])
--
Gitblit v1.10.0