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/ui/LDAPEntryPanel.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
index f137a10..986fac7 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -469,16 +470,16 @@
try
{
parentReadOnly = new DN[] {
- DN.decode(ConfigConstants.DN_TASK_ROOT),
- DN.decode(ConfigConstants.DN_MONITOR_ROOT),
- DN.decode(ConfigConstants.DN_BACKUP_ROOT),
- DN.decode(Constants.REPLICATION_CHANGES_DN),
- DN.decode(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT)
+ DN.valueOf(ConfigConstants.DN_TASK_ROOT),
+ DN.valueOf(ConfigConstants.DN_MONITOR_ROOT),
+ DN.valueOf(ConfigConstants.DN_BACKUP_ROOT),
+ DN.valueOf(Constants.REPLICATION_CHANGES_DN),
+ DN.valueOf(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT)
};
nonDeletable = new DN[] {
- DN.decode(ConfigConstants.DN_CONFIG_ROOT),
- DN.decode(ConfigConstants.DN_DEFAULT_SCHEMA_ROOT),
- DN.decode(ConfigConstants.DN_TRUST_STORE_ROOT)
+ DN.valueOf(ConfigConstants.DN_CONFIG_ROOT),
+ DN.valueOf(ConfigConstants.DN_DEFAULT_SCHEMA_ROOT),
+ DN.valueOf(ConfigConstants.DN_TRUST_STORE_ROOT)
};
}
catch (Throwable t)
@@ -499,7 +500,7 @@
boolean isReadOnly = false;
try
{
- DN dn = DN.decode(sDn);
+ DN dn = DN.valueOf(sDn);
for (DN parentDN : parentReadOnly)
{
if (dn.isDescendantOf(parentDN))
@@ -532,7 +533,7 @@
boolean canDelete = true;
try
{
- DN dn = DN.decode(sDn);
+ DN dn = DN.valueOf(sDn);
for (DN parentDN : parentReadOnly)
{
if (dn.isDescendantOf(parentDN))
--
Gitblit v1.10.0