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

Commit ed0cb39

Browse files
committed
Remove redundant initialization code
1 parent e6ee44d commit ed0cb39

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

src/GitHub.VisualStudio/UI/GitHubPane.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ namespace GitHub.VisualStudio.UI
3232
/// </para>
3333
/// </remarks>
3434
[Guid(GitHubPaneGuid)]
35-
public class GitHubPane : ToolWindowPane, IServiceProviderAware
35+
public class GitHubPane : ToolWindowPane
3636
{
3737
public const string GitHubPaneGuid = "6b0fdc0a-f28e-47a0-8eed-cc296beff6d2";
3838

3939
readonly TaskCompletionSource<IGitHubPaneViewModel> viewModelSource =
4040
new TaskCompletionSource<IGitHubPaneViewModel>();
4141

42-
bool initialized = false;
4342
IDisposable viewSubscription;
4443
ContentPresenter contentPresenter;
4544

@@ -84,21 +83,12 @@ public GitHubPane() : base(null)
8483

8584
protected override void Initialize()
8685
{
87-
base.Initialize();
88-
Initialize(this);
89-
}
90-
91-
public void Initialize(IServiceProvider serviceProvider)
92-
{
93-
if (!initialized)
94-
{
95-
InitializeAsync(serviceProvider).Catch(ShowError).Forget();
96-
}
86+
InitializeAsync().Catch(ShowError).Forget();
9787
}
9888

9989
public Task<IGitHubPaneViewModel> GetViewModelAsync() => viewModelSource.Task;
10090

101-
async Task InitializeAsync(IServiceProvider serviceProvider)
91+
async Task InitializeAsync()
10292
{
10393
// Allow MEF to initialize its cache asynchronously
10494
ShowInitializing();
@@ -107,7 +97,7 @@ async Task InitializeAsync(IServiceProvider serviceProvider)
10797

10898
var provider = VisualStudio.Services.GitHubServiceProvider;
10999
var teServiceHolder = provider.GetService<ITeamExplorerServiceHolder>();
110-
teServiceHolder.ServiceProvider = serviceProvider;
100+
teServiceHolder.ServiceProvider = this;
111101

112102
var factory = provider.GetService<IViewViewModelFactory>();
113103
var viewModel = provider.ExportProvider.GetExportedValue<IGitHubPaneViewModel>();

0 commit comments

Comments
 (0)