TransformFuture: remove from, and use "then".

4 files changed, 12 insertions, 12 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
index 9d48af9..a11783e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
@@ -22,15 +22,15 @@ import javax.xml.parsers.DocumentBuilderFactory;
 public class DocumentParser implements AsyncParser<Document> {
     @Override
     public Future<Document> parse(DataEmitter emitter) {
-        return new TransformFuture<Document, ByteBufferList>() {
+        return new ByteBufferListParser().parse(emitter)
+        .then(new TransformFuture<Document, ByteBufferList>() {
             @Override
             protected void transform(ByteBufferList result) throws Exception {
                 DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
                 DocumentBuilder db = dbf.newDocumentBuilder();
                 setComplete(db.parse(new ByteBufferListInputStream(result)));
             }
-        }
-        .from(new ByteBufferListParser().parse(emitter));
+        });
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
index 03aaea6..d8eb7e5 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
@@ -15,13 +15,13 @@ import org.json.JSONObject;
 public class JSONArrayParser implements AsyncParser<JSONArray> {
     @Override
     public Future<JSONArray> parse(DataEmitter emitter) {
-        return new TransformFuture<JSONArray, String>() {
+        return new StringParser().parse(emitter)
+        .then(new TransformFuture<JSONArray, String>() {
             @Override
             protected void transform(String result) throws Exception {
                 setComplete(new JSONArray(result));
             }
-        }
-        .from(new StringParser().parse(emitter));
+        });
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
index 9441575..dbdcbef 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
@@ -13,13 +13,13 @@ import org.json.JSONObject;
 public class JSONObjectParser implements AsyncParser<JSONObject> {
     @Override
     public Future<JSONObject> parse(DataEmitter emitter) {
-        return new TransformFuture<JSONObject, String>() {
+        return new StringParser().parse(emitter)
+        .then(new TransformFuture<JSONObject, String>() {
             @Override
             protected void transform(String result) throws Exception {
                 setComplete(new JSONObject(result));
             }
-        }
-        .from(new StringParser().parse(emitter));
+        });
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index da94e27..7886662 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -13,13 +13,13 @@ import com.koushikdutta.async.future.TransformFuture;
 public class StringParser implements AsyncParser<String> {
     @Override
     public Future<String> parse(DataEmitter emitter) {
-        return new TransformFuture<String, ByteBufferList>() {
+        return new ByteBufferListParser().parse(emitter)
+        .then(new TransformFuture<String, ByteBufferList>() {
             @Override
             protected void transform(ByteBufferList result) throws Exception {
                 setComplete(result.readString());
             }
-        }
-        .from(new ByteBufferListParser().parse(emitter));
+        });
     }
 
     @Override