From c9958277baf5f911bda401802259a4b50d9cd599 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Aug 2016 16:06:26 +0000
Subject: [PATCH] BasicNode: use DN
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
index bedd2d2..91e59a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -335,8 +335,8 @@
{
for (TreePath p : paths)
{
- BasicNode n = (BasicNode)p.getLastPathComponent();
- if (!entryPane.canDelete(DN.valueOf(n.getDN())))
+ BasicNode n = (BasicNode) p.getLastPathComponent();
+ if (!entryPane.canDelete(n.getDN()))
{
return false;
}
@@ -502,7 +502,7 @@
}
if (node != null)
{
- String dn;
+ DN dn;
if (controller.getFollowReferrals() &&
node.getReferral() != null &&
node.getRemoteUrl() == null &&
@@ -511,13 +511,12 @@
{
// We are in the case where we are following referrals but the referral
// could not be resolved. Display an error.
- entryPane.referralSolveError(node.getDN(), node.getReferral(),
- node.getError());
+ entryPane.referralSolveError(node.getDN(), node.getReferral(), node.getError());
dn = null;
}
else if (controller.getFollowReferrals() && node.getRemoteUrl() != null)
{
- dn = node.getRemoteUrl().getRawBaseDN();
+ dn = DN.valueOf(node.getRemoteUrl().getRawBaseDN());
}
else
{
@@ -1069,8 +1068,8 @@
LinkedHashSet<DN> dns = new LinkedHashSet<>();
for (TreePath path : paths)
{
- BasicNode node = (BasicNode)path.getLastPathComponent();
- dns.add(DN.valueOf(node.getDN()));
+ BasicNode node = (BasicNode) path.getLastPathComponent();
+ dns.add(node.getDN());
}
if (addToGroupDlg == null)
{
--
Gitblit v1.10.0