From f2160f4bd1c8ac67e5a86a6710d431e8932877f9 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 28 May 2010 11:47:51 +0000
Subject: [PATCH] Synchronize SDK on java.net with internal repository.

---
 sdk/src/org/opends/sdk/requests/AbandonRequest.java |   89 ++++++++------------------------------------
 1 files changed, 17 insertions(+), 72 deletions(-)

diff --git a/sdk/src/org/opends/sdk/requests/AbandonRequest.java b/sdk/src/org/opends/sdk/requests/AbandonRequest.java
index e1d07e6..b8e705d 100644
--- a/sdk/src/org/opends/sdk/requests/AbandonRequest.java
+++ b/sdk/src/org/opends/sdk/requests/AbandonRequest.java
@@ -29,28 +29,25 @@
 
 
 
+import java.util.List;
+
+import org.opends.sdk.DecodeException;
+import org.opends.sdk.DecodeOptions;
 import org.opends.sdk.controls.Control;
+import org.opends.sdk.controls.ControlDecoder;
 
 
 
 /**
- * The Abandon operation allows a client to request that the server
- * abandon an uncompleted operation.
+ * The Abandon operation allows a client to request that the server abandon an
+ * uncompleted operation.
  * <p>
  * Abandon, Bind, Unbind, and StartTLS operations cannot be abandoned.
  */
 public interface AbandonRequest extends Request
 {
   /**
-   * Adds the provided control to this request.
-   * 
-   * @param control
-   *          The control to be added to this request.
-   * @return This request.
-   * @throws UnsupportedOperationException
-   *           If this request does not permit controls to be added.
-   * @throws NullPointerException
-   *           If {@code control} was {@code null}.
+   * {@inheritDoc}
    */
   AbandonRequest addControl(Control control)
       throws UnsupportedOperationException, NullPointerException;
@@ -58,45 +55,23 @@
 
 
   /**
-   * Removes all the controls included with this request.
-   * 
-   * @return This request.
-   * @throws UnsupportedOperationException
-   *           If this request does not permit controls to be removed.
+   * {@inheritDoc}
    */
-  AbandonRequest clearControls() throws UnsupportedOperationException;
+  <C extends Control> C getControl(ControlDecoder<C> decoder,
+      DecodeOptions options) throws NullPointerException, DecodeException;
 
 
 
   /**
-   * Returns the first control contained in this request having the
-   * specified OID.
-   * 
-   * @param oid
-   *          The OID of the control to be returned.
-   * @return The control, or {@code null} if the control is not included
-   *         with this request.
-   * @throws NullPointerException
-   *           If {@code oid} was {@code null}.
+   * {@inheritDoc}
    */
-  Control getControl(String oid) throws NullPointerException;
-
-
-
-  /**
-   * Returns an {@code Iterable} containing the controls included with
-   * this request. The returned {@code Iterable} may be used to remove
-   * controls if permitted by this request.
-   * 
-   * @return An {@code Iterable} containing the controls.
-   */
-  Iterable<Control> getControls();
+  List<Control> getControls();
 
 
 
   /**
    * Returns the message ID of the request to be abandoned.
-   * 
+   *
    * @return The message ID of the request to be abandoned.
    */
   int getMessageID();
@@ -104,44 +79,14 @@
 
 
   /**
-   * Indicates whether or not this request has any controls.
-   * 
-   * @return {@code true} if this request has any controls, otherwise
-   *         {@code false}.
-   */
-  boolean hasControls();
-
-
-
-  /**
-   * Removes the first control contained in this request having the
-   * specified OID.
-   * 
-   * @param oid
-   *          The OID of the control to be removed.
-   * @return The removed control, or {@code null} if the control is not
-   *         included with this request.
-   * @throws UnsupportedOperationException
-   *           If this request does not permit controls to be removed.
-   * @throws NullPointerException
-   *           If {@code oid} was {@code null}.
-   */
-  Control removeControl(String oid)
-      throws UnsupportedOperationException, NullPointerException;
-
-
-
-  /**
    * Sets the message ID of the request to be abandoned.
-   * 
+   *
    * @param id
    *          The message ID of the request to be abandoned.
    * @return This abandon request.
    * @throws UnsupportedOperationException
-   *           If this abandon request does not permit the message ID to
-   *           be set.
+   *           If this abandon request does not permit the message ID to be set.
    */
-  AbandonRequest setMessageID(int id)
-      throws UnsupportedOperationException;
+  AbandonRequest setMessageID(int id) throws UnsupportedOperationException;
 
 }

--
Gitblit v1.10.0