Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 5c8449a

Browse files
Fixing other code analysis errors
1 parent 534b4c7 commit 5c8449a

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

src/GitHub.App/ViewModels/Dialog/ForkRepositoryExecuteViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ IObservable<Repository> OnCreateFork(object o)
9494
if (!ex.IsCriticalException())
9595
{
9696
log.Error(ex, "Error Creating Fork");
97-
var error = StandardUserErrors.GetUserFriendlyErrorMessage(ex, ErrorType.RepoForkFailed);
97+
var error = ex.GetUserFriendlyErrorMessage(ErrorType.RepoForkFailed);
9898
notificationService.ShowError(error);
9999
}
100100

src/GitHub.App/ViewModels/Dialog/ForkRepositorySwitchViewModel.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ namespace GitHub.ViewModels.Dialog
2020
[PartCreationPolicy(CreationPolicy.NonShared)]
2121
public class ForkRepositorySwitchViewModel : ViewModelBase, IForkRepositorySwitchViewModel
2222
{
23-
static readonly ILogger log = LogManager.ForContext<ForkRepositorySwitchViewModel>();
24-
2523
readonly IRepositoryForkService repositoryForkService;
2624

2725
[ImportingConstructor]

src/GitHub.App/ViewModels/Dialog/ForkRepositoryViewModel.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,10 @@ namespace GitHub.ViewModels.Dialog
1515
[PartCreationPolicy(CreationPolicy.NonShared)]
1616
public class ForkRepositoryViewModel : PagedDialogViewModelBase, IForkRepositoryViewModel
1717
{
18-
static readonly ILogger log = LogManager.ForContext<ForkRepositoryViewModel>();
19-
2018
readonly IForkRepositorySelectViewModel selectPage;
2119
readonly IForkRepositorySwitchViewModel switchPage;
2220
readonly IForkRepositoryExecuteViewModel executePage;
2321

24-
ILocalRepositoryModel repository;
25-
IConnection connection;
26-
2722
[ImportingConstructor]
2823
public ForkRepositoryViewModel(
2924
IForkRepositorySelectViewModel selectPage,
@@ -40,27 +35,31 @@ public ForkRepositoryViewModel(
4035
selectPage.Done.Subscribe(x => ShowExecutePage((IAccount)x).Forget());
4136
}
4237

38+
public ILocalRepositoryModel Repository { get; private set; }
39+
40+
public IConnection Connection { get; private set; }
41+
4342
private ReactiveCommand<object> Completed { get; }
4443

4544
public override IObservable<object> Done => executePage.Done;
4645

4746
public async Task InitializeAsync(ILocalRepositoryModel repository, IConnection connection)
4847
{
49-
this.repository = repository;
50-
this.connection = connection;
48+
Repository = repository;
49+
Connection = connection;
5150
await selectPage.InitializeAsync(repository, connection);
5251
Content = selectPage;
5352
}
5453

5554
async Task ShowExecutePage(IAccount account)
5655
{
57-
await executePage.InitializeAsync(repository, account, connection);
56+
await executePage.InitializeAsync(Repository, account, Connection);
5857
Content = executePage;
5958
}
6059

6160
void ShowSwitchRepositoryPath(IRemoteRepositoryModel remoteRepository)
6261
{
63-
switchPage.Initialize(repository, remoteRepository);
62+
switchPage.Initialize(Repository, remoteRepository);
6463
Content = switchPage;
6564
}
6665
}

0 commit comments

Comments
 (0)