Commit: a4f2ab01ffea43b75bf3d2a65bd2b608b13b3c8f - TestNarou3 (git)

なろうブックマーク分析用ツールのPrism+WinUI3サンプル実装

Commit MetaInfo

• Revisão: a4f2ab01ffea43b75bf3d2a65bd2b608b13b3c8f (tree)
• Hora: 2022-08-24 07:54:20
• Autor: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Mensagem de Log

[MOD] SortableSynchronizedCoupleView によるソート処理の実装（すべての列を移行）

Mudança Sumário

• modified: TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
• modified: TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml
• modified: TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml.cs

Diff

--- a/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
+++ b/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
@@ -22,6 +22,7 @@ namespace TestNarou3.Adaptor.Boundary.Gateway.ViewModel
 
         void SynchronizeWith(BookmarkDetailList list);
 
-        void Sort(string tag, Func<IBookmarkDetailListRowViewModel, string> selector, bool asceding);
+        void SortByValueColumn<TValueColumn>(string tag, Func<BookmarkDetailListRow, TValueColumn> selector, bool asceding);
+        void SortByViewColumn<TViewColumn>(string tag, Func<IBookmarkDetailListRowViewModel, TViewColumn> selector, bool asceding);
     }
 }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
@@ -9,6 +9,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Reactive.Disposables;
+using System.Windows.Input;
 using TestNarou3.Adaptor.Boundary.Controller;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel.Child;
@@ -86,11 +87,10 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
 
         public void SynchronizeWith(BookmarkDetailList source)
         {
-#if true
             if (this.Source == null)
             {
                 this.SortableRows = source.Rows
-                        .ToSortableSynchronizedCoupleView(r => r.NCode, r => this.vmTranslator.Translate(r, this), new DetailListComparer(r => r.Title.Value, true));
+                        .ToSortableSynchronizedCoupleView(r => r.NCode, r => this.vmTranslator.Translate(r, this), new DetailListViewComparer<string>(r => r.Title.Value, true));
 
                 this.Rows = this.SortableRows
                         .ToSynchronizedSingleView()
@@ -107,52 +107,80 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
                 logger.Trace("BookmarkDetailListViewModel.SynchronizeWith: viewmodel already synchronized to model [{0}]",
                         this.Source.ToHashString());
             }
-#else
-            if (this.Rows != null)
+        }
+
+        public void SortByViewColumn<TViewColumn>(string tag, Func<IBookmarkDetailListRowViewModel, TViewColumn> selector, bool ascending)
+        {
+            logger.Trace("Sort: {0}, ascending = {1}", tag, ascending);
+            this.SortableRows.Sort(new DetailListViewComparer<TViewColumn>(selector, ascending));
+        }
+
+        public void SortByValueColumn<TValueColumn>(string tag, Func<BookmarkDetailListRow, TValueColumn> selector, bool ascending)
+        {
+            logger.Trace("Sort: {0}, ascending = {1}", tag, ascending);
+            this.SortableRows.Sort(new DetailListValueComparer<TValueColumn>(selector, ascending));
+        }
+
+        internal class DetailListViewComparer<TViewColumn> : ViewComparer<string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel, TViewColumn>
+        {
+            public DetailListViewComparer(
+                    Func<IBookmarkDetailListRowViewModel, TViewColumn> selector, bool ascending = true
+            ) : base(selector, ascending)
             {
-                this.Rows.Dispose();
-                this.disposables.Remove(this.Rows);
             }
+        }
 
-            this.SortableRows = new FreezedList<BookmarkDetailListRow>(source.Rows)
-                    .ToSynchronizedSortableCoupleView(r => this.vmTranslator.Translate(r, this),
-                            new ViewComparer<IBookmarkDetailListRowViewModel, string>(r => r.Title.Value));
+        internal class ViewComparer<TKey, T, TView, TViewColumn> : IComparer<(TKey, T, TView)>
+        {
+            readonly Func<TView, TViewColumn> selector;
+            readonly int f;
 
-            this.Rows = this.SortableRows
-                    .ToSynchronizedSingleView()
-                    .WithINotifyCollectionChangedList()
-                    .AddTo(disposables);
+            public ViewComparer(Func<TView, TViewColumn> selector, bool ascending = true)
+            {
+                this.selector = selector;
+                this.f = ascending ? 1 : -1;
+            }
 
-            this.Source = source;
+            public int Compare((TKey, T, TView) x, (TKey, T, TView) y)
+            {
+                int c = Comparer<TViewColumn>.Default.Compare(selector(x.Item3), selector(y.Item3)) * f;
+
+                if (c == 0)
+                {
+                    c = Comparer<TKey>.Default.Compare(x.Item1, y.Item1) * f;
+                }
 
-            //            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Rows"));
-#endif
+                return c;
+            }
         }
 
-        public void Sort(string tag, Func<IBookmarkDetailListRowViewModel, string> selector, bool ascending)
+        internal class DetailListValueComparer<TValueColumn> : ValueComparer<string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel, TValueColumn>
         {
-            logger.Trace("Sort: {0}, ascending = {1}", tag, ascending);
-            this.SortableRows.Sort(new DetailListComparer(selector, ascending));
+            public DetailListValueComparer(
+                    Func<BookmarkDetailListRow, TValueColumn> selector, bool ascending = true
+            ) : base(selector, ascending)
+            {
+            }
         }
 
-        internal class DetailListComparer : IComparer<(string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel)>
+        internal class ValueComparer<TKey, T, TView, TValueColumn> : IComparer<(TKey, T, TView)>
         {
-            readonly Func<IBookmarkDetailListRowViewModel, string> selector;
+            readonly Func<T, TValueColumn> selector;
             readonly int f;
 
-            public DetailListComparer(Func<IBookmarkDetailListRowViewModel, string> selector, bool ascending = true)
+            public ValueComparer(Func<T, TValueColumn> selector, bool ascending = true)
             {
                 this.selector = selector;
                 this.f = ascending ? 1 : -1;
             }
 
-            public int Compare((string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel) x, (string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel) y)
+            public int Compare((TKey, T, TView) x, (TKey, T, TView) y)
             {
-                int c = selector(x.Item3).CompareTo(selector(y.Item3)) * f;
+                int c = Comparer<TValueColumn>.Default.Compare(selector(x.Item2), selector(y.Item2)) * f;
 
                 if (c == 0)
                 {
-                    c = x.Item1.CompareTo(y.Item1);
+                    c = Comparer<TKey>.Default.Compare(x.Item1, y.Item1) * f;
                 }
 
                 return c;
@@ -191,6 +219,5 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
         }
 
         #endregion
-
     }
 }

--- a/TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml
+++ b/TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml
@@ -58,7 +58,7 @@
                     </DataTemplate>
                 </ctc:DataGridTemplateColumn.CellTemplate>
             </ctc:DataGridTemplateColumn>
-            <ctc:DataGridTemplateColumn Header="タイトル" Width="300" CanUserSort="False">
+            <ctc:DataGridTemplateColumn Header="タイトル" Width="300" Tag="Title">
                 <ctc:DataGridTemplateColumn.CellTemplate>
                     <DataTemplate x:DataType="vm:IBookmarkDetailListRowViewModel">
                         <Grid VerticalAlignment="Center">

--- a/TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml.cs
+++ b/TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml.cs
@@ -46,19 +46,28 @@ namespace TestNarou3.OuterEdge.UI.View
 
             switch (tag)
             {
+                case "Title":
+                    if ((e.Column.SortDirection == null) || (direction == DataGridSortDirection.Descending))
+                    {
+                        this.ViewModel.SortByViewColumn(tag, r => r.Title.Value, true);
+                        e.Column.SortDirection = DataGridSortDirection.Ascending;
+                    }
+                    else
+                    {
+                        this.ViewModel.SortByViewColumn(tag, r => r.Title.Value, false);
+                        e.Column.SortDirection = DataGridSortDirection.Descending;
+                    }
+                    break;
+
                 case "Writer":
                     if ((e.Column.SortDirection == null) || (direction == DataGridSortDirection.Descending))
                     {
-                        //dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                        //        from item in ViewModel.Rows orderby item.Writer.Value ascending select item);
-                        this.ViewModel.Sort(tag, r => r.Writer.Value, true);
+                        this.ViewModel.SortByViewColumn(tag, r => r.Writer.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     else
                     {
-                        //dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                        //        from item in ViewModel.Rows orderby item.Writer.Value descending select item);
-                        this.ViewModel.Sort(tag, r => r.Writer.Value, false);
+                        this.ViewModel.SortByViewColumn(tag, r => r.Writer.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     break;
@@ -66,14 +75,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "End":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.End.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.End.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.End.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.End.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -81,14 +88,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "GeneralAllNo":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.GeneralAllNo.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.GeneralAllNo.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.GeneralAllNo.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.GeneralAllNo.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -96,14 +101,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "Time":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.Time.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.Time.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.Time.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.Time.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -111,14 +114,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "IsStop":
                     if ((e.Column.SortDirection == null) || (direction == DataGridSortDirection.Descending))
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.IsStop.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.IsStop.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.IsStop.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.IsStop.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     break;
@@ -126,14 +127,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "GlobalPoint":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.GlobalPoint.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.GlobalPoint.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.GlobalPoint.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.GlobalPoint.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -141,14 +140,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "PointPerMin":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.PointPerMin.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.PointPerMin.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.PointPerMin.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.PointPerMin.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -156,14 +153,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "DailyPoint":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.DailyPoint.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.DailyPoint.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.DailyPoint.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.DailyPoint.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -171,14 +166,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "WeeklyPoint":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.WeeklyPoint.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.WeeklyPoint.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.WeeklyPoint.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.WeeklyPoint.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -186,14 +179,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "MonthlyPoint":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.MonthlyPoint.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.MonthlyPoint.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.MonthlyPoint.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.MonthlyPoint.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -201,14 +192,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "QuarterPoint":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.QuarterPoint.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.QuarterPoint.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.QuarterPoint.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.QuarterPoint.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -216,14 +205,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "YearlyPoint":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.YearlyPoint.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.YearlyPoint.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.YearlyPoint.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.YearlyPoint.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -231,14 +218,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "FavNovelCnt":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.FavNovelCnt.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.FavNovelCnt.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.FavNovelCnt.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.FavNovelCnt.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -246,14 +231,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "ImpressionCnt":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.ImpressionCnt.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.ImpressionCnt.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.ImpressionCnt.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.ImpressionCnt.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -261,14 +244,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "ReviewCnt":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.ReviewCnt.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.ReviewCnt.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.ReviewCnt.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.ReviewCnt.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -276,14 +257,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "AllPoint":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.AllPoint.Value descending select item);
-                        e.Column.SortDirection = DataGridSortDirection.Descending;
+                        this.ViewModel.SortByViewColumn(tag, r => r.AllPoint.Value, false);
+                       e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.AllPoint.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.AllPoint.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -291,14 +270,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "AllHyokaCnt":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.AllHyokaCnt.Value descending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.AllHyokaCnt.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.AllHyokaCnt.Value ascending select item);
+                        this.ViewModel.SortByViewColumn(tag, r => r.AllHyokaCnt.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -306,14 +283,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "GeneralLastUp":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.GeneralLastUp.Value descending select item);
+                        this.ViewModel.SortByValueColumn(tag, r => r.GeneralLastUp.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.GeneralLastUp.Value ascending select item);
+                        this.ViewModel.SortByValueColumn(tag, r => r.GeneralLastUp.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -321,14 +296,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "GeneralFirstUp":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.GeneralFirstUp.Value descending select item);
+                        this.ViewModel.SortByValueColumn(tag, r => r.GeneralFirstUp.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.GeneralFirstUp.Value ascending select item);
+                        this.ViewModel.SortByValueColumn(tag, r => r.GeneralFirstUp.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;
@@ -336,14 +309,12 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "NovelUpdatedAt":
                     if (direction == DataGridSortDirection.Ascending)
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.NovelUpdatedAt.Value descending select item);
+                        this.ViewModel.SortByValueColumn(tag, r => r.NovelUpdatedAt.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.NovelUpdatedAt.Value ascending select item);
+                        this.ViewModel.SortByValueColumn(tag, r => r.NovelUpdatedAt.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     break;