From 6439bba5cc09d6febc59bdc9e0d9bc25f1f1eb18 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 01 Sep 2010 09:04:15 +0000
Subject: [PATCH] Various improvements:

---
 sdk/src/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/sdk/src/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java b/sdk/src/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
index 9f1460a..a331e0e 100644
--- a/sdk/src/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
+++ b/sdk/src/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2009 Sun Microsystems, Inc.
+ *      Copyright 2009-2010 Sun Microsystems, Inc.
  */
 
 package com.sun.opends.sdk.tools;
@@ -103,7 +103,7 @@
 
 
     public FutureResult<Result> add(final AddRequest request,
-        final ResultHandler<Result> handler)
+        final ResultHandler<? super Result> handler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
     {
@@ -113,7 +113,7 @@
 
 
     public FutureResult<Result> add(final AddRequest request,
-        final ResultHandler<Result> resultHandler,
+        final ResultHandler<? super Result> resultHandler,
         final IntermediateResponseHandler intermediateResponseHandler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
@@ -197,7 +197,7 @@
 
 
     public FutureResult<Result> delete(final DeleteRequest request,
-        final ResultHandler<Result> handler)
+        final ResultHandler<? super Result> handler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
     {
@@ -207,7 +207,7 @@
 
 
     public FutureResult<Result> delete(final DeleteRequest request,
-        final ResultHandler<Result> resultHandler,
+        final ResultHandler<? super Result> resultHandler,
         final IntermediateResponseHandler intermediateResponseHandler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
@@ -283,7 +283,7 @@
 
 
     public FutureResult<Result> modify(final ModifyRequest request,
-        final ResultHandler<Result> handler)
+        final ResultHandler<? super Result> handler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
     {
@@ -293,7 +293,7 @@
 
 
     public FutureResult<Result> modify(final ModifyRequest request,
-        final ResultHandler<Result> resultHandler,
+        final ResultHandler<? super Result> resultHandler,
         final IntermediateResponseHandler intermediateResponseHandler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
@@ -305,7 +305,7 @@
 
 
     public FutureResult<Result> modifyDN(final ModifyDNRequest request,
-        final ResultHandler<Result> handler)
+        final ResultHandler<? super Result> handler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
     {
@@ -315,7 +315,7 @@
 
 
     public FutureResult<Result> modifyDN(final ModifyDNRequest request,
-        final ResultHandler<Result> resultHandler,
+        final ResultHandler<? super Result> resultHandler,
         final IntermediateResponseHandler intermediateResponseHandler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
@@ -344,7 +344,7 @@
      * {@inheritDoc}
      */
     public FutureResult<RootDSE> readRootDSE(
-        final ResultHandler<RootDSE> handler)
+        final ResultHandler<? super RootDSE> handler)
         throws UnsupportedOperationException, IllegalStateException
     {
       return connection.readRootDSE(handler);
@@ -356,7 +356,7 @@
      * {@inheritDoc}
      */
     public FutureResult<Schema> readSchema(final DN name,
-        final ResultHandler<Schema> handler)
+        final ResultHandler<? super Schema> handler)
         throws UnsupportedOperationException, IllegalStateException
     {
       return connection.readSchema(name, handler);
@@ -368,7 +368,7 @@
      * {@inheritDoc}
      */
     public FutureResult<Schema> readSchemaForEntry(final DN name,
-        final ResultHandler<Schema> handler)
+        final ResultHandler<? super Schema> handler)
         throws UnsupportedOperationException, IllegalStateException
     {
       return connection.readSchemaForEntry(name, handler);
@@ -448,24 +448,22 @@
 
 
     public FutureResult<Result> search(final SearchRequest request,
-        final ResultHandler<Result> resultHandler,
-        final SearchResultHandler searchResulthandler)
+        final SearchResultHandler handler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
     {
-      return connection.search(request, resultHandler, searchResulthandler);
+      return connection.search(request, handler);
     }
 
 
 
     public FutureResult<Result> search(final SearchRequest request,
-        final ResultHandler<Result> resultHandler,
-        final SearchResultHandler searchResulthandler,
+        final SearchResultHandler resultHandler,
         final IntermediateResponseHandler intermediateResponseHandler)
         throws UnsupportedOperationException, IllegalStateException,
         NullPointerException
     {
-      return connection.search(request, resultHandler, searchResulthandler,
+      return connection.search(request, resultHandler,
           intermediateResponseHandler);
     }
 
@@ -592,7 +590,7 @@
 
 
     private FutureResultImpl(final BindRequest request,
-        final ResultHandler<AsynchronousConnection> handler)
+        final ResultHandler<? super AsynchronousConnection> handler)
     {
       this.bindRequest = request;
       this.futureBindResult = new FutureResultTransformer<BindResult, AsynchronousConnection>(
@@ -684,7 +682,7 @@
 
   @Override
   public FutureResult<AsynchronousConnection> getAsynchronousConnection(
-      final ResultHandler<AsynchronousConnection> handler)
+      final ResultHandler<? super AsynchronousConnection> handler)
   {
     final FutureResultImpl future = new FutureResultImpl(request, handler);
     future.futureConnectionResult.setFutureResult(parentFactory

--
Gitblit v1.10.0