From c01c421b26e6409febd6af1db1c9db11b7b347a4 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 07 Jan 2014 15:06:31 +0000
Subject: [PATCH] Align server types API with SDK types API
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index 97a753f..3fae7a6 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -104,7 +105,7 @@
DN newDn = newEntry.getDN();
try
{
- oldDn = DN.decode(oldEntry.getDN());
+ oldDn = DN.valueOf(oldEntry.getDN());
for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
{
for (BaseDNDescriptor baseDN : backend.getBaseDns())
@@ -362,8 +363,8 @@
final ArrayList<ModificationItem> originalMods)
throws CannotRenameException, NamingException
{
- RDN oldRDN = oldDN.getRDN();
- RDN newRDN = newEntry.getDN().getRDN();
+ RDN oldRDN = oldDN.rdn();
+ RDN newRDN = newEntry.getDN().rdn();
boolean rdnTypeChanged =
newRDN.getNumValues() != oldRDN.getNumValues();
@@ -521,7 +522,7 @@
boolean isAttributeInNewRdn = false;
AttributeValue rdnValue = null;
- RDN rdn = newEntry.getDN().getRDN();
+ RDN rdn = newEntry.getDN().rdn();
for (int i=0; i<rdn.getNumValues() && !isAttributeInNewRdn; i++)
{
isAttributeInNewRdn =
@@ -546,7 +547,7 @@
RDN oldRDN = null;
try
{
- oldRDN = DN.decode(oldEntry.getDN()).getRDN();
+ oldRDN = DN.valueOf(oldEntry.getDN()).rdn();
}
catch (DirectoryException de)
{
--
Gitblit v1.10.0