TabInformations.IsDefaultTab/IsDistributableTabメソッドを使っている箇所を、TabClass.IsDefaultTabTyp...

diff --git a/OpenTween/FilterDialog.cs b/OpenTween/FilterDialog.cs
index a998882..c9b6bbc 100644 (file)
--- a/OpenTween/FilterDialog.cs
+++ b/OpenTween/FilterDialog.cs
@@ -74,7 +74,7 @@ namespace OpenTween
             else
                 ShowDetail();
 
-            if (TabInformations.GetInstance().IsDefaultTab(tabName))
+            if (tab.IsDefaultTabType)
             {
                 CheckProtected.Checked = true;
                 CheckProtected.Enabled = false;
@@ -171,7 +171,7 @@ namespace OpenTween
                     break;
             }
             ButtonRenameTab.Enabled = true;
-            if (TabInformations.GetInstance().IsDefaultTab(tabName) || tab.Protected)
+            if (tab.IsDefaultTabType || tab.Protected)
             {
                 ButtonDeleteTab.Enabled = false;
             }

diff --git a/OpenTween/StatusDictionary.cs b/OpenTween/StatusDictionary.cs
index c1243ee..edd24ce 100644 (file)
--- a/OpenTween/StatusDictionary.cs
+++ b/OpenTween/StatusDictionary.cs
@@ -488,8 +488,9 @@ namespace OpenTween
         {
             lock (LockObj)
             {
-                if (IsDefaultTab(TabName)) return; //念のため
-                var tb = _tabs[TabName];
+                var tb = GetTabByName(TabName);
+                if (tb.IsDefaultTabType) return; //念のため
+
                 if (!tb.IsInnerStorageTabType)
                 {
                     var homeTab = GetTabByType(MyCommon.TabUsageType.Home);

diff --git a/OpenTween/TabsDialog.cs b/OpenTween/TabsDialog.cs
index 5f8a012..3711160 100644 (file)
--- a/OpenTween/TabsDialog.cs
+++ b/OpenTween/TabsDialog.cs
@@ -81,7 +81,7 @@ namespace OpenTween
 
             foreach (var tab in this.TabInfo.Tabs)
             {
-                if (!this.TabInfo.IsDistributableTab(tab.Key)) continue;
+                if (!tab.Value.IsDistributableTabType) continue;
 
                 this.TabList.Items.Add(new TabListItem
                 {

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index f74a1cd..8d8c48a 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -4458,7 +4458,8 @@ namespace OpenTween
 
         public bool RemoveSpecifiedTab(string TabName, bool confirm)
         {
-            if (_statuses.IsDefaultTab(TabName) || _statuses.Tabs[TabName].Protected) return false;
+            var tabInfo = _statuses.GetTabByName(TabName);
+            if (tabInfo.IsDefaultTabType || tabInfo.Protected) return false;
 
             if (confirm)
             {
@@ -4470,13 +4471,11 @@ namespace OpenTween
                 }
             }
 
-            var _tabPage = ListTab.TabPages.Cast<TabPage>().FirstOrDefault<TabPage>(tp => tp.Text == TabName);
+            var _tabPage = ListTab.TabPages.Cast<TabPage>().FirstOrDefault(tp => tp.Text == TabName);
             if (_tabPage == null) return false;
 
             SetListProperty();   //他のタブに列幅等を反映
 
-            MyCommon.TabUsageType tabType = _statuses.Tabs[TabName].TabType;
-
             //オブジェクトインスタンスの削除
             DetailsListView _listCustom = (DetailsListView)_tabPage.Tag;
             _tabPage.Tag = null;
@@ -4496,14 +4495,14 @@ namespace OpenTween
                 this.ListTab.Controls.Remove(_tabPage);
 
                 // 後付けのコントロールを破棄
-                if (tabType == MyCommon.TabUsageType.UserTimeline || tabType == MyCommon.TabUsageType.Lists)
+                if (tabInfo.TabType == MyCommon.TabUsageType.UserTimeline || tabInfo.TabType == MyCommon.TabUsageType.Lists)
                 {
                     using (Control label = _tabPage.Controls["labelUser"])
                     {
                         _tabPage.Controls.Remove(label);
                     }
                 }
-                else if (tabType == MyCommon.TabUsageType.PublicSearch)
+                else if (tabInfo.TabType == MyCommon.TabUsageType.PublicSearch)
                 {
                     using (Control pnl = _tabPage.Controls["panelSearch"])
                     {
@@ -8472,10 +8471,12 @@ namespace OpenTween
 
         private void TabMenuControl(string tabName)
         {
+            var tabInfo = _statuses.GetTabByName(tabName);
+
             this.FilterEditMenuItem.Enabled = true;
             this.EditRuleTbMenuItem.Enabled = true;
 
-            if (_statuses.IsDefaultTab(tabName))
+            if (tabInfo.IsDefaultTabType)
             {
                 this.ProtectTabMenuItem.Enabled = false;
                 this.ProtectTbMenuItem.Enabled = false;
@@ -8486,7 +8487,7 @@ namespace OpenTween
                 this.ProtectTbMenuItem.Enabled = true;
             }
 
-            if (_statuses.IsDefaultTab(tabName) || _statuses.Tabs[tabName].Protected)
+            if (tabInfo.IsDefaultTabType || tabInfo.Protected)
             {
                 this.ProtectTabMenuItem.Checked = true;
                 this.ProtectTbMenuItem.Checked = true;