rename the callback to something not such a mouthful.

koush · koush · commit a712677519dc · 2013-05-21T00:08:39.000-07:00
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -2,6 +2,6 @@
 
 
 public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
-    public FutureCallback<T> getResultCallback();
-    public Future<T> setResultCallback(FutureCallback<T> callback);
+    public FutureCallback<T> getCallback();
+    public Future<T> setCallback(FutureCallback<T> callback);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -109,12 +109,12 @@ public boolean setComplete(T value) {
 
     FutureCallback<T> callback;
     @Override
-    public FutureCallback<T> getResultCallback() {
+    public FutureCallback<T> getCallback() {
         return callback;
     }
 
     @Override
-    public Future<T> setResultCallback(FutureCallback<T> callback) {
+    public Future<T> setCallback(FutureCallback<T> callback) {
         // callback can only be changed or read/used inside a sync block
         boolean runCallback;
         synchronized (this) {
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/FutureTests.java b/AndroidAsyncTest/src/com/koushikdutta/async/test/FutureTests.java
@@ -41,7 +41,7 @@ public void testFutureCallback() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final IntegerFuture future = IntegerFuture.create(20, 1000);
         final Thread mainThread = Thread.currentThread();
-        future.setResultCallback(new FutureCallback<Integer>() {
+        future.setCallback(new FutureCallback<Integer>() {
             @Override
             public void onCompleted(Exception e, Integer result) {
                 assertNotSame(Thread.currentThread(), mainThread);
@@ -57,7 +57,7 @@ public void testFutureFinishedCallback() throws Exception {
         final IntegerFuture future = IntegerFuture.create(20, 1);
         Thread.sleep(1000);
         final Thread mainThread = Thread.currentThread();
-        future.setResultCallback(new FutureCallback<Integer>() {
+        future.setCallback(new FutureCallback<Integer>() {
             @Override
             public void onCompleted(Exception e, Integer result) {
                 assertEquals(Thread.currentThread(), mainThread);
diff --git a/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java b/AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java
@@ -118,7 +118,7 @@ public void testInsecureGithubRandomDataWithFuture() throws Exception {
     public void testInsecureGithubRandomDataWithFutureCallback() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         final Md5 md5 = Md5.createInstance();
-        client.getByteBufferList(githubInsecure).setResultCallback(new FutureCallback<ByteBufferList>() {
+        client.getByteBufferList(githubInsecure).setCallback(new FutureCallback<ByteBufferList>() {
             @Override
             public void onCompleted(Exception e, ByteBufferList bb) {
                 md5.update(bb);
@@ -137,7 +137,7 @@ public void testGithubHelloWithFuture() throws Exception {
     public void testGithubHelloWithFutureCallback() throws Exception {
         final Semaphore semaphore = new Semaphore(0);
         client.getString("https://" + githubPath + "hello.txt")
-        .setResultCallback(new FutureCallback<String>() {
+        .setCallback(new FutureCallback<String>() {
             @Override
             public void onCompleted(Exception e, String result) {
                 assertEquals(result, "hello world");
diff --git a/README.md b/README.md
@@ -185,7 +185,7 @@ Futures can also have callbacks...
 
 ```java
 Future<String> string = client.getString("http://foo.com/hello.txt");
-string.setResultCallback(new FutureCallback<String>() {
+string.setCallback(new FutureCallback<String>() {
     @Override
     public void onCompleted(Exception e, String result) {
         System.out.println(result);
@@ -197,7 +197,7 @@ For brevity...
 
 ```java
 client.getString("http://foo.com/hello.txt")
-.setResultCallback(new FutureCallback<String>() {
+.setCallback(new FutureCallback<String>() {
     @Override
     public void onCompleted(Exception e, String result) {
         System.out.println(result);

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {`
`5`		`- public FutureCallback<T> getResultCallback();`
`6`		`- public Future<T> setResultCallback(FutureCallback<T> callback);`
	`5`	`+ public FutureCallback<T> getCallback();`
	`6`	`+ public Future<T> setCallback(FutureCallback<T> callback);`
`7`	`7`	`}`