1 files changed, 14 insertions, 13 deletions

diff --git a/src/main/TweetShell.java b/src/main/TweetShell.java
index a86bad3..956f060 100644
--- a/src/main/TweetShell.java
+++ b/src/main/TweetShell.java
@@ -1,11 +1,13 @@
 package main;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 import io.CompressableDataWriter;
 import io.DataWriter;
 import io.OAuthRequester;
+import io.SearchImpl;
 import io.StreamImpl;
 import java.io.Closeable;
-import java.io.Flushable;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -15,13 +17,11 @@ import java.util.NoSuchElementException;
 import java.util.Scanner;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.logging.Level;
 import java.util.logging.Logger;
+import mining.Search;
 import mining.Stream;
 import mining.TwitterApi;
 import org.apache.commons.io.IOUtils;
-import org.json.JSONException;
-import org.json.JSONObject;
 import provider.CompositeResultListener;
 import provider.ExceptionListener;
 import provider.ResultListener;
@@ -91,20 +91,21 @@ public class TweetShell implements TwitterApi.PinSupplier {
     private class StreamHandler implements ResultListener {
 
         @Override
-        public void tweetGenerated(JSONObject obj) {
+        public void tweetGenerated(JsonObject obj) {
             try {
-                JSONObject userObj = obj.getJSONObject("user");
+                JsonObject userObj = obj.getAsJsonObject("user");
+
                 System.out.println("Got tweet: "
-                        + userObj.getString("screen_name") + ": "
-                        + obj.getString("text"));
-            } catch (JSONException ex) {
-                getLogger().log(Level.SEVERE, "Failed to parse tweet", ex);
+                        + userObj.get("screen_name").getAsString() + ": "
+                        + obj.get("text").getAsString());
+            } catch (JsonParseException ex) {
+                System.err.println("failed to parse tweet " + ex);
             }
         }
+    }
 
-        private Logger getLogger() {
-            return Logger.getLogger(getClass().getName());
-        }
+    private Logger getLogger() {
+        return Logger.getLogger(getClass().getName());
     }
 
     @Override