Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1610 from MihaelaStoica/CA-242134

Browse Source 
CA-242134: Remove the OpenLicenseFileDialog class and its usage
This commit is contained in:
Gabor Apati-Nagy 2017-05-30 10:41:22 +01:00 committed by GitHub
commit 96e2e0c57a
3 changed files with 3 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs
View File

@ -171,25 +171,13 @@ namespace XenAdmin.Dialogs
ResetButtonEnablement();
return;
}
List<LicenseDataGridViewRow> 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<LicenseDataGridViewRow> 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<LicenseDataGridViewRow> 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();

111
XenAdmin/Dialogs/LicenseManager/OpenLicenseFileDialog.cs
View File

@ -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);
}
}
}
}

1
XenAdmin/XenAdmin.csproj
View File

@ -2968,7 +2968,6 @@
<Compile Include="Dialogs\LicenseManager\LicenseRowComparers\ExpiryComparer.cs" />
<Compile Include="Dialogs\LicenseManager\LicenseRowComparers\NameColumnComparer.cs" />
<Compile Include="Dialogs\LicenseManager\LicenseRowComparers\ProductColumnComparer.cs" />
<Compile Include="Dialogs\LicenseManager\OpenLicenseFileDialog.cs" />
<Compile Include="Dialogs\LicenseManager\SelectionVerifiers\CanUseLicenseServerVerifier.cs" />
<Compile Include="Dialogs\LicenseManager\SelectionVerifiers\HaOnVerifier.cs" />
<Compile Include="Dialogs\LicenseManager\SelectionVerifiers\LicenseSelectionVerifier.cs" />