From 8534453de9fa37b94a9c74d06291a8113991f2b2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 13:25:14 +0000
Subject: [PATCH] Make CustomSearchResult closer to SDK's Entry
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
index 1038895..c487457 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
@@ -192,7 +192,7 @@
}
else
{
- boolean modified = !ev.getEntry().getName().equals(searchResult.getDN())
+ boolean modified = !ev.getEntry().getName().equals(searchResult.getName())
|| !ModifyEntryTask.getModifications(ev .getEntry(), searchResult, getInfo()).isEmpty();
enable = modified;
}
@@ -250,8 +250,8 @@
private void updateEntryView(CustomSearchResult searchResult,
TreePath treePath)
{
- boolean isReadOnly = isReadOnly(searchResult.getDN());
- boolean canDelete = canDelete(searchResult.getDN());
+ boolean isReadOnly = isReadOnly(searchResult.getName());
+ boolean canDelete = canDelete(searchResult.getName());
delete.setVisible(canDelete);
saveChanges.setVisible(!isReadOnly);
@@ -387,8 +387,8 @@
boolean canDelete = false;
if (searchResult != null && desc.isAuthenticated())
{
- isReadOnly = isReadOnly(searchResult.getDN());
- canDelete = canDelete(searchResult.getDN());
+ isReadOnly = isReadOnly(searchResult.getName());
+ canDelete = canDelete(searchResult.getName());
}
delete.setVisible(canDelete);
@@ -565,14 +565,14 @@
{
LocalizableMessage confirmationMessage =
isLeaf ? INFO_CTRL_PANEL_DELETE_ENTRY_CONFIRMATION_DETAILS.get(
- searchResult.getDN()) :
+ searchResult.getName()) :
INFO_CTRL_PANEL_DELETE_SUBTREE_CONFIRMATION_DETAILS.get(
- searchResult.getDN());
+ searchResult.getName());
if (displayConfirmationDialog(
INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
confirmationMessage))
{
- DN dn = searchResult.getDN();
+ DN dn = searchResult.getName();
if (isLeaf)
{
launchOperation(newTask,
@@ -667,7 +667,7 @@
UnsavedChangesDialog unsavedChangesDlg = new UnsavedChangesDialog(
Utilities.getParentDialog(this), getInfo());
unsavedChangesDlg.setMessage(INFO_CTRL_PANEL_UNSAVED_CHANGES_SUMMARY.get(),
- INFO_CTRL_PANEL_UNSAVED_ENTRY_CHANGES_DETAILS.get(searchResult.getDN()));
+ INFO_CTRL_PANEL_UNSAVED_ENTRY_CHANGES_DETAILS.get(searchResult.getName()));
Utilities.centerGoldenMean(unsavedChangesDlg,
Utilities.getParentDialog(this));
unsavedChangesDlg.setVisible(true);
--
Gitblit v1.10.0