Renamed PR file/directory node classes.

grokys · grokys · commit 6587ddb0cbaa · 2016-10-19T12:54:35.000+02:00
Use Node rather than ViewModel.
diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
@@ -206,8 +206,8 @@
     <Compile Include="ViewModels\LogoutRequiredViewModel.cs" />
     <Compile Include="ViewModels\PullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\PullRequestDetailViewModel.cs" />
-    <Compile Include="ViewModels\PullRequestDirectoryViewModel.cs" />
-    <Compile Include="ViewModels\PullRequestFileViewModel.cs" />
+    <Compile Include="ViewModels\PullRequestDirectoryNode.cs" />
+    <Compile Include="ViewModels\PullRequestFileNode.cs" />
     <Compile Include="ViewModels\PullRequestListViewModel.cs" />
     <Compile Include="ViewModels\RepositoryCreationViewModel.cs" />
     <Compile Include="ViewModels\RepositoryCloneViewModel.cs" />
diff --git a/src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs
@@ -31,12 +31,12 @@ public PullRequestDetailViewModelDesigner()
 
 ![An image](https://cloud.githubusercontent.com/assets/1174461/18882991/5dd35648-8496-11e6-8735-82c3a182e8b4.png)";
 
-            var gitHubDir = new PullRequestDirectoryViewModel("GitHub");
-            var modelsDir = new PullRequestDirectoryViewModel("Models");
-            var repositoriesDir = new PullRequestDirectoryViewModel("Repositories");
-            var itrackingBranch = new PullRequestFileViewModel(@"GitHub\Models\ITrackingBranch.cs", PullRequestFileStatus.Modified);
-            var oldBranchModel = new PullRequestFileViewModel(@"GitHub\Models\OldBranchModel.cs", PullRequestFileStatus.Removed);
-            var concurrentRepositoryConnection = new PullRequestFileViewModel(@"GitHub\Repositories\ConcurrentRepositoryConnection.cs", PullRequestFileStatus.Added);
+            var gitHubDir = new PullRequestDirectoryNode("GitHub");
+            var modelsDir = new PullRequestDirectoryNode("Models");
+            var repositoriesDir = new PullRequestDirectoryNode("Repositories");
+            var itrackingBranch = new PullRequestFileNode(@"GitHub\Models\ITrackingBranch.cs", PullRequestFileStatus.Modified);
+            var oldBranchModel = new PullRequestFileNode(@"GitHub\Models\OldBranchModel.cs", PullRequestFileStatus.Removed);
+            var concurrentRepositoryConnection = new PullRequestFileNode(@"GitHub\Repositories\ConcurrentRepositoryConnection.cs", PullRequestFileStatus.Added);
 
             repositoriesDir.Files.Add(concurrentRepositoryConnection);
             modelsDir.Directories.Add(repositoriesDir);
@@ -47,7 +47,7 @@ public PullRequestDetailViewModelDesigner()
             ChangedFilesTree = new ReactiveList<IPullRequestChangeNode>();
             ChangedFilesTree.Add(gitHubDir);
 
-            ChangedFilesList = new ReactiveList<IPullRequestFileViewModel>();
+            ChangedFilesList = new ReactiveList<IPullRequestFileNode>();
             ChangedFilesList.Add(concurrentRepositoryConnection);
             ChangedFilesList.Add(itrackingBranch);
             ChangedFilesList.Add(oldBranchModel);
@@ -62,7 +62,7 @@ public PullRequestDetailViewModelDesigner()
         public ChangedFilesViewType ChangedFilesViewType { get; set; }
         public OpenChangedFileAction OpenChangedFileAction { get; set; }
         public IReactiveList<IPullRequestChangeNode> ChangedFilesTree { get; }
-        public IReactiveList<IPullRequestFileViewModel> ChangedFilesList { get; }
+        public IReactiveList<IPullRequestFileNode> ChangedFilesList { get; }
         public CheckoutMode CheckoutMode { get; set; }
         public string CheckoutError { get; set; }
         public int CommitsBehind { get; set; }
diff --git a/src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs b/src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs
@@ -199,7 +199,7 @@ public string CheckoutDisabledMessage
         /// <summary>
         /// Gets the changed files as a flat list.
         /// </summary>
-        public IReactiveList<IPullRequestFileViewModel> ChangedFilesList { get; } = new ReactiveList<IPullRequestFileViewModel>();
+        public IReactiveList<IPullRequestFileNode> ChangedFilesList { get; } = new ReactiveList<IPullRequestFileNode>();
 
         /// <summary>
         /// Gets a command that checks out the pull request locally.
@@ -222,12 +222,12 @@ public string CheckoutDisabledMessage
         public ReactiveCommand<object> ToggleOpenChangedFileAction { get; }
 
         /// <summary>
-        /// Gets a command that opens a <see cref="IPullRequestFileViewModel"/>.
+        /// Gets a command that opens a <see cref="IPullRequestFileNode"/>.
         /// </summary>
         public ReactiveCommand<object> OpenFile { get; }
  
         /// <summary>
-        /// Gets a command that diffs a <see cref="IPullRequestFileViewModel"/>.
+        /// Gets a command that diffs a <see cref="IPullRequestFileNode"/>.
         /// </summary>
         public ReactiveCommand<object> DiffFile { get; }
 
@@ -315,16 +315,16 @@ public async Task Load(IPullRequestModel pullRequest)
             IsBusy = false;
         }
 
-        static IEnumerable<IPullRequestFileViewModel> CreateChangedFilesList(IList<IPullRequestFileModel> files)
+        static IEnumerable<IPullRequestFileNode> CreateChangedFilesList(IList<IPullRequestFileModel> files)
         {
-            return files.Select(x => new PullRequestFileViewModel(x.FileName, x.Status));
+            return files.Select(x => new PullRequestFileNode(x.FileName, x.Status));
         }
 
-        static IPullRequestDirectoryViewModel CreateChangedFilesTree(IEnumerable<IPullRequestFileViewModel> files)
+        static IPullRequestDirectoryNode CreateChangedFilesTree(IEnumerable<IPullRequestFileNode> files)
         {
-            var dirs = new Dictionary<string, PullRequestDirectoryViewModel>
+            var dirs = new Dictionary<string, PullRequestDirectoryNode>
             {
-                { string.Empty, new PullRequestDirectoryViewModel(string.Empty) }
+                { string.Empty, new PullRequestDirectoryNode(string.Empty) }
             };
 
             foreach (var file in files)
@@ -353,16 +353,16 @@ static string GetCheckoutModeDescription(CheckoutMode checkoutMode)
             }
         }
 
-        static PullRequestDirectoryViewModel GetDirectory(string path, Dictionary<string, PullRequestDirectoryViewModel> dirs)
+        static PullRequestDirectoryNode GetDirectory(string path, Dictionary<string, PullRequestDirectoryNode> dirs)
         {
-            PullRequestDirectoryViewModel dir;
+            PullRequestDirectoryNode dir;
 
             if (!dirs.TryGetValue(path, out dir))
             {
                 var parentPath = Path.GetDirectoryName(path);
                 var parentDir = GetDirectory(parentPath, dirs);
 
-                dir = new PullRequestDirectoryViewModel(path);
+                dir = new PullRequestDirectoryNode(path);
 
                 if (!parentDir.Directories.Any(x => x.DirectoryName == dir.DirectoryName))
                 {
diff --git a/src/GitHub.App/ViewModels/PullRequestDirectoryNode.cs b/src/GitHub.App/ViewModels/PullRequestDirectoryNode.cs
@@ -4,20 +4,20 @@
 
 namespace GitHub.ViewModels
 {
-    public class PullRequestDirectoryViewModel : IPullRequestDirectoryViewModel
+    public class PullRequestDirectoryNode : IPullRequestDirectoryNode
     {
-        public PullRequestDirectoryViewModel(string fullPath)
+        public PullRequestDirectoryNode(string fullPath)
         {
             DirectoryName = System.IO.Path.GetFileName(fullPath);
             Path = fullPath;
-            Directories = new List<IPullRequestDirectoryViewModel>();
-            Files = new List<IPullRequestFileViewModel>();
+            Directories = new List<IPullRequestDirectoryNode>();
+            Files = new List<IPullRequestFileNode>();
         }
 
         public string DirectoryName { get; }
         public string Path { get; }
-        public IList<IPullRequestDirectoryViewModel> Directories { get; }
-        public IList<IPullRequestFileViewModel> Files { get; }
+        public IList<IPullRequestDirectoryNode> Directories { get; }
+        public IList<IPullRequestFileNode> Files { get; }
 
         public IEnumerable<IPullRequestChangeNode> Children
         {
diff --git a/src/GitHub.App/ViewModels/PullRequestFileNode.cs b/src/GitHub.App/ViewModels/PullRequestFileNode.cs
@@ -3,9 +3,9 @@
 
 namespace GitHub.ViewModels
 {
-    public class PullRequestFileViewModel : IPullRequestFileViewModel
+    public class PullRequestFileNode : IPullRequestFileNode
     {
-        public PullRequestFileViewModel(string fullPath, PullRequestFileStatus status)
+        public PullRequestFileNode(string fullPath, PullRequestFileStatus status)
         {
             FileName = System.IO.Path.GetFileName(fullPath);
             Path = System.IO.Path.GetDirectoryName(fullPath);
diff --git a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj
@@ -116,8 +116,8 @@
     <Compile Include="ViewModels\IPullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\IPullRequestDetailViewModel.cs" />
     <Compile Include="ViewModels\IPullRequestChangeNode.cs" />
-    <Compile Include="ViewModels\IPullRequestDirectoryViewModel.cs" />
-    <Compile Include="ViewModels\IPullRequestFileViewModel.cs" />
+    <Compile Include="ViewModels\IPullRequestDirectoryNode.cs" />
+    <Compile Include="ViewModels\IPullRequestFileNode.cs" />
     <Compile Include="ViewModels\IPullRequestListViewModel.cs" />
     <Compile Include="ViewModels\IReactiveViewModel.cs" />
     <Compile Include="ViewModels\IRepositoryCreationTarget.cs" />
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IPullRequestDetailViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/IPullRequestDetailViewModel.cs
@@ -118,7 +118,7 @@ public interface IPullRequestDetailViewModel : IViewModel, IHasBusy
         /// <summary>
         /// Gets the changed files as a flat list.
         /// </summary>
-        IReactiveList<IPullRequestFileViewModel> ChangedFilesList { get; }
+        IReactiveList<IPullRequestFileNode> ChangedFilesList { get; }
 
         /// <summary>
         /// Gets the checkout mode for the pull request.
@@ -162,12 +162,12 @@ public interface IPullRequestDetailViewModel : IViewModel, IHasBusy
         ReactiveCommand<object> ToggleOpenChangedFileAction { get; }
 
         /// <summary>
-        /// Gets a command that opens a <see cref="IPullRequestFileViewModel"/>.
+        /// Gets a command that opens a <see cref="IPullRequestFileNode"/>.
         /// </summary>
         ReactiveCommand<object> OpenFile { get; }
 
         /// <summary>
-        /// Gets a command that diffs a <see cref="IPullRequestFileViewModel"/>.
+        /// Gets a command that diffs a <see cref="IPullRequestFileNode"/>.
         /// </summary>
         ReactiveCommand<object> DiffFile { get; }
     }
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IPullRequestDirectoryNode.cs b/src/GitHub.Exports.Reactive/ViewModels/IPullRequestDirectoryNode.cs
@@ -2,7 +2,7 @@
 
 namespace GitHub.ViewModels
 {
-    public interface IPullRequestDirectoryViewModel : IPullRequestChangeNode
+    public interface IPullRequestDirectoryNode : IPullRequestChangeNode
     {
         string DirectoryName { get; }
         IEnumerable<IPullRequestChangeNode> Children { get; }
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IPullRequestFileNode.cs b/src/GitHub.Exports.Reactive/ViewModels/IPullRequestFileNode.cs
@@ -2,7 +2,7 @@
 
 namespace GitHub.ViewModels
 {
-    public interface IPullRequestFileViewModel : IPullRequestChangeNode
+    public interface IPullRequestFileNode : IPullRequestChangeNode
     {
         string FileName { get; }
         PullRequestFileStatus Status { get; }
diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml b/src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml
@@ -422,14 +422,14 @@
                                     </Style>
                                 </TreeView.ItemContainerStyle>
                                 <TreeView.Resources>
-                                    <HierarchicalDataTemplate DataType="{x:Type vm:PullRequestDirectoryViewModel}"
+                                    <HierarchicalDataTemplate DataType="{x:Type vm:PullRequestDirectoryNode}"
                                                               ItemsSource="{Binding Children}">
                                         <StackPanel Orientation="Horizontal">
                                             <ui:OcticonImage Icon="file_directory" Foreground="{DynamicResource GitHubDirectoryIconForeground}" />
                                             <TextBlock Text="{Binding DirectoryName}" Margin="4 2" VerticalAlignment="Center"/>
                                         </StackPanel>
                                     </HierarchicalDataTemplate>
-                                    <DataTemplate DataType="{x:Type vm:PullRequestFileViewModel}">
+                                    <DataTemplate DataType="{x:Type vm:PullRequestFileNode}">
                                         <StackPanel Orientation="Horizontal">
                                             <ui:OcticonImage Icon="file_code" Foreground="{DynamicResource GitHubVsWindowText}"/>
                                             <TextBlock Text="{Binding FileName}" Margin="4 2" VerticalAlignment="Center"/>
diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml.cs b/src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml.cs
@@ -112,7 +112,7 @@ void DoOpenChangesOptionsMenu(dynamic o)
 
         private void FileListMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            var file = (e.OriginalSource as FrameworkElement)?.DataContext as IPullRequestFileViewModel;
+            var file = (e.OriginalSource as FrameworkElement)?.DataContext as IPullRequestFileNode;
 
             if (file != null)
             {
diff --git a/src/UnitTests/GitHub.App/ViewModels/PullRequestDetailViewModelTests.cs b/src/UnitTests/GitHub.App/ViewModels/PullRequestDetailViewModelTests.cs
@@ -45,22 +45,22 @@ public async Task ShouldCreateChangesTree()
 
             Assert.Equal(3, target.ChangedFilesTree.Count);
 
-            var dir1 = (PullRequestDirectoryViewModel)target.ChangedFilesTree[0];
+            var dir1 = (PullRequestDirectoryNode)target.ChangedFilesTree[0];
             Assert.Equal("dir1", dir1.DirectoryName);
             Assert.Equal(2, dir1.Files.Count);
             Assert.Equal(1, dir1.Directories.Count);
 
-            var dir1a = (PullRequestDirectoryViewModel)dir1.Directories[0];
+            var dir1a = (PullRequestDirectoryNode)dir1.Directories[0];
             Assert.Equal("dir1a", dir1a.DirectoryName);
             Assert.Equal(1, dir1a.Files.Count);
             Assert.Equal(0, dir1a.Directories.Count);
 
-            var dir2 = (PullRequestDirectoryViewModel)target.ChangedFilesTree[1];
+            var dir2 = (PullRequestDirectoryNode)target.ChangedFilesTree[1];
             Assert.Equal("dir2", dir2.DirectoryName);
             Assert.Equal(1, dir2.Files.Count);
             Assert.Equal(0, dir2.Directories.Count);
 
-            var readme = (PullRequestFileViewModel)target.ChangedFilesTree[2];
+            var readme = (PullRequestFileNode)target.ChangedFilesTree[2];
             Assert.Equal("readme.md", readme.FileName);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public string CheckoutDisabledMessage`
`199`	`199`	`/// <summary>`
`200`	`200`	`/// Gets the changed files as a flat list.`
`201`	`201`	`/// </summary>`
`202`		`- public IReactiveList<IPullRequestFileViewModel> ChangedFilesList { get; } = new ReactiveList<IPullRequestFileViewModel>();`
	`202`	`+ public IReactiveList<IPullRequestFileNode> ChangedFilesList { get; } = new ReactiveList<IPullRequestFileNode>();`
`203`	`203`
`204`	`204`	`/// <summary>`
`205`	`205`	`/// Gets a command that checks out the pull request locally.`
`@@ -222,12 +222,12 @@ public string CheckoutDisabledMessage`
`222`	`222`	`public ReactiveCommand<object> ToggleOpenChangedFileAction { get; }`
`223`	`223`
`224`	`224`	`/// <summary>`
`225`		`- /// Gets a command that opens a <see cref="IPullRequestFileViewModel"/>.`
	`225`	`+ /// Gets a command that opens a <see cref="IPullRequestFileNode"/>.`
`226`	`226`	`/// </summary>`
`227`	`227`	`public ReactiveCommand<object> OpenFile { get; }`
`228`	`228`
`229`	`229`	`/// <summary>`
`230`		`- /// Gets a command that diffs a <see cref="IPullRequestFileViewModel"/>.`
	`230`	`+ /// Gets a command that diffs a <see cref="IPullRequestFileNode"/>.`
`231`	`231`	`/// </summary>`
`232`	`232`	`public ReactiveCommand<object> DiffFile { get; }`
`233`	`233`
`@@ -315,16 +315,16 @@ public async Task Load(IPullRequestModel pullRequest)`
`315`	`315`	`IsBusy = false;`
`316`	`316`	`}`
`317`	`317`
`318`		`- static IEnumerable<IPullRequestFileViewModel> CreateChangedFilesList(IList<IPullRequestFileModel> files)`
	`318`	`+ static IEnumerable<IPullRequestFileNode> CreateChangedFilesList(IList<IPullRequestFileModel> files)`
`319`	`319`	`{`
`320`		`- return files.Select(x => new PullRequestFileViewModel(x.FileName, x.Status));`
	`320`	`+ return files.Select(x => new PullRequestFileNode(x.FileName, x.Status));`
`321`	`321`	`}`
`322`	`322`
`323`		`- static IPullRequestDirectoryViewModel CreateChangedFilesTree(IEnumerable<IPullRequestFileViewModel> files)`
	`323`	`+ static IPullRequestDirectoryNode CreateChangedFilesTree(IEnumerable<IPullRequestFileNode> files)`
`324`	`324`	`{`
`325`		`- var dirs = new Dictionary<string, PullRequestDirectoryViewModel>`
	`325`	`+ var dirs = new Dictionary<string, PullRequestDirectoryNode>`
`326`	`326`	`{`
`327`		`- { string.Empty, new PullRequestDirectoryViewModel(string.Empty) }`
	`327`	`+ { string.Empty, new PullRequestDirectoryNode(string.Empty) }`
`328`	`328`	`};`
`329`	`329`
`330`	`330`	`foreach (var file in files)`
`@@ -353,16 +353,16 @@ static string GetCheckoutModeDescription(CheckoutMode checkoutMode)`
`353`	`353`	`}`
`354`	`354`	`}`
`355`	`355`
`356`		`- static PullRequestDirectoryViewModel GetDirectory(string path, Dictionary<string, PullRequestDirectoryViewModel> dirs)`
	`356`	`+ static PullRequestDirectoryNode GetDirectory(string path, Dictionary<string, PullRequestDirectoryNode> dirs)`
`357`	`357`	`{`
`358`		`- PullRequestDirectoryViewModel dir;`
	`358`	`+ PullRequestDirectoryNode dir;`
`359`	`359`
`360`	`360`	`if (!dirs.TryGetValue(path, out dir))`
`361`	`361`	`{`
`362`	`362`	`var parentPath = Path.GetDirectoryName(path);`
`363`	`363`	`var parentDir = GetDirectory(parentPath, dirs);`
`364`	`364`
`365`		`- dir = new PullRequestDirectoryViewModel(path);`
	`365`	`+ dir = new PullRequestDirectoryNode(path);`
`366`	`366`
`367`	`367`	`if (!parentDir.Directories.Any(x => x.DirectoryName == dir.DirectoryName))`
`368`	`368`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,20 +4,20 @@`
`4`	`4`
`5`	`5`	`namespace GitHub.ViewModels`
`6`	`6`	`{`
`7`		`- public class PullRequestDirectoryViewModel : IPullRequestDirectoryViewModel`
	`7`	`+ public class PullRequestDirectoryNode : IPullRequestDirectoryNode`
`8`	`8`	`{`
`9`		`- public PullRequestDirectoryViewModel(string fullPath)`
	`9`	`+ public PullRequestDirectoryNode(string fullPath)`
`10`	`10`	`{`
`11`	`11`	`DirectoryName = System.IO.Path.GetFileName(fullPath);`
`12`	`12`	`Path = fullPath;`
`13`		`- Directories = new List<IPullRequestDirectoryViewModel>();`
`14`		`- Files = new List<IPullRequestFileViewModel>();`
	`13`	`+ Directories = new List<IPullRequestDirectoryNode>();`
	`14`	`+ Files = new List<IPullRequestFileNode>();`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public string DirectoryName { get; }`
`18`	`18`	`public string Path { get; }`
`19`		`- public IList<IPullRequestDirectoryViewModel> Directories { get; }`
`20`		`- public IList<IPullRequestFileViewModel> Files { get; }`
	`19`	`+ public IList<IPullRequestDirectoryNode> Directories { get; }`
	`20`	`+ public IList<IPullRequestFileNode> Files { get; }`
`21`	`21`
`22`	`22`	`public IEnumerable<IPullRequestChangeNode> Children`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace GitHub.ViewModels`
`5`	`5`	`{`
`6`		`- public class PullRequestFileViewModel : IPullRequestFileViewModel`
	`6`	`+ public class PullRequestFileNode : IPullRequestFileNode`
`7`	`7`	`{`
`8`		`- public PullRequestFileViewModel(string fullPath, PullRequestFileStatus status)`
	`8`	`+ public PullRequestFileNode(string fullPath, PullRequestFileStatus status)`
`9`	`9`	`{`
`10`	`10`	`FileName = System.IO.Path.GetFileName(fullPath);`
`11`	`11`	`Path = System.IO.Path.GetDirectoryName(fullPath);`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GitHub.ViewModels`
`4`	`4`	`{`
`5`		`- public interface IPullRequestDirectoryViewModel : IPullRequestChangeNode`
	`5`	`+ public interface IPullRequestDirectoryNode : IPullRequestChangeNode`
`6`	`6`	`{`
`7`	`7`	`string DirectoryName { get; }`
`8`	`8`	`IEnumerable<IPullRequestChangeNode> Children { get; }`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GitHub.ViewModels`
`4`	`4`	`{`
`5`		`- public interface IPullRequestFileViewModel : IPullRequestChangeNode`
	`5`	`+ public interface IPullRequestFileNode : IPullRequestChangeNode`
`6`	`6`	`{`
`7`	`7`	`string FileName { get; }`
`8`	`8`	`PullRequestFileStatus Status { get; }`