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

Merge pull request #3126 from kc284/obsolete

Browse Source 
Stop using reflection for the creation of context menu builders; and some smaller corrections.
This commit is contained in:
Konstantina Chremmou 2023-04-11 13:26:00 +01:00 committed by GitHub
commit 601d615f52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
XenAdmin/Commands/Controls/ContextMenuBuilder.cs
View File

@ -30,17 +30,15 @@
using System;
using System.Collections.Generic;
using XenAPI;
using System.Windows.Forms;
using XenAdmin.Model;
using XenAdmin.Core;
using System.Reflection;
using System.Diagnostics;
using System.Collections.ObjectModel;
using System.Drawing;
using System.Diagnostics;
using System.Linq;
using System.Windows.Forms;
using XenAdmin.Core;
using XenAdmin.Dialogs;
using XenAdmin.Model;
using XenAdmin.Plugins;
using XenAPI;
namespace XenAdmin.Commands
@ -56,22 +54,41 @@ namespace XenAdmin.Commands
static ContextMenuBuilder()
{
List<Builder> list = new List<Builder>();
var list = new List<Builder>
{
new MixedPoolsAndStandaloneHosts(),
new MultiplePools(),
new MultipleDifferentXenObjectTypes(),
new MultipleSRs(),
new SingleVDI(),
new MultipleVDI(),
new SingleNetwork(),
new DisconnectedHosts(),
new MixedVMsAndTemplates(),
new MultipleAliveHosts(),
new SingleAliveHostInPool(),
new SingleAliveStandaloneHost(),
new MultipleHostsSomeDeadSomeAlive(),
new DeadHosts(),
new SinglePool(),
new SingleSnapshot(),
new SingleTemplate(),
new SingleVmAppliance(),
new MultipleVmAppliance(),
new SingleVM(),
new SingleSR(),
new SingleFolder(),
new MultipleTemplates(),
new MultipleSnapshots(),
new MultipleVMsInPool(),
new MultipleVMsOverMultiplePools(),
new MultipleFolders(),
new SingleTag(),
new MultipleTags(),
new SingleDockerContainer(),
new MultipleDockerContainers()
};
foreach (Type type in Assembly.GetCallingAssembly().GetTypes())
{
if (typeof(Builder).IsAssignableFrom(type) && !type.IsAbstract)
{
try
{
list.Add((Builder)Activator.CreateInstance(type));
}
catch (MissingMethodException)
{
}
}
}
Builders = new ReadOnlyCollection<Builder>(list);
}
@ -82,32 +99,8 @@ namespace XenAdmin.Commands
/// <param name="mainWindow">The main window command interface. This can be found on mainwindow.</param>
public ContextMenuBuilder(PluginManager pluginManager, IMainWindow mainWindow)
{
Util.ThrowIfParameterNull(pluginManager, "pluginManager");
Util.ThrowIfParameterNull(pluginManager, "mainWindow");
_pluginManager = pluginManager;
_mainWindow = mainWindow;
}
/// <summary>
/// Shows the context menu for the specified xen object at the current mouse location.
/// </summary>
/// <param name="xenObject">The xen object for which the context menu is required.</param>
public void Show(IXenObject xenObject)
{
Show(xenObject, Form.MousePosition);
}
/// <summary>
/// Shows the context menu for the specified xen object at the specified location.
/// </summary>
/// <param name="xenObject">The xen object for which the context menu is required.</param>
/// <param name="point">The location of the context menu.</param>
public void Show(IXenObject xenObject, Point point)
{
ContextMenuStrip menu = new ContextMenuStrip();
menu.Items.AddRange(Build(xenObject));
menu.Show(point);
_pluginManager = pluginManager ?? throw new ArgumentNullException(nameof(pluginManager));
_mainWindow = mainWindow ?? throw new ArgumentNullException(nameof(mainWindow));
}
/// <summary>
@ -127,7 +120,7 @@ namespace XenAdmin.Commands
/// <returns>The context menu items.</returns>
public ToolStripItem[] Build(SelectedItem selection)
{
return Build(new SelectedItem[] { selection });
return Build(new[] { selection });
}
/// <summary>
@ -137,12 +130,10 @@ namespace XenAdmin.Commands
/// <returns>The context menu items.</returns>
public ToolStripItem[] Build(IEnumerable<SelectedItem> selection)
{
Util.ThrowIfParameterNull(selection, "selection");
var selectionList = new SelectedItemCollection(selection ?? throw new ArgumentNullException(nameof(selection)));
foreach (Builder builder in Builders)
{
SelectedItemCollection selectionList = new SelectedItemCollection(selection);
if (builder.IsValid(selectionList))
{
ContextMenuItemCollection items = new ContextMenuItemCollection(_mainWindow, _pluginManager);
@ -155,7 +146,7 @@ namespace XenAdmin.Commands
}
}
return new ToolStripItem[0];
return Array.Empty<ToolStripItem>();
}
[Conditional("DEBUG")]
@ -184,14 +175,14 @@ namespace XenAdmin.Commands
string.Join("\n", usedKeys.Select(kvp => $"{kvp.Key} => {string.Join(", ", kvp.Value)}")));
}
#region Nested Classes
private abstract class Builder
{
public abstract void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items);
public abstract bool IsValid(SelectedItemCollection selection);
}
#region MixedPoolsAndStandaloneHosts class
private class MixedPoolsAndStandaloneHosts : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -231,10 +222,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultiplePools class
private class MultiplePools : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -263,10 +250,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleDifferentTypes
private class MultipleDifferentXenObjectTypes : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -309,10 +292,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleSRs
private class MultipleSRs : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -330,10 +309,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleVDI
private class SingleVDI : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -352,10 +327,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleVDI
private class MultipleVDI : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -372,10 +343,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleNetwork
private class SingleNetwork : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -392,10 +359,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region DisconnectedHosts
private class DisconnectedHosts : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -437,10 +400,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MixedVMsSnapshotsTemplates class
private class MixedVMsAndTemplates : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -482,10 +441,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleAliveHosts class
private class MultipleAliveHosts : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -521,16 +476,10 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleAliveHostInPool class
private class SingleAliveHostInPool : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
{
Host host = (Host)selection[0].XenObject;
items.AddIfEnabled(new NewVMCommand(mainWindow, selection));
items.AddIfEnabled(new NewSRCommand(mainWindow, selection));
items.AddIfEnabled(new ImportCommand(mainWindow, selection));
@ -578,16 +527,10 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleAliveStandaloneHost class
private class SingleAliveStandaloneHost : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
{
Host host = (Host)selection[0].XenObject;
items.AddIfEnabled(new NewVMCommand(mainWindow, selection));
items.AddIfEnabled(new NewSRCommand(mainWindow, selection));
items.AddIfEnabled(new ImportCommand(mainWindow, selection));
@ -634,10 +577,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleHostsSomeDeadSomeAlive class
private class MultipleHostsSomeDeadSomeAlive : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -670,10 +609,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region DeadHosts class
private class DeadHosts : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -708,10 +643,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SinglePool class
private class SinglePool : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -764,10 +695,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleSnapshot class
private class SingleSnapshot : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -793,10 +720,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleTemplate class
private class SingleTemplate : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -832,10 +755,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleVmAppliance class
private class SingleVmAppliance : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -859,10 +778,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region Multiple VMAppliance class
private class MultipleVmAppliance : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -877,10 +792,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleVM class
private class SingleVM : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -939,10 +850,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleSR class
private class SingleSR : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -968,10 +875,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleFolder class
private class SingleFolder : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -989,10 +892,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleVMs class
private abstract class MultipleVMs : Builder
{
public override bool IsValid(SelectedItemCollection selection)
@ -1015,10 +914,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleTemplates class
private class MultipleTemplates : Builder
{
public override bool IsValid(SelectedItemCollection selection)
@ -1048,10 +943,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleSnapshots class
private class MultipleSnapshots : Builder
{
public override bool IsValid(SelectedItemCollection selection)
@ -1080,10 +971,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleVMsInPool class
private class MultipleVMsInPool : MultipleVMs
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -1141,11 +1028,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleVMsOverMultiplePools class
private class MultipleVMsOverMultiplePools : MultipleVMs
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -1176,10 +1058,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleFolders class
private class MultipleFolders : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -1195,10 +1073,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleTag class
private class SingleTag : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -1218,10 +1092,6 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleTags class
private class MultipleTags : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
@ -1240,16 +1110,10 @@ namespace XenAdmin.Commands
}
}
#endregion
#region SingleDockerContainer class
private class SingleDockerContainer : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
{
DockerContainer vm = (DockerContainer)selection[0].XenObject;
items.AddIfEnabled(new StartDockerContainerCommand(mainWindow, selection));
items.AddIfEnabled(new StopDockerContainerCommand(mainWindow, selection));
items.AddIfEnabled(new PauseDockerContainerCommand(mainWindow, selection));
@ -1269,11 +1133,7 @@ namespace XenAdmin.Commands
}
}
#endregion
#region MultipleDockerContainers class
private abstract class MultipleDockerContainers : Builder
private class MultipleDockerContainers : Builder
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
{

76
XenModel/Utils/Util.cs
View File

@ -29,8 +29,6 @@
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.Xml;
@ -492,46 +490,6 @@ namespace XenAdmin
throw new ArgumentException(string.Format("{0} cannot have 0 length.", name), name);
}
/// <summary>
/// Loads the specified non-generic IEnumerable into a generic List&lt;T&gt;.
/// </summary>
/// <typeparam name="T">The type to convert each element to</typeparam>
/// <param name="input">The input non-generic IEnumerable.</param>
/// <returns>Generic List&lt;T&gt;</returns>
public static List<T> PopulateList<T>(IEnumerable input)
{
ThrowIfParameterNull(input, "input");
List<T> output = new List<T>();
foreach (T t in input)
{
output.Add(t);
}
return output;
}
/// <summary>
/// Gets a List that represents the specified IEnumerable. If the input isn't a List then one gets created by passing the input into
/// List's constructor. If the input is already a List then it is returned directly.
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="input">The input.</param>
/// <returns>A list for the specified enumerable</returns>
public static List<T> GetList<T>(IEnumerable<T> input)
{
if (input == null)
{
return null;
}
var list = input as List<T>;
if (list != null)
{
return list;
}
return new List<T>(input);
}
/// <summary>
/// Matches 1-65535 inclusive.
/// </summary>
@ -546,39 +504,5 @@ namespace XenAdmin
return 0 < port && port <= 65535;
}
public static string GetXmlNodeInnerText(XmlNode node, string xPath)
{
ThrowIfParameterNull(node, "node");
ThrowIfStringParameterNullOrEmpty(xPath, "xPath");
XmlNodeList nodes = node.SelectNodes(xPath);
if (nodes == null || nodes.Count == 0)
{
throw new InvalidOperationException("Node not found: " + xPath);
}
return nodes[0].InnerText;
}
/// <summary>
/// Get the first node with name 'value' and returns its innerText. Used for getting results of CGSL async actions.
/// </summary>
/// <param name="xml">The XML.</param>
/// <returns>The contents of the first node with name 'value'.</returns>
public static string GetContentsOfValueNode(string xml)
{
ThrowIfStringParameterNullOrEmpty(xml, "xml");
var doc = new XmlDocument();
doc.LoadXml(xml);
// If we've got this from an async task result, then it will be wrapped
// in a <value> element.
var nodes = doc.GetElementsByTagName("value");
return nodes.Count > 0 ? nodes[0].InnerText : null;
}
}
}