Changeset 12483 for lang/java/sabotter/trunk/src/jp/xet

Timestamp:

05/27/08 01:41:55 (5 years ago)

Author:

daisuke_m

Message:

フィルタをFilterSetとして整理。

Location:

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

Files:

• SabotterPlugin.java (modified) (5 diffs)
• action/AddTabAction.java (modified) (2 diffs)
• action/FilterSettingAction.java (modified) (5 diffs)
• action/dialog/FilterDialog.java (modified) (7 diffs)
• action/dialog/FilterDialogMemento.java (modified) (2 diffs)
• action/dialog/FilterSet.java (added)
• filters/FilterResolver.java (modified) (1 diff)
• views/SabotterState.java (added)
• views/SabotterTabModel.java (modified) (4 diffs)
• views/SabotterView.java (modified) (14 diffs)

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

@@ -3 +3 @@
 import java.net.URL;
 
+import jp.xet.eclipse.sabotter.filters.FilterResolver;
 import jp.xet.eclipse.sabotter.preferences.SabotterPreference;
 import jp.xet.eclipse.sabotter.preferences.SabotterPreferenceImpl;
@@ -55 +56 @@
         private static SabotterPreference pref;
         
+        private static FilterResolver resolver;
+        
 
         /**
@@ -72 +75 @@
                 plugin = this;
                 pref = new SabotterPreferenceImpl();
+                resolver = new FilterResolver();
         }
         
@@ -81 +85 @@
         @Override
         public void stop(BundleContext context) throws Exception {
+                resolver = null;
                 pref = null;
                 plugin = null;
@@ -102 +107 @@
         public static SabotterPreference getPreference() {
                 return pref;
+        }
+        
+        public static FilterResolver getFilterResolver() {
+                return resolver;
         }
         

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/action/AddTabAction.java

@@ -1 +1 @@
 package jp.xet.eclipse.sabotter.action;
 
-import java.util.Set;
-
+import jp.xet.eclipse.sabotter.action.dialog.FilterSet;
 import jp.xet.eclipse.sabotter.filters.TimeLineFilter;
 import jp.xet.eclipse.sabotter.manager.TableManager;
@@ -153 +152 @@
                                         new SabotterKeyListener(new TableManager(viewer)));
                         
-                        Set<TimeLineFilter> filters = tab.getFilters();
-                        if (filters == null || filters.size() == 0) {
+                        FilterSet filterSet = tab.getFilterSet();
+                        if (filterSet == null) {
                                 viewer.setFilters(new TimeLineFilter[0]);
                         } else {
-                                viewer.setFilters(filters.toArray(new TimeLineFilter[0]));
+                                viewer.setFilters(filterSet.getFilterArray());
                         }
                         TimeLineSorter sorter = tab.getSorter();

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/action/FilterSettingAction.java

@@ -1 +1 @@
 package jp.xet.eclipse.sabotter.action;
 
-import java.util.Set;
-
 import jp.xet.eclipse.sabotter.action.dialog.FilterDialog;
+import jp.xet.eclipse.sabotter.action.dialog.FilterSet;
 import jp.xet.eclipse.sabotter.action.dialog.Memento;
-import jp.xet.eclipse.sabotter.filters.FilterResolver;
-import jp.xet.eclipse.sabotter.filters.TimeLineFilter;
 import jp.xet.eclipse.sabotter.views.SabotterView;
 import org.eclipse.jface.action.Action;
@@ -23 +20 @@
         private SabotterView view;
         
-        private FilterResolver resolver;
-        
 
         /**
@@ -34 +29 @@
         public FilterSettingAction(SabotterView view) {
                 this.view = view;
-                this.resolver = new FilterResolver();
         }
         
@@ -44 +38 @@
         @Override
         public void run() {
-                TimeLineFilter[] filters =
-                                editFilter(view.getCurrentTab().getFilters());
-                
-                view.getCurrentTab().setFilters(filters);
+                FilterSet filters = editFilter(view.getCurrentTab().getFilterSet());
+                view.getCurrentTab().setFilterSet(filters);
         }
         
-        private TimeLineFilter[] editFilter(Set<TimeLineFilter> filters) {
-                FilterDialog dialog = new FilterDialog(null, filters, resolver);
+        private FilterSet editFilter(FilterSet filterSet) {
+                FilterDialog dialog = new FilterDialog(null, filterSet);
                 
                 // 編集前のスナップショットを保存
@@ -60 +52 @@
                 }
                 
-                return dialog.getFilters();
+                return dialog.getFilterSet();
         }
 }

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/action/dialog/FilterDialog.java

@@ -1 +1 @@
 package jp.xet.eclipse.sabotter.action.dialog;
 
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
+import jp.xet.eclipse.sabotter.SabotterPlugin;
 import jp.xet.eclipse.sabotter.filters.FilterResolver;
-import jp.xet.eclipse.sabotter.filters.TimeLineFilter;
-
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.jface.dialogs.Dialog;
@@ -28 +24 @@
 public class FilterDialog extends Dialog {
         
-        public class FilterSet {
-                
-                private Map<String, TimeLineFilter> filterMap =
-                                new HashMap<String, TimeLineFilter>();
-                
-                private Set<String> enabledFilterIds = new HashSet<String>();
-                
-
-                /**
-                 * コンストラクタ。
-                 * @param filters
-                 * @category instance creation
-                 */
-                public FilterSet(Set<TimeLineFilter> filters) {
-                        for (TimeLineFilter filter : filters) {
-                                String filterId = filter.getClass().getName();
-                                filterMap.put(filterId, filter);
-                                enabledFilterIds.add(filterId);
-                        }
-                }
-                
-                /**
-                 * フィルタの有効/無効化を行う。
-                 * 
-                 * @param filterId
-                 * @param enable 
-                 */
-                public void setEnable(String filterId, boolean enable) {
-                        if (enable) {
-                                enabledFilterIds.add(filterId);
-                                if (filterMap.get(filterId) == null) {
-                                        filterMap.put(filterId, resolver
-                                                .getFilterInstance(filterId));
-                                }
-                        } else {
-                                enabledFilterIds.remove(filterId);
-                        }
-                }
-                
-                /**
-                 * フィルタが現在有効かどうかを調べる。
-                 * 
-                 * @param filterId
-                 * @return 有効であれば<code>true</code>
-                 */
-                public boolean isEnable(String filterId) {
-                        return filterMap.keySet().contains(filterId);
-                }
-                
-                /**
-                 * 結果を取得する。
-                 * 
-                 * @return フィルタの配列
-                 */
-                public TimeLineFilter[] getFilters() {
-                        Set<TimeLineFilter> result = new HashSet<TimeLineFilter>();
-                        for (Map.Entry<String, TimeLineFilter> e : filterMap.entrySet()) {
-                                if (enabledFilterIds.contains(e.getKey())) {
-                                        result.add(e.getValue());
-                                }
-                        }
-                        return result.toArray(new TimeLineFilter[0]);
-                }
-                
-                public Map<String, TimeLineFilter> getFilterMap() {
-                        return filterMap;
-                }
-                
-                /**
-                 * @param filterId
-                 * @return
-                 */
-                public TimeLineFilter getFilter(String filterId) {
-                        return filterMap.get(filterId);
-                }
-                
-                /**
-                 * @param filterId
-                 * @param filter
-                 */
-                public void setFilter(String filterId, TimeLineFilter filter) {
-                        filterMap.put(filterId, filter);
-                }
-                
-        }
-        
-
         private FilterSet filterSet;
-        
-        private FilterResolver resolver;
-        
-        private TimeLineFilter[] result;
         
 
@@ -126 +31 @@
          * 
          * @param shell
-         * @param filters
-         * @param resolver 
+         * @param filterSet
          */
-        public FilterDialog(Shell shell, Set<TimeLineFilter> filters,
-                        FilterResolver resolver) {
+        public FilterDialog(Shell shell, FilterSet filterSet) {
                 super(shell);
                 setShellStyle(getShellStyle() | SWT.RESIZE);
-                this.filterSet = new FilterSet(filters);
-                this.resolver = resolver;
+                this.filterSet = filterSet;
         }
         
@@ -146 +48 @@
                 Shell shell = getShell();
                 shell.pack();
-//              shell.setSize(400, shell.getSize().y);
         }
         
@@ -162 +63 @@
                 composite.setLayoutData(new GridData(GridData.FILL_BOTH));
                 
+                final FilterResolver resolver = SabotterPlugin.getFilterResolver();
                 Map<String, IConfigurationElement> factoryMap =
                                 resolver.getFilterFactories();
@@ -207 +109 @@
         }
         
-        /**
-         * Override method.
-         * 
-         * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-         */
-        @Override
-        protected void okPressed() {
-                result = filterSet.getFilters();
-                super.okPressed();
-        }
-        
         public Memento createMemento() {
                 return new FilterDialogMemento(filterSet);
@@ -224 +115 @@
         public void setMemento(Memento memento) {
                 FilterDialogMemento filterMemento = (FilterDialogMemento) memento;
-                result = filterMemento.getFilters();
+                filterSet = filterMemento.getFilters();
         }
         
-        public TimeLineFilter[] getFilters() {
-                return result;
+        public FilterSet getFilterSet() {
+                return filterSet;
         }
         

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/action/dialog/FilterDialogMemento.java

@@ -1 +1 @@
 package jp.xet.eclipse.sabotter.action.dialog;
-
-import jp.xet.eclipse.sabotter.action.dialog.FilterDialog.FilterSet;
-import jp.xet.eclipse.sabotter.filters.TimeLineFilter;
 
 /**
@@ -30 +27 @@
          * @return filters
          */
-        public TimeLineFilter[] getFilters() {
-                return this.filterSet.getFilterMap().values().toArray(
-                                new TimeLineFilter[0]);
+        public FilterSet getFilters() {
+                return filterSet;
         }
 }

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/filters/FilterResolver.java

@@ -74 +74 @@
         
         public String getFilterName(String filterId) {
-                return filterFactories.get(filterId).getAttribute(ATTR_NAME);
+                IConfigurationElement factory = filterFactories.get(filterId);
+                String name = factory.getAttribute(ATTR_NAME);
+                return name;
         }
         
         public boolean hasSettings(String filterId) {
-                return filterFactories.get(filterId).getAttribute(
-                                ATTR_SETTING_DIALOG_CLASS) != null;
+                IConfigurationElement factory = filterFactories.get(filterId);
+                return factory.getAttribute(ATTR_SETTING_DIALOG_CLASS) != null;
         }
         
         public FilterSettingDialog getSettingDialog(String filterId) {
-                IConfigurationElement element = filterFactories.get(filterId);
-                if (element == null) {
+                IConfigurationElement factory = filterFactories.get(filterId);
+                if (factory == null) {
                         return null;
                 }
                 try {
-                        return (FilterSettingDialog) element
+                        return (FilterSettingDialog) factory
                                 .createExecutableExtension(ATTR_SETTING_DIALOG_CLASS);
                 } catch (CoreException e) {

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

@@ -2 +2 @@
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
-
-import jp.xet.eclipse.sabotter.filters.SearchFilter;
-import jp.xet.eclipse.sabotter.filters.TimeLineFilter;
-
+import jp.xet.eclipse.sabotter.action.dialog.FilterSet;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.eclipse.jface.viewers.TableViewer;
@@ -31 +26 @@
         private String tabName;
         
-        private Set<TimeLineFilter> filterSet = new HashSet<TimeLineFilter>();
+        private FilterSet filterSet;
         
         private TimeLineSorter sorter;
@@ -47 +42 @@
         public SabotterTabModel(String tabName) {
                 this.tabName = tabName;
+                // FIXME ここで毎回resolver newが微妙。
+                this.filterSet = new FilterSet();
         }
         
@@ -84 +81 @@
         }
         
-        public SearchFilter getSearchFilter() {
-                SearchFilter result = null;
-                for (TimeLineFilter filter : filterSet) {
-                        if (filter instanceof SearchFilter) {
-                                result = (SearchFilter) filter;
-                                break;
-                        }
-                }
-                return result;
+        public FilterSet getFilterSet() {
+                return filterSet;
         }
         
-        public SearchFilter removeSearchFilter() {
-                SearchFilter toRemove = getSearchFilter();
-                filterSet.remove(toRemove);
-                viewer.setFilters(filterSet.toArray(new TimeLineFilter[0]));
-                return toRemove;
-        }
-        
-        public void addSearchFilter(SearchFilter filter) {
-                if (filter == null) {
-                        return;
-                }
-                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) {
-                SearchFilter sf = getSearchFilter();
-                this.filterSet.clear();
-                if (filters != null) {
-                        for (TimeLineFilter filter : filters) {
-                                this.filterSet.add(filter);
-                        }
-                }
-                this.filterSet.add(sf);
-                viewer.setFilters(this.filterSet.toArray(new TimeLineFilter[0]));
+        public void setFilterSet(FilterSet filters) {
+                this.filterSet = filters;
+                viewer.setFilters(this.filterSet.getFilterArray());
         }
         

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

@@ -2 +2 @@
 
 import java.net.MalformedURLException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -102 +101 @@
         private CTabFolder tabFolder;
         
-        /** 各タブ */
-        private List<SabotterTabModel> tabs = new ArrayList<SabotterTabModel>();
+        private SabotterState state = new SabotterState();
         
         private Label detailImage;
@@ -153 +151 @@
                                 public void run() {
                                         SabotterPlugin.log(org.eclipse.core.runtime.Status.INFO,
-                                                        0, "Sabotter: start to add entries to table"); // $NON-NLS-1$
-                                        for (SabotterTabModel tab : tabs) {
+                                                        0, "Sabotter: start to add " + toAdd.size()
+                                                                        + " entries to table"); // $NON-NLS-1$
+                                        for (SabotterTabModel tab : getTabs()) {
                                                 TableViewer viewer = tab.getViewer();
                                                 viewer.remove(toRemove.toArray(new SabotterEntry[0]));
@@ -203 +202 @@
         public SabotterView() {
                 try {
-                        List<SabotterTabModel> tabs = loadTabState();
-                        if (tabs != null) {
-                                this.tabs = tabs;
+                        SabotterState state = loadTabState();
+                        if (state != null) {
+                                this.state = state;
                         }
                 } catch (Exception e) {
@@ -212 +211 @@
         }
         
-        private List<SabotterTabModel> loadTabState() {
+        private SabotterState loadTabState() {
                 String xml = pref.getTabState();
-                return (List<SabotterTabModel>) new XStream().fromXML(xml);
+                SabotterState result = null;
+                try {
+                        result = (SabotterState) new XStream().fromXML(xml);
+                } catch (Exception ignore) {
+                }
+                return result;
         }
         
@@ -224 +228 @@
          */
         public void saveTabState() {
-                String xml = new XStream().toXML(tabs);
+                String xml = new XStream().toXML(state);
                 pref.setTabState(xml);
         }
@@ -246 +250 @@
                 setDetail((SabotterEntry) selection.getFirstElement());
                 
-                for (SabotterTabModel tab : tabs) {
+                for (SabotterTabModel tab : getTabs()) {
                         TableViewer viewerToRefresh = tab.getViewer();
                         viewerToRefresh.refresh();
@@ -310 +314 @@
                 
                 txtSearch.addKeyListener(new AllTextSelectionAdapter(txtSearch));
-                // TODO refactor ダッサいなぁ。。
-                // ホントはSearchFilterだけは保存しない方がいいので、復帰の必要もないのだが。。
-                // 保存しちゃったからには復帰させなきゃ、ということで、こんな逃げコード。
-                if (tabs.size() != 0 && tabs.get(0).getSearchFilter() != null) {
-                        txtSearch
-                                .setText(tabs.get(0).getSearchFilter().getPatternString());
-                }
                 txtSearch.addKeyListener(new FocusOnSpaceKeyListener(this, txtSearch));
                 txtSearch.addKeyListener(new KeyAdapter() {
@@ -330 +327 @@
                                                 newSearchFilter.setPatternString(txtSearch.getText());
                                         }
-                                        for (SabotterTabModel tab : tabs) {
-                                                tab.removeSearchFilter();
-                                                tab.addSearchFilter(newSearchFilter);
+                                        for (SabotterTabModel tab : getTabs()) {
+                                                tab.getFilterSet().removeSearchFilter();
+                                                tab.getFilterSet().setSearchFilter(newSearchFilter);
                                         }
                                 }
@@ -367 +364 @@
                                 (AddTabAction) actions.get(AddTabAction.ACTION_ID);
                 
-                if (tabs.isEmpty()) {
+                if (getTabs().isEmpty()) {
                         SabotterTabModel tab = new SabotterTabModel(Messages.tab_timeline);
                         action.registerTab(tab);
                         getTabs().add(tab);
                 } else {
-                        for (SabotterTabModel tab : tabs) {
+                        for (SabotterTabModel tab : getTabs()) {
                                 action.registerTab(tab);
                         }
@@ -465 +462 @@
                                 new ReloadTimeLineAction(new SabotterListener());
                 reloadTimeLineAction.setText(Messages.action_reload_time_line);
-                reloadTimeLineAction
-                        .setToolTipText(Messages.tooltip_reload_time_line);
+                reloadTimeLineAction.setToolTipText(Messages.tooltip_reload_time_line);
                 reloadTimeLineAction.setImageDescriptor(imageRegistry
                         .getDescriptor(Images.BUTTON_REFRESH));
@@ -607 +603 @@
                 int index = tabFolder.getSelectionIndex();
                 if (index >= 0) {
-                        tabs.get(index).getViewer().getControl().setFocus();
+                        getTabs().get(index).getViewer().getControl().setFocus();
                 }
         }
@@ -617 +613 @@
          */
         public SabotterTabModel getCurrentTab() {
-                return tabs.get(getCurrentTabIndex());
+                return getTabs().get(getCurrentTabIndex());
         }
         
@@ -644 +640 @@
          */
         public List<SabotterTabModel> getTabs() {
-                return tabs;
+                return state.getTabs();
         }