From f6529d5056f4ca8d7c4a4da29a6189053022e025 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Wed, 30 Apr 2014 15:45:22 +0200
Subject: Merge ProfileListener to TweetListener

These are quite closely coupled.
---
 src/provider/ProfileListener.java | 16 ----------------
 src/provider/ResultListener.java  | 23 +++++++++++++++++++++++
 src/provider/TweetListener.java   | 16 ----------------
 3 files changed, 23 insertions(+), 32 deletions(-)
 delete mode 100644 src/provider/ProfileListener.java
 create mode 100644 src/provider/ResultListener.java
 delete mode 100644 src/provider/TweetListener.java

diff --git a/src/provider/ProfileListener.java b/src/provider/ProfileListener.java
deleted file mode 100644
index 4232001..0000000
--- a/src/provider/ProfileListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package provider;
-
-import org.json.JSONObject;
-
-/**
- * Callback for new user profiles.
- */
-public interface ProfileListener {
-
-    /**
-     * This method is called when a new profile is provided.
-     *
-     * @param obj A single JSON object
-     */
-    void profileGenerated(JSONObject obj);
-}
diff --git a/src/provider/ResultListener.java b/src/provider/ResultListener.java
new file mode 100644
index 0000000..87bc786
--- /dev/null
+++ b/src/provider/ResultListener.java
@@ -0,0 +1,23 @@
+package provider;
+
+import org.json.JSONObject;
+
+/**
+ * Callback when a new tweet or user is received.
+ */
+public interface ResultListener {
+
+    /**
+     * This method is called when a new tweet is provided.
+     *
+     * @param obj A single JSON object.
+     */
+    public void tweetGenerated(JSONObject obj);
+
+    /**
+     * This method is called when a new profile is provided.
+     *
+     * @param obj A single JSON object
+     */
+    public void profileGenerated(JSONObject obj);
+}
diff --git a/src/provider/TweetListener.java b/src/provider/TweetListener.java
deleted file mode 100644
index 5b1df0e..0000000
--- a/src/provider/TweetListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-    package provider;
-
-import org.json.JSONObject;
-
-/**
- * Callback when a new tweet is received.
- */
-public interface TweetListener {
-
-    /**
-     * This method is called when a new tweet is provided.
-     * 
-     * @param obj A single JSON object.
-     */
-    public void tweetGenerated(JSONObject obj);
-}
-- 
cgit v1.2.1