Changeset 14825

Timestamp:

06/29/08 13:06:18 (5 years ago)

Author:

daisuke_m

Message:

スペースキーによる未読読み進め機能を修正。

Location:

lang/java/sabotter/trunk

Files:

• icons/sabotter_16.gif (added)
• plugin.xml (modified) (1 diff)
• src/jp/xet/eclipse/sabotter/manager/TableManager.java (modified) (1 diff)
• src/jp/xet/eclipse/sabotter/manager/TwitterManager.java (modified) (4 diffs)

lang/java/sabotter/trunk/plugin.xml

@@ -30 +30 @@
       <view
             name="%SabotterView.name"
-            icon="icons/sample.gif"
+            icon="icons/sabotter_16.gif"
             category="jp.xet.eclipse.sabotter"
             class="jp.xet.eclipse.sabotter.views.SabotterView"

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/manager/TableManager.java

@@ -41 +41 @@
          */
         public void oldestUnreadEntry() {
-                SabotterEntry oldestUnreadEntry = TwitterManager.getInstance().getOldestUnreadEntry();
+                SabotterEntry oldestUnreadEntry = TwitterManager.getInstance().getOldestUnreadEntry(viewer);
                 if (oldestUnreadEntry != null) {
                         ISelection sel = new StructuredSelection(oldestUnreadEntry);

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/manager/TwitterManager.java

@@ -1 +1 @@
 package jp.xet.eclipse.sabotter.manager;
 
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
@@ -22 +24 @@
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.ViewerFilter;
 
 /**
@@ -168 +172 @@
         /**
          * 一番古い未読ステータスを取得する。未読が一件もなければ最新のエントリを返す。
+         * @param viewer 
          * 
          * @return 一番古い未読ステータス
          */
-        public SabotterEntry getOldestUnreadEntry() {
-                for (SabotterEntry entry : allEntries) {
+        public SabotterEntry getOldestUnreadEntry(TableViewer viewer) {
+                for (SabotterEntry entry : doFilter(viewer)) {
                         if (entry.isUnread()) {
                                 return entry;
@@ -178 +183 @@
                 }
                 return allEntries.last();
+        }
+        
+        private List<SabotterEntry> doFilter(TableViewer viewer) {
+                List<SabotterEntry> result = new ArrayList<SabotterEntry>();
+                for (SabotterEntry entry : allEntries) {
+                        boolean match = true;
+                        for (ViewerFilter filter : viewer.getFilters()) {
+                                if (filter.select(viewer, null, entry) == false) {
+                                        match = false;
+                                }
+                        }
+                        if (match) {
+                                result.add(entry);
+                        }
+                }
+                return result;
         }