@@ -29,10 +29,10 @@ class Window : BaseWindow
2929 [ NonSerialized ] private double notificationClearTime = - 1 ;
3030
3131 [ SerializeField ] private SubTab activeTab = SubTab . History ;
32- [ SerializeField ] private BranchesView branchesTab = new BranchesView ( ) ;
33- [ SerializeField ] private ChangesView changesTab = new ChangesView ( ) ;
34- [ SerializeField ] private HistoryView historyTab = new HistoryView ( ) ;
35- [ SerializeField ] private SettingsView settingsTab = new SettingsView ( ) ;
32+ [ SerializeField ] private BranchesView branchesView = new BranchesView ( ) ;
33+ [ SerializeField ] private ChangesView changesView = new ChangesView ( ) ;
34+ [ SerializeField ] private HistoryView historyView = new HistoryView ( ) ;
35+ [ SerializeField ] private SettingsView settingsView = new SettingsView ( ) ;
3636
3737 [ SerializeField ] private string repoBranch ;
3838 [ SerializeField ] private string repoUrl ;
@@ -74,10 +74,10 @@ public override void Initialize(IApplicationManager applicationManager)
7474 {
7575 base . Initialize ( applicationManager ) ;
7676
77- HistoryTab . InitializeView ( this ) ;
78- ChangesTab . InitializeView ( this ) ;
79- BranchesTab . InitializeView ( this ) ;
80- SettingsTab . InitializeView ( this ) ;
77+ HistoryView . InitializeView ( this ) ;
78+ ChangesView . InitializeView ( this ) ;
79+ BranchesView . InitializeView ( this ) ;
80+ SettingsView . InitializeView ( this ) ;
8181 }
8282
8383 public override void OnEnable ( )
@@ -91,15 +91,15 @@ public override void OnEnable()
9191 // Set window title
9292 titleContent = new GUIContent ( Title , Styles . SmallLogo ) ;
9393
94- if ( ActiveTab != null )
95- ActiveTab . OnEnable ( ) ;
94+ if ( ActiveView != null )
95+ ActiveView . OnEnable ( ) ;
9696 }
9797
9898 public override void OnDisable ( )
9999 {
100100 base . OnDisable ( ) ;
101- if ( ActiveTab != null )
102- ActiveTab . OnDisable ( ) ;
101+ if ( ActiveView != null )
102+ ActiveView . OnDisable ( ) ;
103103 }
104104
105105 public override void OnDataUpdate ( )
@@ -120,8 +120,8 @@ public override void OnDataUpdate()
120120 }
121121 }
122122
123- if ( ActiveTab != null )
124- ActiveTab . OnDataUpdate ( ) ;
123+ if ( ActiveView != null )
124+ ActiveView . OnDataUpdate ( ) ;
125125 }
126126
127127 public override void OnRepositoryChanged ( IRepository oldRepository )
@@ -131,22 +131,22 @@ public override void OnRepositoryChanged(IRepository oldRepository)
131131 DetachHandlers ( oldRepository ) ;
132132 AttachHandlers ( Repository ) ;
133133
134- if ( ActiveTab != null )
135- ActiveTab . OnRepositoryChanged ( oldRepository ) ;
134+ if ( ActiveView != null )
135+ ActiveView . OnRepositoryChanged ( oldRepository ) ;
136136 }
137137
138138 public override void OnSelectionChange ( )
139139 {
140140 base . OnSelectionChange ( ) ;
141- if ( ActiveTab != null )
142- ActiveTab . OnSelectionChange ( ) ;
141+ if ( ActiveView != null )
142+ ActiveView . OnSelectionChange ( ) ;
143143 }
144144
145145 public override void Refresh ( )
146146 {
147147 base . Refresh ( ) ;
148- if ( ActiveTab != null )
149- ActiveTab . Refresh ( ) ;
148+ if ( ActiveView != null )
149+ ActiveView . Refresh ( ) ;
150150 Repaint ( ) ;
151151 }
152152
@@ -162,9 +162,9 @@ public override void OnUI()
162162 DoToolbarGUI ( ) ;
163163
164164 // GUI for the active tab
165- if ( ActiveTab != null )
165+ if ( ActiveView != null )
166166 {
167- ActiveTab . OnGUI ( ) ;
167+ ActiveView . OnGUI ( ) ;
168168 }
169169 }
170170
@@ -294,9 +294,9 @@ private void DoToolbarGUI()
294294 }
295295 if ( EditorGUI . EndChangeCheck ( ) )
296296 {
297- var from = ActiveTab ;
297+ var from = ActiveView ;
298298 activeTab = tab ;
299- SwitchView ( from , ActiveTab ) ;
299+ SwitchView ( from , ActiveView ) ;
300300 }
301301
302302 GUILayout . FlexibleSpace ( ) ;
@@ -384,27 +384,27 @@ private static SubTab TabButton(SubTab tab, string title, SubTab activeTab)
384384 return GUILayout . Toggle ( activeTab == tab , title , EditorStyles . toolbarButton ) ? tab : activeTab ;
385385 }
386386
387- public HistoryView HistoryTab
387+ public HistoryView HistoryView
388388 {
389- get { return historyTab ; }
389+ get { return historyView ; }
390390 }
391391
392- public ChangesView ChangesTab
392+ public ChangesView ChangesView
393393 {
394- get { return changesTab ; }
394+ get { return changesView ; }
395395 }
396396
397- public BranchesView BranchesTab
397+ public BranchesView BranchesView
398398 {
399- get { return branchesTab ; }
399+ get { return branchesView ; }
400400 }
401401
402- public SettingsView SettingsTab
402+ public SettingsView SettingsView
403403 {
404- get { return settingsTab ; }
404+ get { return settingsView ; }
405405 }
406406
407- private Subview ActiveTab
407+ private Subview ActiveView
408408 {
409409 get
410410 {
@@ -417,14 +417,14 @@ private Subview ToView(SubTab tab)
417417 switch ( tab )
418418 {
419419 case SubTab . History :
420- return historyTab ;
420+ return historyView ;
421421 case SubTab . Changes :
422- return changesTab ;
422+ return changesView ;
423423 case SubTab . Branches :
424- return branchesTab ;
424+ return branchesView ;
425425 case SubTab . Settings :
426426 default :
427- return settingsTab ;
427+ return settingsView ;
428428 }
429429 }
430430
0 commit comments