Changeset 11897 for lang/java/sabotter

Timestamp:

05/18/08 18:03:03 (5 years ago)

Author:

daisuke_m

Message:

comment / refactor

Location:

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter

Files:

• TODO.java (modified) (1 diff)
• views/SabotterTabModel.java (modified) (4 diffs)

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/TODO.java

@@ -22 +22 @@
         
         // TODO ショートカットを、preferenceで変更できるように。
+        
+        // TODO FilterSetという考え方を統一して扱うように。
+        // 現在 Set<TimeLineFilter> と FilterSet がどちらもfiltersetと呼ばれてる。
+        // 混乱の元だね。
 }

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/views/SabotterTabModel.java

@@ -31 +31 @@
         private String tabName;
         
-        private Set<TimeLineFilter> filters = new HashSet<TimeLineFilter>();
+        private Set<TimeLineFilter> filterSet = new HashSet<TimeLineFilter>();
         
         private TimeLineSorter sorter;
@@ -84 +84 @@
         }
         
-        public Set<TimeLineFilter> getFilters() {
-                if (filters == null) {
-                        filters = new HashSet<TimeLineFilter>();
-                }
-                return filters;
-        }
-        
         public SearchFilter getSearchFilter() {
                 SearchFilter result = null;
-                for (TimeLineFilter filter : filters) {
+                for (TimeLineFilter filter : filterSet) {
                         if (filter instanceof SearchFilter) {
                                 result = (SearchFilter) filter;
@@ -102 +95 @@
         }
         
-        public void removeSearchFilter() {
+        public SearchFilter removeSearchFilter() {
                 SearchFilter toRemove = getSearchFilter();
-                if (toRemove != null) {
-                        filters.remove(toRemove);
-                }
-                viewer.setFilters(filters.toArray(new TimeLineFilter[0]));
+                filterSet.remove(toRemove);
+                viewer.setFilters(filterSet.toArray(new TimeLineFilter[0]));
+                return toRemove;
         }
         
@@ -114 +106 @@
                         return;
                 }
-                filters.add(filter);
-                viewer.setFilters(filters.toArray(new TimeLineFilter[0]));
+                filterSet.add(filter);
+                viewer.setFilters(filterSet.toArray(new TimeLineFilter[0]));
+        }
+        
+        public Set<TimeLineFilter> getFilters() {
+                if (filterSet == null) {
+                        filterSet = new HashSet<TimeLineFilter>();
+                }
+                Set<TimeLineFilter> result = new HashSet<TimeLineFilter>(filterSet);
+                result.remove(getSearchFilter());
+                return result;
         }
         
         public void setFilters(TimeLineFilter[] filters) {
-                this.filters.clear();
+                SearchFilter sf = getSearchFilter();
+                this.filterSet.clear();
                 if (filters != null) {
                         for (TimeLineFilter filter : filters) {
-                                this.filters.add(filter);
+                                this.filterSet.add(filter);
                         }
                 }
-                viewer.setFilters(filters);
+                this.filterSet.add(sf);
+                viewer.setFilters(this.filterSet.toArray(new TimeLineFilter[0]));
         }