Changeset 11405

Timestamp:

05/11/08 22:25:07 (5 years ago)

Author:

daisuke_m

Message:

まだ上手く行かないが、ステート保存の枠組みはこんな感じになるのかな、と...。

Location:

lang/java/sabotter/trunk

Files:

• .classpath (modified) (1 diff)
• META-INF/MANIFEST.MF (modified) (1 diff)
• build.properties (modified) (1 diff)
• lib/commons-lang-2.4.jar (added)
• lib/sources/commons-lang-2.4-sources.jar (added)
• lib/xpp3_min-1.1.4c.jar (added)
• lib/xstream-1.3.jar (added)
• src/jp/xet/eclipse/sabotter/action/AddTabAction.java (modified) (7 diffs)
• src/jp/xet/eclipse/sabotter/preferences/SabotterPreference.java (modified) (2 diffs)
• src/jp/xet/eclipse/sabotter/preferences/SabotterPreferenceImpl.java (modified) (1 diff)
• src/jp/xet/eclipse/sabotter/views/ColumnSizeListener.java (modified) (2 diffs)
• src/jp/xet/eclipse/sabotter/views/SabotterTabModel.java (modified) (3 diffs)
• src/jp/xet/eclipse/sabotter/views/SabotterView.java (modified) (3 diffs)

lang/java/sabotter/trunk/.classpath

@@ -14 +14 @@
         <classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
         <classpathentry kind="lib" path="lib/commons-logging-1.0.3.jar"/>
+        <classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
+        <classpathentry kind="lib" path="lib/xstream-1.3.jar"/>
+        <classpathentry kind="lib" path="lib/commons-lang-2.4.jar" sourcepath="lib/sources/commons-lang-2.4-sources.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

lang/java/sabotter/trunk/META-INF/MANIFEST.MF

@@ -19 +19 @@
  lib/commons-codec-1.2.jar,
  lib/commons-httpclient-3.0.1.jar,
- lib/commons-logging-1.0.3.jar
+ lib/commons-logging-1.0.3.jar,
+ lib/xpp3_min-1.1.4c.jar,
+ lib/xstream-1.3.jar,
+ lib/commons-lang-2.4.jar
 Export-Package: jp.xet.eclipse.sabotter,
  jp.xet.eclipse.sabotter.action,

lang/java/sabotter/trunk/build.properties

@@ -17 +17 @@
                LICENSE.txt,\
                plugin.properties,\
-               plugin_ja.properties
+               plugin_ja.properties,\
+               lib/xpp3_min-1.1.4c.jar,\
+               lib/xstream-1.3.jar,\
+               lib/commons-lang-2.4.jar
 src.includes = .classpath,\
                .project,\

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

@@ -1 +1 @@
 package jp.xet.eclipse.sabotter.action;
 
+import jp.xet.eclipse.sabotter.filters.TimeLineFilter;
 import jp.xet.eclipse.sabotter.manager.TableManager;
 import jp.xet.eclipse.sabotter.manager.TwitterManager;
@@ -9 +10 @@
 import jp.xet.eclipse.sabotter.views.SabotterTabModel;
 import jp.xet.eclipse.sabotter.views.SabotterView;
+import jp.xet.eclipse.sabotter.views.TimeLineSorter;
+
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.IInputValidator;
@@ -25 +28 @@
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Table;
@@ -136 +137 @@
                         viewer.getTable().addKeyListener(
                                         new SabotterKeyListener(new TableManager(viewer)));
-                        viewer.getTable().addTraverseListener(new TraverseListener() {
-                                
-                                public void keyTraversed(TraverseEvent e) {
-                                        // TODO Auto-generated method stub
-                                        System.out.println("TraverseEvent: " + e);
-                                        
-                                }
-                                
-                        });
+                        
+                        TimeLineFilter[] filters = tab.getFilters();
+                        if (filters != null) {
+                                viewer.setFilters(filters);
+                        }
+                        TimeLineSorter sorter = tab.getSorter();
+                        if (sorter != null) {
+                                viewer.setSorter(sorter);
+                        }
                         
                         tab.getTabItem().setControl(viewer.getTable());
@@ -165 +166 @@
          * @param tab
          */
-        public static void initTable(SabotterTabModel tab) {
+        public void initTable(SabotterTabModel tab) {
                 Table table = tab.getViewer().getTable();
                 TableLayout layout = new TableLayout();
@@ -174 +175 @@
                 
                 ColumnLayoutData[] columnLayouts =
-                                getColumnLayouts(DEFAULT_COLUMN_LAYOUTS);
+                                getColumnLayouts(tab, DEFAULT_COLUMN_LAYOUTS);
                 
                 for (int i = 0; i < columnLayouts.length; i++) {
@@ -183 +184 @@
                 name.setText(Messages.col_name);
                 name.addSelectionListener(new ColumnHeaderSelectionListener(tab));
-                name.addControlListener(new ColumnSizeListener());
+                name.addControlListener(new ColumnSizeListener(view));
                 
                 TableColumn message = new TableColumn(table, SWT.NULL);
                 message.setText(Messages.col_message);
                 message.addSelectionListener(new ColumnHeaderSelectionListener(tab));
-                message.addControlListener(new ColumnSizeListener());
+                message.addControlListener(new ColumnSizeListener(view));
                 
                 TableColumn time = new TableColumn(table, SWT.NULL);
                 time.setText(Messages.col_time);
                 time.addSelectionListener(new ColumnHeaderSelectionListener(tab));
-                time.addControlListener(new ColumnSizeListener());
-        }
-        
-        private static ColumnLayoutData[] getColumnLayouts(ColumnPixelData[] data) {
+                time.addControlListener(new ColumnSizeListener(view));
+        }
+        
+        private static ColumnLayoutData[] getColumnLayouts(SabotterTabModel tab,
+                        ColumnPixelData[] data) {
                 ColumnPixelData[] result = new ColumnPixelData[data.length];
                 for (int i = 0; i < data.length; i++) {
                         int width = data[i].width;
+                        // FIXME ないわー。なさすぎる。どんな実装だこれ。仮実装にしたって無いだろこれw やばいって俺w
+                        int tmpWidth = 0;
+                        switch (i) {
+                                case 0:
+                                        tmpWidth = tab.getColumnSize(Messages.col_name);
+                                        break;
+                                case 1:
+                                        tmpWidth = tab.getColumnSize(Messages.col_message);
+                                        break;
+                                case 2:
+                                        tmpWidth = tab.getColumnSize(Messages.col_time);
+                                        break;
+                                default:
+                        }
+                        if (tmpWidth != 0) {
+                                width = tmpWidth;
+                        }
                         result[i] = new ColumnPixelData(width);
                 }

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/preferences/SabotterPreference.java

@@ -6 +6 @@
 
 /**
- * 設定の読み出しクラス。
+ * 設定の読み出しinterface。
  * 
  * @author daisuke
@@ -153 +153 @@
         Color getUnreadStatusBackgroundColor();
         
+        void setTabState(String xml);
+        
+        String getTabState();
+        
 }

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/preferences/SabotterPreferenceImpl.java

@@ -242 +242 @@
         }
         
+        public void setTabState(String xml) {
+                ps.setValue("TAB_STATE", xml);
+        }
+        
+        public String getTabState() {
+                return ps.getString("TAB_STATE");
+        }
+        
 }

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

@@ -12 +12 @@
 public class ColumnSizeListener extends ControlAdapter {
         
+        private SabotterView view;
+        
+
+        /**
+         * コンストラクタ。
+         * 
+         * @param view
+         */
+        public ColumnSizeListener(SabotterView view) {
+                this.view = view;
+                
+        }
+        
         /**
          * Override.
@@ -21 +34 @@
                 TableColumn column = (TableColumn) e.widget;
                 int width = column.getWidth();
-                System.out.println("controlResized:" + e + " - " + width); // TODO
+                // FIXME Textをキーにしてるのがイケてない。
+                view.getCurrentTab().setColumnSize(column.getText(), width);
         }
         

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

@@ -1 +1 @@
 package jp.xet.eclipse.sabotter.views;
+
+import java.util.HashMap;
+import java.util.Map;
 
 import jp.xet.eclipse.sabotter.filters.TimeLineFilter;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.custom.CTabItem;
@@ -27 +31 @@
         
         private TimeLineSorter sorter;
+        
+        private Map<String, Integer> columnSizes = new HashMap<String, Integer>();
         
 
@@ -92 +98 @@
         }
         
+        public int getColumnSize(String key) {
+                Integer size = getColumnSizes().get(key);
+                return size == null ? 0 : size;
+        }
+        
+        public void setColumnSize(String key, int columnSize) {
+                getColumnSizes().put(key, columnSize);
+        }
+        
+        public Map<String, Integer> getColumnSizes() {
+                if (columnSizes == null) {
+                        columnSizes = new HashMap<String, Integer>();
+                }
+                return columnSizes;
+        }
+        
+        @Override
+        public String toString() {
+                return ToStringBuilder.reflectionToString(this);
+        }
 }

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

@@ -73 +73 @@
 import org.eclipse.ui.part.ViewPart;
 
+import com.thoughtworks.xstream.XStream;
+
 /**
  * さぼったービュー（一番メインとなっているクラス）
@@ -226 +228 @@
          */
         public SabotterView() {
-                // TODO ステート読み出し
+                try {
+                        List<SabotterTabModel> tabs = loadTabState();
+                        if (tabs != null) {
+                                this.tabs = tabs;
+                        }
+                } catch (Exception e) {
+                        SabotterPlugin.handleException(e, SabotterPlugin.LOG);
+                }
         }
         
@@ -236 +245 @@
         @Override
         public void dispose() {
-                // TODO ステート保存
+                // FIXME このようにしたい。が、この時点で全てのtabはdispose済み、tabs.size() == 0 であるorz
+                saveTabState();
                 super.dispose();
+        }
+        
+        private List<SabotterTabModel> loadTabState() {
+                String xml = pref.getTabState();
+                System.out.println("====load start========");
+                System.out.println(xml);
+                System.out.println("====load end==========");
+                XStream xstream = new XStream();
+                return (List<SabotterTabModel>) xstream.fromXML(xml);
+        }
+        
+        private void saveTabState() {
+                XStream xstream = new XStream();
+                String xml = xstream.toXML(tabs);
+                System.out.println("====save start========");
+                System.out.println(xml);
+                System.out.println("====save end==========");
+                pref.setTabState(xml);
         }