Compliance with C# conventions: normally interface names start with a…

…n I. Signed-off-by: Konstantina Chremmou <[email protected]>
gangsterrapper22 · Apr 3, 2018 · 7655011 · 7655011
1 parent 6c43263
commit 7655011
Show file tree

Hide file tree

Showing 33 changed files with 47 additions and 48 deletions.
diff --git a/XenAdmin/Controls/UpsellPage.cs b/XenAdmin/Controls/UpsellPage.cs
@@ -120,7 +120,7 @@ public bool HasChanged
         }
 
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public string SubText
         {

diff --git a/XenAdmin/Controls/VerticalTabs.cs b/XenAdmin/Controls/VerticalTabs.cs
@@ -35,17 +35,17 @@
 using System.Windows.Forms;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using XenAdmin.XenSearch;
 using XenAdmin.Core;
 
+
 namespace XenAdmin.Controls
 {
     public class VerticalTabs : FlickerFreeListBox
     {
-        public interface VerticalTab
+        public interface IVerticalTab
         {
-            String Text { get; }
-            String SubText { get; }
+            string Text { get; }
+            string SubText { get; }
             Image Image { get; }
         }
 
@@ -77,7 +77,7 @@ protected override void OnDrawItem(DrawItemEventArgs e)
             if (e.Index < 0 || e.Index >= Items.Count)
                 return;
 
-            VerticalTab editPage = Items[e.Index] as VerticalTab;
+            IVerticalTab editPage = Items[e.Index] as IVerticalTab;
             if (editPage == null)
                 return;
 

diff --git a/XenAdmin/Dialogs/NetworkingProperties.cs b/XenAdmin/Dialogs/NetworkingProperties.cs
@@ -760,7 +760,7 @@ private void HideTooltip()
             Cursor = Cursors.Default;
         }
 
-        protected override string GetTabTitle(VerticalTabs.VerticalTab verticalTab)
+        protected override string GetTabTitle(VerticalTabs.IVerticalTab verticalTab)
         {
             NetworkingPropertiesPage page = verticalTab as NetworkingPropertiesPage;
             if (page != null)

diff --git a/XenAdmin/Dialogs/NetworkingPropertiesPage.cs b/XenAdmin/Dialogs/NetworkingPropertiesPage.cs
@@ -41,7 +41,7 @@
 
 namespace XenAdmin.Dialogs
 {
-    public partial class NetworkingPropertiesPage : UserControl, VerticalTabs.VerticalTab
+    public partial class NetworkingPropertiesPage : UserControl, VerticalTabs.IVerticalTab
     {
         public enum Type { PRIMARY, PRIMARY_WITH_HA, SECONDARY };
 

diff --git a/XenAdmin/Dialogs/OptionsPages/ConfirmationOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/ConfirmationOptionsPage.cs
@@ -81,7 +81,7 @@ public void Save()
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public override string Text
         {

diff --git a/XenAdmin/Dialogs/OptionsPages/ConnectionOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/ConnectionOptionsPage.cs
@@ -263,7 +263,7 @@ public void Save()
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public override string Text
         {

diff --git a/XenAdmin/Dialogs/OptionsPages/ConsolesOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/ConsolesOptionsPage.cs
@@ -181,7 +181,7 @@ public void Save()
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public override string Text
         {

diff --git a/XenAdmin/Dialogs/OptionsPages/DisplayOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/DisplayOptionsPage.cs
@@ -81,7 +81,7 @@ public void Save()
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public override string Text
         {

diff --git a/XenAdmin/Dialogs/OptionsPages/IOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/IOptionsPage.cs
@@ -36,7 +36,7 @@
 
 namespace XenAdmin.Dialogs.OptionsPages
 {
-    interface IOptionsPage : VerticalTabs.VerticalTab
+    interface IOptionsPage : VerticalTabs.IVerticalTab
     {
         void Save();
     }

diff --git a/XenAdmin/Dialogs/OptionsPages/PluginOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/PluginOptionsPage.cs
@@ -250,7 +250,7 @@ private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 
         #endregion
 
-        #region Implementation of VerticalTab
+        #region Implementation of IVerticalTab
 
         public override string Text { get { return Messages.PLUGINS; } }
 

diff --git a/XenAdmin/Dialogs/OptionsPages/SaveAndRestoreOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/SaveAndRestoreOptionsPage.cs
@@ -233,7 +233,7 @@ public void Save()
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public override string Text
         {

diff --git a/XenAdmin/Dialogs/OptionsPages/SecurityOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/SecurityOptionsPage.cs
@@ -84,7 +84,7 @@ public void Save()
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public override string Text
         {

diff --git a/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.cs
@@ -108,7 +108,7 @@ private bool IsCheckForUpdatesRequired()
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public override string Text
         {

diff --git a/XenAdmin/Dialogs/PvsCacheConfigurationDialog.cs b/XenAdmin/Dialogs/PvsCacheConfigurationDialog.cs
@@ -59,7 +59,7 @@ public PvsCacheConfigurationDialog(IXenConnection connection)
             this.connection.Cache.RegisterCollectionChanged<PVS_site>(PvsSiteCollectionChanged);
         }
 
-        protected override string GetTabTitle(VerticalTabs.VerticalTab verticalTab)
+        protected override string GetTabTitle(VerticalTabs.IVerticalTab verticalTab)
         {
             PvsCacheConfigurationPage page = verticalTab as PvsCacheConfigurationPage;
             if (page != null)

diff --git a/XenAdmin/Dialogs/VerticallyTabbedDialog.cs b/XenAdmin/Dialogs/VerticallyTabbedDialog.cs
@@ -63,17 +63,17 @@ private void Init()
                 blueBorder.BackColor = SystemColors.Control;
         }
 
-        public VerticalTabs.VerticalTab[] Tabs
+        public VerticalTabs.IVerticalTab[] Tabs
         {
-            get { return verticalTabs.Items.Cast<VerticalTabs.VerticalTab>().ToArray(); }
+            get { return verticalTabs.Items.Cast<VerticalTabs.IVerticalTab>().ToArray(); }
         }
 
-        public VerticalTabs.VerticalTab SelectedTab
+        public VerticalTabs.IVerticalTab SelectedTab
         {
-            get { return verticalTabs.SelectedItem as VerticalTabs.VerticalTab; }
+            get { return verticalTabs.SelectedItem as VerticalTabs.IVerticalTab; }
         }
 
-        protected void SelectPage(VerticalTabs.VerticalTab page)
+        protected void SelectPage(VerticalTabs.IVerticalTab page)
         {
             if (page == null || !verticalTabs.Items.Contains(page))
                 return;
@@ -87,7 +87,7 @@ private void verticalTabs_SelectedIndexChanged(object sender, EventArgs e)
             if (sender == null)
                 return;
 
-            VerticalTabs.VerticalTab editPage = listBox.SelectedItem as VerticalTabs.VerticalTab;
+            VerticalTabs.IVerticalTab editPage = listBox.SelectedItem as VerticalTabs.IVerticalTab;
             if (editPage == null)
                 return;
 
@@ -108,7 +108,7 @@ private void verticalTabs_SelectedIndexChanged(object sender, EventArgs e)
                 }
         }
 
-        protected virtual string GetTabTitle(VerticalTabs.VerticalTab verticalTab)
+        protected virtual string GetTabTitle(VerticalTabs.IVerticalTab verticalTab)
         {
             return verticalTab != null ? verticalTab.Text : String.Empty;
         }
@@ -123,11 +123,11 @@ private void ContentPanel_ControlAdded(object sender, ControlEventArgs e)
             if (!DesignMode)
                 return;
 
-            VerticalTabs.VerticalTab verticalTab = e.Control as VerticalTabs.VerticalTab;
+            VerticalTabs.IVerticalTab verticalTab = e.Control as VerticalTabs.IVerticalTab;
             if (verticalTab == null)
                 return;
 
-            foreach (VerticalTabs.VerticalTab vt in verticalTabs.Items)
+            foreach (VerticalTabs.IVerticalTab vt in verticalTabs.Items)
                 if(vt == verticalTab)
                     return;
 
@@ -142,7 +142,7 @@ private void ContentPanel_ControlRemoved(object sender, ControlEventArgs e)
             if (!DesignMode)
                 return;
 
-            VerticalTabs.VerticalTab verticalTab = e.Control as VerticalTabs.VerticalTab;
+            VerticalTabs.IVerticalTab verticalTab = e.Control as VerticalTabs.IVerticalTab;
             if (verticalTab == null)
                 return;
 

diff --git a/XenAdmin/SettingsPanels/BootOptionsEditPage.cs b/XenAdmin/SettingsPanels/BootOptionsEditPage.cs
@@ -135,7 +135,7 @@ public void SetXenObjects(IXenObject orig, IXenObject clone)
 
 		#endregion
 
-		#region VerticalTabs.VerticalTab implementation
+		#region VerticalTabs.IVerticalTab implementation
 
 		public String SubText
 		{

diff --git a/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs b/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs
@@ -129,7 +129,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public String SubText
         {

diff --git a/XenAdmin/SettingsPanels/GpuEditPage.cs b/XenAdmin/SettingsPanels/GpuEditPage.cs
@@ -129,7 +129,7 @@ public bool HasChanged
             }
         }
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public string SubText
         {

diff --git a/XenAdmin/SettingsPanels/IEditPage.cs b/XenAdmin/SettingsPanels/IEditPage.cs
@@ -31,14 +31,13 @@
 
 using System;
 using XenAdmin.Actions;
-using System.Drawing;
 using XenAdmin.Controls;
 using XenAPI;
-using System.ComponentModel;
+
 
 namespace XenAdmin.SettingsPanels
 {
-    public interface IEditPage : VerticalTabs.VerticalTab
+    public interface IEditPage : VerticalTabs.IVerticalTab
     {
         /** Each page's SaveSettings() can do two things:
          *    1) Edit the cloned XenObject (which is a clone of the one in the cache)

diff --git a/XenAdmin/SettingsPanels/LivePatchingEditPage.cs b/XenAdmin/SettingsPanels/LivePatchingEditPage.cs
@@ -104,7 +104,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public string SubText
         {

diff --git a/XenAdmin/SettingsPanels/NetworkOptionsEditPage.cs b/XenAdmin/SettingsPanels/NetworkOptionsEditPage.cs
@@ -104,7 +104,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public string SubText
         {

diff --git a/XenAdmin/SettingsPanels/PoolGpuEditPage.cs b/XenAdmin/SettingsPanels/PoolGpuEditPage.cs
@@ -76,7 +76,7 @@ public bool EnableIntegratedGpuOnNextReboot
             }
         }
 
-        #region Implementation of VerticalTab
+        #region Implementation of IVerticalTab
 
         public override string Text
         {

diff --git a/XenAdmin/SettingsPanels/SecurityEditPage.cs b/XenAdmin/SettingsPanels/SecurityEditPage.cs
@@ -100,7 +100,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
         public string SubText
         {

diff --git a/XenAdmin/SettingsPanels/VMEnlightenmentEditPage.cs b/XenAdmin/SettingsPanels/VMEnlightenmentEditPage.cs
@@ -49,7 +49,7 @@ public VMEnlightenmentEditPage()
             InitializeComponent();
         }
 
-        #region Implementation of VerticalTab
+        #region Implementation of IVerticalTab
 
         public override string Text
         {

diff --git a/XenAdmin/SettingsPanels/VMHAEditPage.cs b/XenAdmin/SettingsPanels/VMHAEditPage.cs
@@ -94,7 +94,7 @@ public VerticalTabs VerticalTabs
             }
 		}
 
-		#region VerticalTabs.VerticalTab implementation
+		#region VerticalTabs.IVerticalTab implementation
 
 		public String SubText
         {

diff --git a/XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.cs b/XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.cs
@@ -349,7 +349,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
 
         public string SubText

diff --git a/XenAdmin/SettingsPanels/Wlb/WlbAutomationPage.cs b/XenAdmin/SettingsPanels/Wlb/WlbAutomationPage.cs
@@ -355,7 +355,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
 
         public string SubText

diff --git a/XenAdmin/SettingsPanels/Wlb/WlbHostExclusionPage.cs b/XenAdmin/SettingsPanels/Wlb/WlbHostExclusionPage.cs
@@ -191,7 +191,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
 
         public string SubText

diff --git a/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.cs b/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.cs
@@ -168,7 +168,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
 
         public string SubText

diff --git a/XenAdmin/SettingsPanels/Wlb/WlbOptimizationModePage.cs b/XenAdmin/SettingsPanels/Wlb/WlbOptimizationModePage.cs
@@ -203,7 +203,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
 
         public string SubText

diff --git a/XenAdmin/SettingsPanels/Wlb/WlbThresholdsPage.cs b/XenAdmin/SettingsPanels/Wlb/WlbThresholdsPage.cs
@@ -193,7 +193,7 @@ public bool HasChanged
 
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
 
 
         public string SubText

diff --git a/XenAdmin/Wizards/GenericPages/NewVMGroupVMsPageBase.cs b/XenAdmin/Wizards/GenericPages/NewVMGroupVMsPageBase.cs
@@ -78,7 +78,7 @@ public NewVMGroupVMsPageBase()
         public abstract bool HasChanged { get; }
         #endregion
 
-        #region VerticalTab Members
+        #region IVerticalTab Members
         public abstract string SubText { get; }
         public abstract Image Image { get; }
         #endregion

diff --git a/XenAdminTests/DialogTests/VerticallyTabbedDialogTest.cs b/XenAdminTests/DialogTests/VerticallyTabbedDialogTest.cs
@@ -73,7 +73,7 @@ protected override void RunAfter()
             }
         }
 
-        private string GetNames(VerticalTabs.VerticalTab[] items)
+        private string GetNames(VerticalTabs.IVerticalTab[] items)
         {
             return string.Join(", ", (from t in items select t.Text).ToArray());
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ public bool HasChanged @@
             }
-            #region VerticalTab Members
+            #region IVerticalTab Members
             public string SubText
             {
@@ Expand Down @@