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/datamodel/CustomSearchResult.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 10 ++--
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java | 18 ++++----
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 8 ++--
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 2
10 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
index c5a71ed..29d940a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
@@ -100,7 +100,7 @@
* Returns the DN of the entry.
* @return the DN of the entry.
*/
- public DN getDN()
+ public DN getName()
{
return dn;
}
@@ -144,7 +144,7 @@
if (o instanceof CustomSearchResult)
{
CustomSearchResult sr = (CustomSearchResult)o;
- return getDN().equals(sr.getDN())
+ return getName().equals(sr.getName())
&& getAttributeNames().equals(sr.getAttributeNames())
&& attrValuesEqual(sr);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 44d550b..3646b7f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -323,7 +323,7 @@
if (!sr.getName().equals(""))
{
CustomSearchResult res = new CustomSearchResult(sr);
- deleteSubtreeRecursively(conn, res.getDN(), null, toNotify);
+ deleteSubtreeRecursively(conn, res.getName(), null, toNotify);
}
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index 1aab352..e196685 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -96,7 +96,7 @@
this.treePath = path;
DN newDn = newEntry.getName();
- oldDn = oldEntry.getDN();
+ oldDn = oldEntry.getName();
for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
{
for (BaseDNDescriptor baseDN : backend.getBaseDns())
@@ -153,7 +153,7 @@
@Override
public LocalizableMessage getTaskDescription()
{
- return INFO_CTRL_PANEL_MODIFY_ENTRY_TASK_DESCRIPTION.get(oldEntry.getDN());
+ return INFO_CTRL_PANEL_MODIFY_ENTRY_TASK_DESCRIPTION.get(oldEntry.getName());
}
@Override
@@ -223,12 +223,12 @@
useAdminCtx);
getProgressDialog().appendProgressHtml(
Utilities.getProgressWithPoints(
- INFO_CTRL_PANEL_MODIFYING_ENTRY.get(oldEntry.getDN()),
+ INFO_CTRL_PANEL_MODIFYING_ENTRY.get(oldEntry.getName()),
ColorAndFontConstants.progressFont));
}
});
- conn.getLdapContext().modifyAttributes(Utilities.getJNDIName(oldEntry.getDN().toString()), mods);
+ conn.getLdapContext().modifyAttributes(Utilities.getJNDIName(oldEntry.getName().toString()), mods);
SwingUtilities.invokeLater(new Runnable()
{
@@ -514,7 +514,7 @@
* modifications.
*/
ByteString oldRdnValueDeleted = null;
- RDN oldRDN = oldEntry.getDN().rdn();
+ RDN oldRDN = oldEntry.getName().rdn();
for (AVA ava : oldRDN)
{
if (ava.getAttributeType().equals(attrDesc.getAttributeType()))
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index 3f32f56..62d8b31 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -387,7 +387,7 @@
}
else
{
- String oldValue = getFirstValue(entryToDuplicate.getDN());
+ String oldValue = getFirstValue(entryToDuplicate.getName());
for (ByteString value : values)
{
sb.append("\n");
@@ -469,7 +469,7 @@
entryToDuplicate = sr;
try
{
- rdnAttribute = sr.getDN().rdn().getFirstAVA().getAttributeType().getNameOrOID();
+ rdnAttribute = sr.getName().rdn().getFirstAVA().getAttributeType().getNameOrOID();
updateDNValue();
boolean hasPassword = !sr.getAttributeValues(ATTR_USER_PASSWORD).isEmpty();
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);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
index 209324b..6d289a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
@@ -155,14 +155,14 @@
boolean sameEntry = false;
if (searchResult != null && sr != null)
{
- sameEntry = searchResult.getDN().equals(sr.getDN());
+ sameEntry = searchResult.getName().equals(sr.getName());
}
searchResult = sr;
updateTitle(sr, path);
StringBuilder sb = new StringBuilder();
- sb.append("dn: ").append(sr.getDN());
+ sb.append("dn: ").append(sr.getName());
if (isReadOnly)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
index 55734e2..813d90d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -505,7 +505,7 @@
}
catch (Throwable t)
{
- logger.error(LocalizableMessage.raw("Error getting entry '"+csr.getDN()+"': "+t, t));
+ logger.error(LocalizableMessage.raw("Error getting entry '"+csr.getName()+"': "+t, t));
}
}
return list;
@@ -568,7 +568,7 @@
}
catch (Throwable t)
{
- logger.error(LocalizableMessage.raw("Error getting entry '"+csr.getDN()+"': "+t, t));
+ logger.error(LocalizableMessage.raw("Error getting entry '"+csr.getName()+"': "+t, t));
}
}
return list;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index 06ca7e8..271c7b9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -409,7 +409,7 @@
boolean sameEntry = false;
if (searchResult != null && sr != null)
{
- sameEntry = searchResult.getDN().equals(sr.getDN());
+ sameEntry = searchResult.getName().equals(sr.getName());
}
final Point p = sameEntry ?
scrollAttributes.getViewport().getViewPosition() : new Point(0, 0);
@@ -679,7 +679,7 @@
}
// Handle the root entry separately: most of its attributes are operational
// so we filter a list of hardcoded attributes.
- boolean isRootEntry = "".equals(sr.getDN());
+ boolean isRootEntry = "".equals(sr.getName());
Schema schema = getInfo().getServerDescriptor().getSchema();
if (isRootEntry)
{
@@ -1397,7 +1397,7 @@
StringBuilder sb = new StringBuilder();
try
{
- DN oldDN = searchResult.getDN();
+ DN oldDN = searchResult.getName();
if (oldDN.size() > 0)
{
List<AVA> avas = toAvas(oldDN.rdn());
@@ -1581,7 +1581,7 @@
private void updatePanel(ObjectClassValue newValue)
{
CustomSearchResult oldResult = searchResult;
- CustomSearchResult newResult = new CustomSearchResult(searchResult.getDN());
+ CustomSearchResult newResult = new CustomSearchResult(searchResult.getName());
for (String attrName : schemaReadOnlyAttributesLowerCase)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index f20f367..43a1609 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -160,7 +160,7 @@
boolean sameEntry = false;
if (searchResult != null && sr != null)
{
- sameEntry = searchResult.getDN().equals(sr.getDN());
+ sameEntry = searchResult.getName().equals(sr.getName());
}
searchResult = sr;
@@ -262,7 +262,7 @@
StringBuilder sb = new StringBuilder();
try
{
- DN oldDN = searchResult.getDN();
+ DN oldDN = searchResult.getName();
if (oldDN.size() > 0)
{
RDN rdn = oldDN.rdn();
@@ -716,7 +716,7 @@
private void updateObjectClass(ObjectClassValue newValue)
{
CustomSearchResult oldResult = searchResult;
- CustomSearchResult newResult = new CustomSearchResult(searchResult.getDN());
+ CustomSearchResult newResult = new CustomSearchResult(searchResult.getName());
for (String attrName : schemaReadOnlyAttributesLowerCase)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 6bde156..65cc089 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -182,7 +182,7 @@
*/
protected void updateTitle(CustomSearchResult sr, TreePath path)
{
- final DN dn = sr.getDN();
+ final DN dn = sr.getName();
if (dn != null && dn.size() > 0)
{
title.setText(dn.toString());
--
Gitblit v1.10.0