Use directly the constant OID of the control instead of creating a control ...

jvergara

15.26.2009 19add981803b98587051c84159df69bbab579095

Use directly the constant OID of the control instead of creating a control object.

 opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java

@@ -62,6 +62,7 @@
import org.opends.messages.Message;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.cli.CommandBuilder;

/**
@@ -457,7 +458,8 @@
      ctx1 = ConnectionUtils.cloneInitialLdapContext(ctx,
          ConnectionUtils.getDefaultLDAPTimeout(),
          getInfo().getTrustManager(), null);
      Control[] ctls = {new BasicControl(Utilities.SUBTREE_CTRL_OID)};
      Control[] ctls = {
          new BasicControl(ServerConstants.OID_SUBTREE_DELETE_CONTROL)};
      ctx1.setRequestControls(ctls);
      ctx1.destroySubcontext(Utilities.getJNDIName(dn.toString()));
    }
@@ -518,7 +520,7 @@
    if (usingControl)
    {
      args.add("-J");
      args.add(Utilities.SUBTREE_CTRL_OID);
      args.add(ServerConstants.OID_SUBTREE_DELETE_CONTROL);
    }
    args.add(dn.toString());
    StringBuilder sb = new StringBuilder();

 opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java

@@ -82,7 +82,6 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;

import org.opends.admin.ads.SubtreeDeleteControl;
import org.opends.guitools.controlpanel.ControlPanel;
import org.opends.guitools.controlpanel.browser.IconPool;
import org.opends.guitools.controlpanel.datamodel.ConfigReadException;
@@ -2073,12 +2072,6 @@
    }
  }

  /**
   * The OID of the delete subtree control.
   */
  public static final String SUBTREE_CTRL_OID =
    (new SubtreeDeleteControl()).getID();


  /**
   * Sets the required icon to the provided label.