Code cleanup removing potential issues detected by FindBugs

Ludovic Poitou

20.05.2011 22b5b14b9923faeb26742d215a9810c9769fe9e4

Code cleanup removing potential issues detected by FindBugs

 opends/src/server/org/opends/server/admin/ManagedObjectPath.java

@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 */

package org.opends.server.admin;
@@ -875,7 +876,7 @@
      InstantiableRelationDefinition<? super C, ? super S> ir =
        (InstantiableRelationDefinition<? super C, ? super S>) r;
      if (elements.size() == 0) {
        return parent().child(ir, nd, null);
        return parent().child(ir, nd, "null");
      } else {
        return parent().child(ir, nd,
            elements.get(elements.size() - 1).getName());

 opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java

@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2007-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 */
package org.opends.server.admin.client.cli;

@@ -601,8 +602,7 @@
          }
          table.startRow();
          table.appendCell(adminUserProp.getAttributeName());
          table.appendCell(getPropertyOptionSummary(userAdminProperties
              .get(adminUserProp)));
          table.appendCell(getPropertyOptionSummary(adminUserProp));
          table.appendCell(adminUserProp.getAttributeSyntax());
          if (userAdminProperties.get(adminUserProp).getDefaultValue() != null)
          {
@@ -823,12 +823,12 @@
  }

  //Compute the options field.
  private String getPropertyOptionSummary(Argument arg)
  private String getPropertyOptionSummary(AdministratorProperty adminUserProp)
  {
    Argument arg = userAdminProperties.get(adminUserProp);
    StringBuilder b = new StringBuilder();

    if (readonlyadminUserProperties.contains(
        ADSContext.getServerPropFromName(arg.getName())))
    if (readonlyadminUserProperties.contains(adminUserProp))
    {
      b.append("r-"); //$NON-NLS-1$
    }