TweetSearchStreaming内に、重複した余計なコードが存在したため削除

[nt-manager/nt-manager.git] / src / twitter / manage / TweetSearchStream.java

diff --git a/src/twitter/manage/TweetSearchStream.java b/src/twitter/manage/TweetSearchStream.java
index 1e3309e..1a4286c 100644 (file)
--- a/src/twitter/manage/TweetSearchStream.java
+++ b/src/twitter/manage/TweetSearchStream.java
@@ -31,8 +31,6 @@ public class TweetSearchStream extends StatusAdapter implements Runnable{
        private TwitterStream twitterStream = null;\r
        //Filter query\r
        private FilterQuery filter = null;\r
-       //登録されている検索ワード\r
-       private Set<String> filterWords = null;\r
        //status stream\r
        private StatusStream statusStream = null;\r
        //Thread\r
@@ -41,8 +39,12 @@ public class TweetSearchStream extends StatusAdapter implements Runnable{
        private TweetManager tweetManager = null;\r
        //検索ワードに対応したリスナー\r
        private Map<String, TweetStreamingListener> listeners = null;\r
+       //指定したユーザに対応したリスナー\r
+       private Map<Long, TweetStreamingListener> userListener = null;\r
        //指定したワードの最終更新id\r
        private Map<String, Long> lastUpdate = null;\r
+       //指定したユーザの最終更新id\r
+       private Map<Long, Long> userLastUpdate = null;\r
 \r
        /**\r
         *\r
@@ -58,9 +60,10 @@ public class TweetSearchStream extends StatusAdapter implements Runnable{
                this.twitterStream.setOAuthAccessToken(ac);\r
 \r
                filter = new FilterQuery();\r
-               filterWords = new HashSet<String>();\r
                listeners = new HashMap<String, TweetStreamingListener>();\r
+               userListener = new HashMap<Long, TweetStreamingListener>();\r
                lastUpdate = new HashMap<String, Long>();\r
+               userLastUpdate = new HashMap<Long, Long>();\r
        }\r
 \r
        /**\r
@@ -68,7 +71,6 @@ public class TweetSearchStream extends StatusAdapter implements Runnable{
         * @param word\r
         */\r
        public void addSearchWord(String word, TweetStreamingListener listener) {\r
-               filterWords.add(word);\r
                listeners.put(word, listener);\r
                updateFilter();\r
        }\r
@@ -78,16 +80,19 @@ public class TweetSearchStream extends StatusAdapter implements Runnable{
         * @param word\r
         */\r
        public void removeSearchWord(String word) {\r
-               filterWords.remove(word);\r
                listeners.remove(word);\r
                updateFilter();\r
        }\r
 \r
+       public void addUserSearch(Long userid, TweetStreamingListener listener) {\r
+\r
+       }\r
+\r
        /**\r
         * filterの更新\r
         */\r
        private void updateFilter() {\r
-               String[] words = filterWords.toArray(new String[0]);\r
+               String[] words = listeners.keySet().toArray(new String[0]);\r
                filter.track(words);\r
                try {\r
                        if( statusStream != null ) {\r