From 49be0ffadaacbe6780bb663009c9be6ff172a277 Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Fri, 26 May 2017 14:54:51 +0100 Subject: [PATCH] CA-242134: Remove the OpenLicenseFileDialog class and its usage Signed-off-by: Mihaela Stoica --- .../LicenseManagerController.cs | 18 +-- .../LicenseManager/OpenLicenseFileDialog.cs | 111 ------------------ XenAdmin/XenAdmin.csproj | 1 - 3 files changed, 3 insertions(+), 127 deletions(-) delete mode 100644 XenAdmin/Dialogs/LicenseManager/OpenLicenseFileDialog.cs diff --git a/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs b/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs index 64426895f..81984f931 100644 --- a/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs +++ b/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs @@ -171,25 +171,13 @@ namespace XenAdmin.Dialogs ResetButtonEnablement(); return; } - - List licenseRows = rowsChecked.ConvertAll(r => r as LicenseDataGridViewRow). - Where(lr => lr.CanUseLicenseServer).ToList(); - if(licenseRows.Count > 0) - { - AssignLicenseDialog ald = new AssignLicenseDialog(licenseRows.ConvertAll(r=>r.XenObject), + List licenseRows = rowsChecked.ConvertAll(r => r as LicenseDataGridViewRow); + AssignLicenseDialog ald = new AssignLicenseDialog(licenseRows.ConvertAll(r=>r.XenObject), licenseRows.First().LicenseServerAddress, licenseRows.First().LicenseServerPort, licenseRows.First().LicenseEdition); - ald.ShowDialog(View.Parent); - } - else - { - Debug.Assert(rowsChecked.Count == 1, "rowsChecked.Count == 1"); - List validRows = rowsChecked.ConvertAll(r => r as LicenseDataGridViewRow); - Debug.Assert(!validRows[0].CanUseLicenseServer, "Should not be able to use the license server"); - new OpenLicenseFileDialog(View.Parent, RowsToHosts(validRows)[0], Messages.INSTALL_LICENSE_KEY, false).ShowDialogAndRunAction(); - } + ald.ShowDialog(View.Parent); SummariseDisconnectedRows(rowsChecked); ResetButtonEnablement(); diff --git a/XenAdmin/Dialogs/LicenseManager/OpenLicenseFileDialog.cs b/XenAdmin/Dialogs/LicenseManager/OpenLicenseFileDialog.cs deleted file mode 100644 index 1b3cb1ebc..000000000 --- a/XenAdmin/Dialogs/LicenseManager/OpenLicenseFileDialog.cs +++ /dev/null @@ -1,111 +0,0 @@ -/* Copyright (c) Citrix Systems, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the - * following disclaimer in the documentation and/or other - * materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -using System; -using System.IO; -using System.Windows.Forms; -using XenAdmin.Actions; -using XenAPI; - -namespace XenAdmin.Dialogs -{ - public abstract class LicenseFileDialog - { - protected abstract bool CanRunAction(DialogResult result); - protected abstract void RunActions(); - } - - public class OpenLicenseFileDialog : LicenseFileDialog - { - private OpenFileDialog Dialog { get; set; } - private readonly IWin32Window parent; - private readonly Host host; - private readonly string title; - private readonly bool activateFreeLicense; - - public OpenLicenseFileDialog(IWin32Window parent, Host host, string title, bool activateFreeLicense) - { - this.parent = parent; - this.host = host; - this.title = title; - this.activateFreeLicense = activateFreeLicense; - Dialog = new OpenFileDialog(); - Dialog.Multiselect = false; - Dialog.Title = title; - Dialog.CheckFileExists = true; - Dialog.CheckPathExists = true; - Dialog.Filter = string.Format("{0} (*.xslic)|*.xslic|{1} (*.*)|*.*", Messages.XS_LICENSE_FILES, Messages.ALL_FILES); - Dialog.ShowHelp = true; - Dialog.HelpRequest += delegate { Help.HelpManager.Launch("LicenseKeyDialog"); }; - } - - public void Dispose() - { - Dialog.Dispose(); - } - - public void ShowDialogAndRunAction() - { - if(CanRunAction(Dialog.ShowDialog(parent))) - { - RunActions(); - } - } - - protected override bool CanRunAction(DialogResult result) - { - return result == DialogResult.OK && host.Connection.IsConnected; - } - - protected override void RunActions() - { - // Showing this dialog has the (undocumented) side effect of changing the working directory - // to that of the file selected. This means a handle to the directory persists, making - // it undeletable until the program exits, or the working dir moves on. So, save and - // restore the working dir... - string oldDir = String.Empty; - try - { - oldDir = Directory.GetCurrentDirectory(); - ApplyLicenseAction action = new ApplyLicenseAction(host.Connection, host, Dialog.FileName, activateFreeLicense); - using (var actionProgress = new ActionProgressDialog(action, ProgressBarStyle.Marquee)) - { - actionProgress.Text = title; - actionProgress.ShowDialog(parent); - } - } - finally - { - Directory.SetCurrentDirectory(oldDir); - } - } - } -} diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index 49e542cdd..8581b0a24 100644 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -2968,7 +2968,6 @@ -