mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noël Rouvignac
04.40.2016 a8577a9c9961eb393fdb97884d217a316f685b1c
Replace use of Base64 by ByteString.toBase64String()
3 files modified
16 ■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java 4 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java 10 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java 2 ●●● patch | view | raw | blame | history
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
          {
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)
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[])