1 files changed, 23 insertions, 23 deletions

diff --git a/src/main/Main.java b/src/main/Main.java
index 059ade6..913646e 100644
--- a/src/main/Main.java
+++ b/src/main/Main.java
@@ -2,14 +2,14 @@ package main;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import io.RateLimitException;
 import io.Response;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Scanner;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import mining.TwitterApi;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 /**
  * Class for manually testing the Twitter API.
@@ -116,16 +116,20 @@ public class Main {
         "Available commands:"
     };
 
-    private void searchTweets(String q) throws IOException, JSONException {
-        TwitterApi.Builder req = getApi().build("search/tweets");
-        req.param("q", q);
-        req.param("count", "100"); // max number of tweets, cannot be higher
-        req.param("lang", "en");
-        Response resp = req.request();
-        JsonArray statuses = resp.getResp().getAsJsonObject().get("statuses").getAsJsonArray();
-        for (int i = 0; i < statuses.size(); i++) {
-            JsonObject tweet = statuses.get(i).getAsJsonObject();
-            System.out.println(tweet);
+    private void searchTweets(String q) throws IOException {
+        try {
+            TwitterApi.Builder req = getApi().build("search/tweets");
+            req.param("q", q);
+            req.param("count", "100"); // max number of tweets, cannot be higher
+            req.param("lang", "en");
+            Response resp = req.request();
+            JsonArray statuses = resp.getResp().getAsJsonObject().get("statuses").getAsJsonArray();
+            for (int i = 0; i < statuses.size(); i++) {
+                JsonObject tweet = statuses.get(i).getAsJsonObject();
+                System.out.println(tweet);
+            }
+        } catch (RateLimitException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
 
@@ -142,11 +146,7 @@ public class Main {
                 req.param("id", getParam(0, "numerical ID of tweet"));
                 break;
             case searchtweets:
-                try {
-                    searchTweets(getParam(0, "search query"));
-                } catch (JSONException ex) {
-                    throw new IOException(ex);
-                }
+                searchTweets(getParam(0, "search query"));
                 /* no req, will be handled by search */
                 break;
             case hack:
@@ -186,12 +186,12 @@ public class Main {
                 throw new AssertionError(command.name());
         }
         if (req != null) {
-            System.err.println("Executing: " + req.toString());
-            Response result = req.request();
-            if (rawOutput) {
-                System.out.println(result.getResp().toString());
-            } else {
+            try {
+                System.err.println("Executing: " + req.toString());
+                Response result = req.request();
                 System.out.println(result.getResp().toString());
+            } catch (RateLimitException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
     }