Changeset 34415

Timestamp:

07/13/09 20:30:25 (4 years ago)

Author:

hoge1e3

Message:

文書の変更にリストが同期

Location:

lang/csharp/soyText/soyText

Files:

• DThread.cs (modified) (2 diffs)
• Debug.cs (modified) (1 diff)
• DocumentSet.cs (modified) (3 diffs)
• EditorTab.cs (modified) (12 diffs)
• ExecForm.Designer.cs (modified) (1 diff)
• ExecForm.cs (modified) (1 diff)
• Form2.Designer.cs (modified) (4 diffs)
• Form2.cs (modified) (4 diffs)
• ImportDialog.cs (modified) (1 diff)
• ListSyncer.cs (modified) (2 diffs)
• Program.cs (modified) (1 diff)
• TerminableThread.cs (modified) (2 diffs)
• bin/Debug/soyText.application (modified) (1 diff)
• bin/Debug/soyText.exe (modified) (previous)
• bin/Debug/soyText.exe.manifest (modified) (2 diffs)
• bin/Debug/soyText.pdb (modified) (previous)
• bin/Debug/soyText.vshost.application (modified) (1 diff)
• soyText.suo (modified) (previous)

lang/csharp/soyText/soyText/DThread.cs

@@ -10 +10 @@
     {
         Thread th;
-        public DThread(string name,ThreadStart t)
+        /*public DThread(string name,ThreadStart t)
         {
             th = new Thread(delegate() {
@@ -16 +16 @@
             });
             th.Name = name;
-        }
+        }*/
         public void Start()
         {

lang/csharp/soyText/soyText/Debug.cs

@@ -41 +41 @@
         public static void syslog(string msg)
         {
-            if (syslogF == null)
+            /*if (syslogF == null)
             {
                 syslogF = Mkdir.openStream("sys.log", true);
-            }
-            
+            }*/
+            System.Diagnostics.Debug.Print(msg);
         }
     }

lang/csharp/soyText/soyText/DocumentSet.cs

@@ -13 +13 @@
     public class DocumentSet
     {
+        internal ListSyncerSet listSyncerSet = new ListSyncerSet();
         internal SearchLogSet searchLogSet;
         public int maxHandle = -1;
@@ -62 +63 @@
             return (d == 0 ? 0 : (d < 0 ? 1 : -1));
         }
+        static int count = 0;
         public DocumentList getRecents()
         {
+            Debug.syslog("Getrecent called " + (++count) + "times");
             if (cache != null) return cache.getRecents();
             Debug.print("文書一覧取得中...");
@@ -171 +174 @@
             if (cache == null) return;
             cache.update(document);
+            listSyncerSet.notifyAll(document);
         }
     }

lang/csharp/soyText/soyText/EditorTab.cs

@@ -18 +18 @@
         public Workspace workspace;
         public Form2 parentForm;
-        public static EditorTab active;
+        public static EditorTab active=null;
         Document _curDoc;
         public Document curDoc
@@ -32 +32 @@
         public void onLoad(object sender, EventArgs e)
         {
-            if (searchOnLoad) initList();
-            ActiveControl = command;
-        }
-        public void initList()
-        {
-            if (listInited) return;
-            documentSet.getRecents();
+            /*if (searchOnLoad) initList();
+            ActiveControl = command;*/
+        }
+        public void reload()
+        {
+            if (!listInited)
+            {
+                listInited = true;
+                documentSet.getRecents();
+            }
             if (condition != "")
             {
@@ -48 +51 @@
                 refreshList(null);
             }
-            listInited = true;
         }
         /*public String statusText
@@ -59 +61 @@
         bool searchOnLoad;
         bool listInited = false;
-
+        ListSyncer listSyncer;
         public EditorTab(Form2 parent,string condition, bool searchOnLoad)
         {
@@ -74 +76 @@
             inst++;
             defaultInstance = this;
+            listSyncer = documentSet.listSyncerSet.add(docListBox, condition);
         }
 
@@ -95 +98 @@
         public void refreshList()
         {
+            /*if (searchThread.running)
+            {
+                Debug.syslog("Already running.... stop");
+                    
+                return;
+            }*/
             refreshList(condition);
         }
@@ -104 +113 @@
         }
         static bool firstTab=true;
+        
         public void refreshList(string kw)
         {
@@ -120 +130 @@
             }
             condition = newCond;
+            listSyncer.condExpr=condition;
             if (titleChanged != null) titleChanged(kw);
             if (documentSearcher != null) documentSearcher.terminate();
-            /*Document searchLog=null;
-            if (kw != null && kw != "")
-            {
-                searchLog = documentSet.searchLogSet.addOrGet(kw);
-                searchLog.parsed["closed"] = "false";
-                searchLog.save();
-            }*/
+           
             var ft = firstTab;
             firstTab = false;
             searchThread.exec(delegate(TerminableThread t)
             {
+                Debug.syslog("Start search kw="+kw);
                 var cnt = 0;
-                syncUI(delegate()
+                /*syncUI(delegate()
                 {
                     docListBox.Items.Clear();
-                });
+                });*/
+                listSyncer.openSyncSession();
                 documentSearcher = documentSet.createDocumentSearcher(kw,true);
                                                
                 foreach (var d2 in documentSearcher.search()) 
-                //delegate(Document d)
                 {
                     var d = d2;
@@ -148 +154 @@
                         if (documentSet.searchLogSet.add(d))
                         {
-                            //Debug.alert(d.parsed["condition"] + " - " + d.parsed["closed"]+" - "+(d.parsed["closed"] != "false"));
+                            Debug.syslog("newtab - " + d.parsed["condition"]+" ft = "+ft+"  closed ="+d.parsed["closed"]);
                             if (ft && d.parsed["closed"] != "true")
                             {
+
                                     syncUI(delegate()
                                     {
@@ -160 +167 @@
                         {
                             cnt++;
-                            syncUI(delegate() { docListBox.Items.Add(d); });
+                            listSyncer.add(d);
+                            //syncUI(delegate() { docListBox.Items.Add(d); });
                         } 
-                        //return FoundHandlerAction.Accept;
                     }
                     else
                     {
                         break;
-                        //return FoundHandlerAction.End;
                     }
-                }//);
-                //documentSearcher.search2();
+                }
+                listSyncer.closeSyncSession();
                 Debug.print("完了");
             });
         }
-/*        public void syncUI(SyncUIAction u)
-        {
-            uiActionQueue.Enqueue(u);
-        }*/
         public void newDocument()
         {
@@ -383 +385 @@
         internal void activate()
         {
+            if (active == this) return;
             active = this;
+
+            //if (searchOnLoad) 
+            reload();
+            ActiveControl = command;
+            //refreshList();
         }
 
@@ -390 +398 @@
             if (curDoc == null) newDocument();
         }
+
     }
 }

lang/csharp/soyText/soyText/ExecForm.Designer.cs

@@ -88 +88 @@
             this.lowerTable.RowCount = 1;
             this.lowerTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.lowerTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 107F));
+            this.lowerTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 187F));
             this.lowerTable.Size = new System.Drawing.Size(413, 187);
             this.lowerTable.TabIndex = 2;

lang/csharp/soyText/soyText/ExecForm.cs

@@ -21 +21 @@
         internal void exec(Document document)
         {
-            new DThread("Exec "+document.fileName,delegate()
+            new Thread(/*"Exec "+document.fileName,*/delegate()
             {
                 var d = new DocExecutor(document, null, delegate(string o)

lang/csharp/soyText/soyText/Form2.Designer.cs

@@ -46 +46 @@
             this.実行RToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.外部プログラムを実行RToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.tESTToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.tabMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.閉じるCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tabControl1 = new SoyText.TabControl2();
-            this.tESTToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.tabMenu.SuspendLayout();
@@ -178 +178 @@
             this.外部プログラムを実行RToolStripMenuItem.Click += new System.EventHandler(this.外部プログラムを実行RToolStripMenuItem_Click);
             // 
+            // tESTToolStripMenuItem
+            // 
+            this.tESTToolStripMenuItem.Name = "tESTToolStripMenuItem";
+            this.tESTToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
+            this.tESTToolStripMenuItem.Text = "TEST";
+            this.tESTToolStripMenuItem.Click += new System.EventHandler(this.tESTToolStripMenuItem_Click);
+            // 
             // timer1
             // 
@@ -209 +216 @@
             this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
             // 
-            // tESTToolStripMenuItem
-            // 
-            this.tESTToolStripMenuItem.Name = "tESTToolStripMenuItem";
-            this.tESTToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
-            this.tESTToolStripMenuItem.Text = "TEST";
-            this.tESTToolStripMenuItem.Click += new System.EventHandler(this.tESTToolStripMenuItem_Click);
-            // 
             // Form2
             // 
@@ -227 +227 @@
             this.Text = "Form2";
             this.ResizeBegin += new System.EventHandler(this.Form2_ResizeBegin);
+            this.Activated += new System.EventHandler(this.Form2_Activated);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form2_FormClosed);
             this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Form2_MouseDown);

lang/csharp/soyText/soyText/Form2.cs

@@ -128 +128 @@
                 curTab.activate();
                 Text = curTab.Text;
-                curTab.initList();
+                //curTab.initList();
             }
         }
@@ -167 +167 @@
         private void Form2_ResizeBegin(object sender, EventArgs e)
         {
+            if (curTab == null) return;
             curTab.ResizeBegin(sender, e);
         }
@@ -172 +173 @@
         private void Form2_ResizeEnd(object sender, EventArgs e)
         {
+            if (curTab == null) return;
             curTab.ResizeEnd(sender, e);
         }
@@ -216 +218 @@
         }
 
+        private void Form2_Activated(object sender, EventArgs e)
+        {
+            if (curTab!=null) curTab.activate();
+        }
+
     }
 }

lang/csharp/soyText/soyText/ImportDialog.cs

@@ -28 +28 @@
         {
             var i = new DocumentImporter(path.Text,workspace.documentSet);
-            new DThread("imp",delegate()
+            new Thread(delegate()
             {
                 i.traverse();

lang/csharp/soyText/soyText/ListSyncer.cs

@@ -10 +10 @@
     {
         static HashSet<ListSyncer> s=new HashSet<ListSyncer>();
-        static ListSyncer add(ListBox list, SearchCondition cond)
+        public ListSyncer add(ListBox list, string cond)
         {
             var res = new ListSyncer(list, cond);
@@ -16 +16 @@
             return res;
         }
+        public void remove(ListSyncer listsyncer)
+        {
+            s.Remove(listsyncer);
+        }
+
+        internal void notifyAll(Document document)
+        {
+           /* foreach (var sy in s)
+            {
+                sy.update(document);
+            }*/
+        }
     }
     internal class ListSyncer
     {
         ListBox list;
+        string _condExpr;
+        public string condExpr
+        {
+            set
+            {
+                if (_condExpr == value) return;
+                _condExpr = value;
+                cond = SearchCondition.fromExpression(value);
+                list.Items.Clear();
+            }
+        }
         SearchCondition cond;
-        public ListSyncer(ListBox list, SearchCondition cond)
+        public ListSyncer(ListBox list, string condExpr)
         {
             this.list = list;
-            this.cond = cond;
+            this.condExpr = condExpr;
         }
-        public bool add(Document d) {
+        
+        public bool update(Document d)
+        {
+            if (list.Items.Contains(d)) return removeUnlessMatch(d);
+            else return addIfMatch(d);
+        }
+        bool addIfMatch(Document d) {
             if (cond.matches(d))
             {
-                list.Items.Add(d);
+                add(d);
                 return true;
             }
             return false;
         }
-        public bool remove(Document d)
+        public void add(Document d)
         {
-            if (list.Items.Contains(d))
+            SyncUI.exe(delegate()
             {
-                list.Items.Remove(d);
+                if (isFirstSession)
+                {
+                    list.Items.Add(d);
+                    return;
+                }
+                if (list.Items.Contains(d)) return;
+                if (list.Items.Count >= 1)
+                {
+                    list.Items.Insert(0, d);
+                }
+                else
+                {
+                    list.Items.Add(d);
+                }
+            });
+
+        }
+        bool removeUnlessMatch(Document d)
+        {
+            if (!cond.matches(d))
+            {
+                SyncUI.exe(delegate()
+                {
+                    if (!list.Items.Contains(d)) return;
+                    list.Items.Remove(d);
+                });
                 return true;
             }
             return false;
         }
+        bool isFirstSession;
+        public void openSyncSession()
+        {
+            isFirstSession = list.Items.Count == 0;
+            System.Diagnostics.Debug.Print("ISF "+cond+" : "+isFirstSession);
+        }
+        public void closeSyncSession()
+        {
+            removeAllUnmatch();
+        }
+        private void removeAllUnmatch()
+        {
+            var ls = new object[list.Items.Count];
+            list.Items.CopyTo(ls,0);
+            foreach (object e in ls)
+            {
+                if (e is Document)
+                {
+                    var d = (Document)e;
+                    if (!cond.matches(d))
+                    {
+                        SyncUI.exe(delegate()
+                        {
+                            list.Items.Remove(d);
+                        });
+                    }
+                }
+            }
+        }
     }
 }

lang/csharp/soyText/soyText/Program.cs

@@ -16 +16 @@
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Debug.Try("Main", delegate()
-            {
+            /*Debug.Try("Main", delegate()
+            {*/
                 Application.Run(new WorkspaceSelector());
-            });
+            //});
         }
     }

lang/csharp/soyText/soyText/TerminableThread.cs

@@ -41 +41 @@
                     else _running = true;
                 }
-                if (r!=null) new DThread(name, r).Start();
+                if (r!=null) new Thread(r).Start();
             }
         }
@@ -71 +71 @@
                 }
             }
-            if (r) new DThread(name, d).Start();
+            if (r) new Thread(d).Start();
         }
     }

lang/csharp/soyText/soyText/bin/Debug/soyText.application

@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>zUdISs7VamOXM/l91giRXwP07rk=</dsig:DigestValue>
+        <dsig:DigestValue>2V7AMEy6UTkeQ7vRbogHsGWi13w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Debug/soyText.exe.manifest

@@ -113 +113 @@
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="82944">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="84480">
       <assemblyIdentity name="soyText" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
@@ -120 +120 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>CBgmbBvumgAZxMXXzPeQPl0CgPk=</dsig:DigestValue>
+        <dsig:DigestValue>9VkzjS3QpI2zx/U6AIMTvmxrXhc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Debug/soyText.vshost.application

@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>zUdISs7VamOXM/l91giRXwP07rk=</dsig:DigestValue>
+        <dsig:DigestValue>2V7AMEy6UTkeQ7vRbogHsGWi13w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>