Merge branch 'fixes/window-child-view-attach' into features/using-cache-manager

StanleyGoldman · StanleyGoldman · commit 5fbc0fdfab65 · 2017-11-02T13:47:58.000-04:00
# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -84,13 +84,6 @@ public override void OnDataUpdate()
             MaybeUpdateData();
         }
 
-        public override void OnRepositoryChanged(IRepository oldRepository)
-        {
-            base.OnRepositoryChanged(oldRepository);
-            gitPathView.OnRepositoryChanged(oldRepository);
-            userSettingsView.OnRepositoryChanged(oldRepository);
-        }
-
         public override void Refresh()
         {
             base.Refresh();
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs
@@ -48,9 +48,6 @@ public virtual void Finish(bool result)
             Parent.Finish(result);
         }
 
-        public virtual void OnRepositoryChanged(IRepository oldRepository)
-        {}
-
         protected IView Parent { get; private set; }
         public IApplicationManager Manager { get { return Parent.Manager; } }
         public IRepository Repository { get { return Parent.Repository; } }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -134,9 +134,6 @@ public override void OnRepositoryChanged(IRepository oldRepository)
             }
 
             UpdateActiveTab();
-
-            if (ActiveView != null)
-                ActiveView.OnRepositoryChanged(oldRepository);
         }
 
         public override void OnSelectionChange()

Original file line number	Diff line number	Diff line change
`@@ -84,13 +84,6 @@ public override void OnDataUpdate()`
`84`	`84`	`MaybeUpdateData();`
`85`	`85`	`}`
`86`	`86`
`87`		`- public override void OnRepositoryChanged(IRepository oldRepository)`
`88`		`- {`
`89`		`- base.OnRepositoryChanged(oldRepository);`
`90`		`- gitPathView.OnRepositoryChanged(oldRepository);`
`91`		`- userSettingsView.OnRepositoryChanged(oldRepository);`
`92`		`- }`
`93`		`-`
`94`	`87`	`public override void Refresh()`
`95`	`88`	`{`
`96`	`89`	`base.Refresh();`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,6 @@ public virtual void Finish(bool result)`
`48`	`48`	`Parent.Finish(result);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public virtual void OnRepositoryChanged(IRepository oldRepository)`
`52`		`- {}`
`53`		`-`
`54`	`51`	`protected IView Parent { get; private set; }`
`55`	`52`	`public IApplicationManager Manager { get { return Parent.Manager; } }`
`56`	`53`	`public IRepository Repository { get { return Parent.Repository; } }`
Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,6 @@ public override void OnRepositoryChanged(IRepository oldRepository)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`UpdateActiveTab();`
`137`		`-`
`138`		`- if (ActiveView != null)`
`139`		`- ActiveView.OnRepositoryChanged(oldRepository);`
`140`	`137`	`}`
`141`	`138`
`142`	`139`	`public override void OnSelectionChange()`