From 56159257192f85039e301f0e445e156576bd05be Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Sat, 06 Aug 2016 10:25:44 +0000
Subject: [PATCH] control-panel: Replace server's Entry by SDK's Entry
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 61609f2..440e585 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
@@ -182,7 +182,8 @@
!authenticationRequired(getInfo().getServerDescriptor());
if (enable)
{
- if (ev.getEntry() == null)
+ Entry entry = ev .getEntry();
+ if (entry == null)
{
// Something changed that is wrong: assume the entry has been
// modified, when the user tries to save we will inform of the
@@ -191,8 +192,8 @@
}
else
{
- boolean modified = !ev.getEntry().getName().equals(searchResult.getName())
- || !ModifyEntryTask.getModifications(ev .getEntry(), searchResult, getInfo()).isEmpty();
+ boolean modified = !entry.getName().equals(searchResult.getName())
+ || !ModifyEntryTask.getModifications(entry, searchResult, getInfo()).isEmpty();
enable = modified;
}
}
@@ -497,7 +498,7 @@
Utilities.getFrame(this),
INFO_CTRL_PANEL_MODIFYING_ENTRY_CHANGES_TITLE.get(), getInfo());
dlg.setModal(modal);
- org.opends.server.types.Entry entry = displayedEntryPanel.getEntry();
+ Entry entry = displayedEntryPanel.getEntry();
newTask = new ModifyEntryTask(getInfo(), dlg, entry, searchResult, controller, treePath);
for (Task task : getInfo().getTasks())
{
--
Gitblit v1.10.0