Rename NoOriginRemote to NoRemoteOrigin

jcansdale · jcansdale · commit da21ea7624dc · 2018-11-09T14:44:30.000Z
I think this maybe reads better.
diff --git a/src/GitHub.App/ViewModels/GitHubPane/NoRemoteOriginViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/NoRemoteOriginViewModel.cs
@@ -5,9 +5,9 @@ namespace GitHub.ViewModels.GitHubPane
     /// <summary>
     /// The view model for the "No Origin Remote" view in the GitHub pane.
     /// </summary>
-    [Export(typeof(INoOriginRemoteViewModel))]
+    [Export(typeof(INoRemoteOriginViewModel))]
     [PartCreationPolicy(CreationPolicy.NonShared)]
-    public class NoOriginRemoteViewModel : PanePageViewModelBase, INoOriginRemoteViewModel
+    public class NoRemoteOriginViewModel : PanePageViewModelBase, INoRemoteOriginViewModel
     {
     }
 }
diff --git a/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/INoRemoteOriginViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/INoRemoteOriginViewModel.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// Defines the view model for the "No Origin Remote" view in the GitHub pane.
     /// </summary>
-    public interface INoOriginRemoteViewModel : IPanePageViewModel
+    public interface INoRemoteOriginViewModel : IPanePageViewModel
     {
     }
 }
diff --git a/src/GitHub.Exports/Settings/Guids.cs b/src/GitHub.Exports/Settings/Guids.cs
@@ -41,6 +41,6 @@ public static class Guids
         public static readonly Guid CommandSetGuid = new Guid(CommandSetString);
 
         // Callout notification IDs
-        public static readonly Guid NoOriginRemoteCalloutId = new Guid("B5679412-58A1-49CD-96E9-8F093FE3DC79");
+        public static readonly Guid NoRemoteOriginCalloutId = new Guid("B5679412-58A1-49CD-96E9-8F093FE3DC79");
     }
 }
diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj
@@ -31,8 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Views\GitHubPane\NoOriginRemoteView.xaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
+    <Compile Update="Views\GitHubPane\NoRemoteOriginView.xaml.cs">
+      <DependentUpon>NoRemoteOriginView.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/GitHub.VisualStudio.UI/Views/GitHubPane/NoRemoteOriginView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NoRemoteOriginView.xaml
@@ -1,4 +1,4 @@
-﻿<local:GenericNoOriginRemoteView x:Class="GitHub.VisualStudio.Views.GitHubPane.NoOriginRemoteView"
+﻿<local:GenericNoRemoteOriginView x:Class="GitHub.VisualStudio.Views.GitHubPane.NoRemoteOriginView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -41,4 +41,4 @@
             </TextBlock>
         </StackPanel>
     </DockPanel>
-</local:GenericNoOriginRemoteView>
+</local:GenericNoRemoteOriginView>
diff --git a/src/GitHub.VisualStudio.UI/Views/GitHubPane/NoRemoteOriginView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NoRemoteOriginView.xaml.cs
@@ -5,15 +5,15 @@
 
 namespace GitHub.VisualStudio.Views.GitHubPane
 {
-    public class GenericNoOriginRemoteView : ViewBase<INoOriginRemoteViewModel, GenericNoOriginRemoteView>
+    public class GenericNoRemoteOriginView : ViewBase<INoRemoteOriginViewModel, GenericNoRemoteOriginView>
     {
     }
 
-    [ExportViewFor(typeof(INoOriginRemoteViewModel))]
+    [ExportViewFor(typeof(INoRemoteOriginViewModel))]
     [PartCreationPolicy(CreationPolicy.NonShared)]
-    public partial class NoOriginRemoteView : GenericNoOriginRemoteView
+    public partial class NoRemoteOriginView : GenericNoRemoteOriginView
     {
-        public NoOriginRemoteView()
+        public NoRemoteOriginView()
         {
             InitializeComponent();
         }
diff --git a/test/GitHub.App.UnitTests/ViewModels/GitHubPane/GitHubPaneViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/GitHubPane/GitHubPaneViewModelTests.cs
@@ -190,6 +190,7 @@ static GitHubPaneViewModel CreateTarget(
         ILoggedOutViewModel loggedOut = null,
         INotAGitHubRepositoryViewModel notAGitHubRepository = null,
         INotAGitRepositoryViewModel notAGitRepository = null,
+        INoRemoteOriginViewModel noRemoteOriginViewModel = null,
         ILoginFailedViewModel loginFailed = null)
     {
         viewModelFactory = viewModelFactory ?? Substitute.For<IViewViewModelFactory>();
@@ -200,6 +201,7 @@ static GitHubPaneViewModel CreateTarget(
         loggedOut = loggedOut ?? Substitute.For<ILoggedOutViewModel>();
         notAGitHubRepository = notAGitHubRepository ?? Substitute.For<INotAGitHubRepositoryViewModel>();
         notAGitRepository = notAGitRepository ?? Substitute.For<INotAGitRepositoryViewModel>();
+        noRemoteOriginViewModel = noRemoteOriginViewModel ?? Substitute.For<INoRemoteOriginViewModel>();
         loginFailed = loginFailed ?? Substitute.For<ILoginFailedViewModel>();
 
         if (navigator == null)
@@ -235,6 +237,7 @@ static GitHubPaneViewModel CreateTarget(
             loggedOut,
             notAGitHubRepository,
             notAGitRepository,
+            noRemoteOriginViewModel,
             loginFailed);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ namespace GitHub.ViewModels.GitHubPane`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// The view model for the "No Origin Remote" view in the GitHub pane.`
`7`	`7`	`/// </summary>`
`8`		`- [Export(typeof(INoOriginRemoteViewModel))]`
	`8`	`+ [Export(typeof(INoRemoteOriginViewModel))]`
`9`	`9`	`[PartCreationPolicy(CreationPolicy.NonShared)]`
`10`		`- public class NoOriginRemoteViewModel : PanePageViewModelBase, INoOriginRemoteViewModel`
	`10`	`+ public class NoRemoteOriginViewModel : PanePageViewModelBase, INoRemoteOriginViewModel`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Defines the view model for the "No Origin Remote" view in the GitHub pane.`
`5`	`5`	`/// </summary>`
`6`		`- public interface INoOriginRemoteViewModel : IPanePageViewModel`
	`6`	`+ public interface INoRemoteOriginViewModel : IPanePageViewModel`
`7`	`7`	`{`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public static class Guids`
`41`	`41`	`public static readonly Guid CommandSetGuid = new Guid(CommandSetString);`
`42`	`42`
`43`	`43`	`// Callout notification IDs`
`44`		`- public static readonly Guid NoOriginRemoteCalloutId = new Guid("B5679412-58A1-49CD-96E9-8F093FE3DC79");`
	`44`	`+ public static readonly Guid NoRemoteOriginCalloutId = new Guid("B5679412-58A1-49CD-96E9-8F093FE3DC79");`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@`
`5`	`5`
`6`	`6`	`namespace GitHub.VisualStudio.Views.GitHubPane`
`7`	`7`	`{`
`8`		`- public class GenericNoOriginRemoteView : ViewBase<INoOriginRemoteViewModel, GenericNoOriginRemoteView>`
	`8`	`+ public class GenericNoRemoteOriginView : ViewBase<INoRemoteOriginViewModel, GenericNoRemoteOriginView>`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
`12`		`- [ExportViewFor(typeof(INoOriginRemoteViewModel))]`
	`12`	`+ [ExportViewFor(typeof(INoRemoteOriginViewModel))]`
`13`	`13`	`[PartCreationPolicy(CreationPolicy.NonShared)]`
`14`		`- public partial class NoOriginRemoteView : GenericNoOriginRemoteView`
	`14`	`+ public partial class NoRemoteOriginView : GenericNoRemoteOriginView`
`15`	`15`	`{`
`16`		`- public NoOriginRemoteView()`
	`16`	`+ public NoRemoteOriginView()`
`17`	`17`	`{`
`18`	`18`	`InitializeComponent();`
`19`	`19`	`}`