mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noël Rouvignac
04.58.2016 8534453de9fa37b94a9c74d06291a8113991f2b2
Make CustomSearchResult closer to SDK's Entry

CustomSearchResult.java:
getDN() => getName()
10 files modified
62 ■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java 10 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java 18 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java 8 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java 6 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java 2 ●●● patch | view | raw | blame | history
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);
    }
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);
        }
      }
    }
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()))
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();
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);
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)
    {
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;
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)
    {
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)
      {
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());