From 71600b20deaa1878b4f56e25d3d2fa2bb7bcc1ac Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Thu, 25 May 2017 16:29:27 +0100 Subject: [PATCH] CA-242134: Rename some of the classes and files, following the removal of the VMPP support Signed-off-by: Mihaela Stoica --- .../DataGridViewTextAndImageCell.cs | 2 +- XenAdmin/Core/VMGroup.cs | 4 +-- XenAdmin/Dialogs/DRConfigureDialog.cs | 2 +- .../HealthCheck/HealthCheckOverviewDialog.cs | 2 +- .../PolicyHistory.Designer.cs | 2 +- .../PolicyHistory.cs | 16 +++++----- .../PolicyHistory.ja.resx | 0 .../PolicyHistory.resx | 0 .../PolicyHistory.zh-CN.resx | 0 .../ScheduledSnapshotsDialog.Designer.cs} | 15 +++++----- .../ScheduledSnapshotsDialog.cs} | 16 +++++----- .../ScheduledSnapshotsDialog.ja.resx} | 2 +- .../ScheduledSnapshotsDialog.resx} | 4 +-- .../ScheduledSnapshotsDialog.zh-CN.resx} | 2 +- .../VMAppliances/VMAppliancesDialog.cs | 2 +- XenAdmin/XenAdmin.csproj | 30 +++++++++---------- XenAdminTests/DialogTests/DialogsForPool.cs | 8 ++--- 17 files changed, 53 insertions(+), 54 deletions(-) rename XenAdmin/{Dialogs/VMProtectionRecovery => Controls}/DataGridViewTextAndImageCell.cs (96%) rename XenAdmin/Dialogs/{VMProtectionRecovery => ScheduledSnapshots}/PolicyHistory.Designer.cs (97%) rename XenAdmin/Dialogs/{VMProtectionRecovery => ScheduledSnapshots}/PolicyHistory.cs (96%) rename XenAdmin/Dialogs/{VMProtectionRecovery => ScheduledSnapshots}/PolicyHistory.ja.resx (100%) rename XenAdmin/Dialogs/{VMProtectionRecovery => ScheduledSnapshots}/PolicyHistory.resx (100%) rename XenAdmin/Dialogs/{VMProtectionRecovery => ScheduledSnapshots}/PolicyHistory.zh-CN.resx (100%) rename XenAdmin/Dialogs/{VMProtectionRecovery/VMProtectionPoliciesDialog.Designer.cs => ScheduledSnapshots/ScheduledSnapshotsDialog.Designer.cs} (95%) rename XenAdmin/Dialogs/{VMProtectionRecovery/VMProtectionPoliciesDialog.cs => ScheduledSnapshots/ScheduledSnapshotsDialog.cs} (95%) rename XenAdmin/Dialogs/{VMProtectionRecovery/VMProtectionPoliciesDialog.ja.resx => ScheduledSnapshots/ScheduledSnapshotsDialog.ja.resx} (97%) rename XenAdmin/Dialogs/{VMProtectionRecovery/VMProtectionPoliciesDialog.resx => ScheduledSnapshots/ScheduledSnapshotsDialog.resx} (97%) rename XenAdmin/Dialogs/{VMProtectionRecovery/VMProtectionPoliciesDialog.zh-CN.resx => ScheduledSnapshots/ScheduledSnapshotsDialog.zh-CN.resx} (97%) diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/DataGridViewTextAndImageCell.cs b/XenAdmin/Controls/DataGridViewTextAndImageCell.cs similarity index 96% rename from XenAdmin/Dialogs/VMProtectionRecovery/DataGridViewTextAndImageCell.cs rename to XenAdmin/Controls/DataGridViewTextAndImageCell.cs index 915061cfe..2628f11a3 100644 --- a/XenAdmin/Dialogs/VMProtectionRecovery/DataGridViewTextAndImageCell.cs +++ b/XenAdmin/Controls/DataGridViewTextAndImageCell.cs @@ -35,7 +35,7 @@ using System.Text; using System.Windows.Forms; using System.Drawing; -namespace XenAdmin.Dialogs.VMProtectionRecovery +namespace XenAdmin.Controls { public class DataGridViewTextAndImageCell : DataGridViewTextBoxCell { diff --git a/XenAdmin/Core/VMGroup.cs b/XenAdmin/Core/VMGroup.cs index b1d673ad6..cf13fc96f 100644 --- a/XenAdmin/Core/VMGroup.cs +++ b/XenAdmin/Core/VMGroup.cs @@ -33,8 +33,8 @@ using System; using System.Collections.Generic; using XenAdmin.Actions; using XenAdmin.Dialogs; +using XenAdmin.Dialogs.ScheduledSnapshots; using XenAdmin.Dialogs.VMAppliances; -using XenAdmin.Dialogs.VMProtection_Recovery; using XenAdmin.Network; using XenAdmin.Wizards; using XenAdmin.Wizards.NewPolicyWizard; @@ -182,7 +182,7 @@ namespace XenAdmin.Core internal static XenDialogBase ManageGroupsDialog(Pool pool) { - return typeof(T) == typeof(VMSS) ? (XenDialogBase)(new VMProtectionPoliciesDialog(pool)) : (XenDialogBase)(new VMAppliancesDialog(pool)); + return typeof(T) == typeof(VMSS) ? (XenDialogBase)(new ScheduledSnapshotsDialog(pool)) : (XenDialogBase)(new VMAppliancesDialog(pool)); } internal static bool FeaturePossible(IXenConnection connection) diff --git a/XenAdmin/Dialogs/DRConfigureDialog.cs b/XenAdmin/Dialogs/DRConfigureDialog.cs index 1616c09a1..cb02ab702 100644 --- a/XenAdmin/Dialogs/DRConfigureDialog.cs +++ b/XenAdmin/Dialogs/DRConfigureDialog.cs @@ -34,7 +34,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Drawing; using System.Windows.Forms; -using XenAdmin.Dialogs.VMProtectionRecovery; +using XenAdmin.Controls; using XenAPI; diff --git a/XenAdmin/Dialogs/HealthCheck/HealthCheckOverviewDialog.cs b/XenAdmin/Dialogs/HealthCheck/HealthCheckOverviewDialog.cs index 0c381a87d..69d66808f 100644 --- a/XenAdmin/Dialogs/HealthCheck/HealthCheckOverviewDialog.cs +++ b/XenAdmin/Dialogs/HealthCheck/HealthCheckOverviewDialog.cs @@ -37,7 +37,7 @@ using System.Linq; using System.Windows.Forms; using XenAdmin.Actions; using XenAdmin.Core; -using XenAdmin.Dialogs.VMProtectionRecovery; +using XenAdmin.Controls; using XenAdmin.Model; using XenAdmin.Network; using XenAPI; diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.Designer.cs b/XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.Designer.cs similarity index 97% rename from XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.Designer.cs rename to XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.Designer.cs index 8700c67c9..5e1d8b752 100644 --- a/XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.Designer.cs +++ b/XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.Designer.cs @@ -1,6 +1,6 @@ using XenAdmin.Controls.DataGridViewEx; -namespace XenAdmin.Dialogs.VMProtectionRecovery +namespace XenAdmin.Dialogs.ScheduledSnapshots { partial class PolicyHistory { diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.cs b/XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.cs similarity index 96% rename from XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.cs rename to XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.cs index 5240debe6..7121f0c57 100644 --- a/XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.cs +++ b/XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.cs @@ -30,17 +30,17 @@ */ using System; -using System.Windows.Forms; -using XenAdmin.Alerts; -using XenAPI; -using XenAdmin.Properties; -using System.ComponentModel; -using XenAdmin.Actions; using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using XenAdmin.Actions; +using XenAdmin.Alerts; +using XenAdmin.Controls; using XenAdmin.Core; +using XenAdmin.Properties; +using XenAPI; - -namespace XenAdmin.Dialogs.VMProtectionRecovery +namespace XenAdmin.Dialogs.ScheduledSnapshots { public partial class PolicyHistory : UserControl { diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.ja.resx b/XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.ja.resx similarity index 100% rename from XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.ja.resx rename to XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.ja.resx diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.resx b/XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.resx similarity index 100% rename from XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.resx rename to XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.resx diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.zh-CN.resx b/XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.zh-CN.resx similarity index 100% rename from XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.zh-CN.resx rename to XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.zh-CN.resx diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.Designer.cs b/XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.Designer.cs similarity index 95% rename from XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.Designer.cs rename to XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.Designer.cs index 0ede70b4b..635c20c8b 100644 --- a/XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.Designer.cs +++ b/XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.Designer.cs @@ -1,10 +1,9 @@ using XenAdmin.Controls.DataGridViewEx; using XenAdmin.Wizards.NewPolicyWizard; -using XenAPI; -namespace XenAdmin.Dialogs.VMProtection_Recovery +namespace XenAdmin.Dialogs.ScheduledSnapshots { - partial class VMProtectionPoliciesDialog + partial class ScheduledSnapshotsDialog { /// /// Required designer variable. @@ -32,7 +31,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VMProtectionPoliciesDialog)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScheduledSnapshotsDialog)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx(); this.NameColum = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -48,7 +47,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery this.buttonRunNow = new System.Windows.Forms.Button(); this.labelPolicyTitle = new System.Windows.Forms.Label(); this.buttonProperties = new System.Windows.Forms.Button(); - this.policyHistory1 = new XenAdmin.Dialogs.VMProtectionRecovery.PolicyHistory(); + this.policyHistory1 = new PolicyHistory(); this.label2 = new System.Windows.Forms.Label(); this.localServerTime1 = new XenAdmin.Wizards.NewPolicyWizard.LocalServerTime(); this.chevronButton1 = new XenAdmin.Controls.ChevronButton(); @@ -245,13 +244,13 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel4, 0, 3); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; // - // VMProtectionPoliciesDialog + // ScheduledSnapshotsDialog // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.buttonCancel; this.Controls.Add(this.tableLayoutPanel5); - this.Name = "VMProtectionPoliciesDialog"; + this.Name = "ScheduledSnapshotsDialog"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.Load += new System.EventHandler(this.VMProtectionPoliciesDialog_Load); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.VMProtectionPoliciesDialog_FormClosed); @@ -279,7 +278,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery protected System.Windows.Forms.Button buttonRunNow; protected System.Windows.Forms.Label labelPolicyTitle; protected System.Windows.Forms.Button buttonProperties; - protected XenAdmin.Dialogs.VMProtectionRecovery.PolicyHistory policyHistory1; + protected PolicyHistory policyHistory1; protected System.Windows.Forms.Label label2; protected LocalServerTime localServerTime1; protected XenAdmin.Controls.ChevronButton chevronButton1; diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.cs b/XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.cs similarity index 95% rename from XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.cs rename to XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.cs index 85d2d2dee..a150d9274 100644 --- a/XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.cs +++ b/XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.cs @@ -32,23 +32,23 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.Linq; using System.Windows.Forms; using XenAdmin.Actions; +using XenAdmin.Alerts; +using XenAdmin.Controls; +using XenAdmin.Core; using XenAdmin.Wizards.NewPolicyWizard; using XenAPI; -using XenAdmin.Core; -using XenAdmin.Dialogs.VMProtectionRecovery; -using XenAdmin.Alerts; -using System.Linq; -namespace XenAdmin.Dialogs.VMProtection_Recovery +namespace XenAdmin.Dialogs.ScheduledSnapshots { - public partial class VMProtectionPoliciesDialog: XenDialogBase + public partial class ScheduledSnapshotsDialog: XenDialogBase { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); public readonly Pool Pool; - public VMProtectionPoliciesDialog(Pool pool) + public ScheduledSnapshotsDialog(Pool pool) : base(pool.Connection) { Pool = pool; @@ -60,7 +60,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery policyHistory1.pool = pool; RefreshPoolTitle(pool); } - public VMProtectionPoliciesDialog() { } + public ScheduledSnapshotsDialog() { } public class PolicyRow : DataGridViewRow { diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.ja.resx b/XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.ja.resx similarity index 97% rename from XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.ja.resx rename to XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.ja.resx index 25707fb9c..f71b53bfe 100644 --- a/XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.ja.resx +++ b/XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.ja.resx @@ -829,7 +829,7 @@ System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - VMProtectionPoliciesDialog + ScheduledSnapshotsDialog XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.resx b/XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.resx similarity index 97% rename from XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.resx rename to XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.resx index 998ff97b7..203f616a4 100644 --- a/XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.resx +++ b/XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.resx @@ -1,4 +1,4 @@ - +