Skip to content

Commit

Permalink
Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCen…
Browse files Browse the repository at this point in the history
…terLib) with XenCenterLib.

Signed-off-by: Konstantina Chremmou <[email protected]>
  • Loading branch information
kc284 committed Nov 30, 2017
1 parent 7f1ee0b commit fb84348
Show file tree
Hide file tree
Showing 128 changed files with 137 additions and 175 deletions.
2 changes: 1 addition & 1 deletion XenAdmin/Actions/GUIActions/ExportResourceReportAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
using XenAdmin.Core;
using System.IO;
using XenAdmin.Network;
using System.Threading;
using XenAPI;
using Microsoft.Reporting.WinForms;
using System.Collections.Generic;
using XenAdmin.XenSearch;
using System.Linq;
using System.Text;
using System.Diagnostics;
using XenCenterLib;

namespace XenAdmin.Actions
{
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Commands/ExportVMCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
using System.Windows.Forms;
using System.Drawing;
using XenAdmin.Actions;
using System.Collections.ObjectModel;
using XenCenterLib;
using System.IO;


Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/ConsoleView/ConsoleKeyHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using XenAdmin.Core;
using XenCenterLib;

namespace XenAdmin.ConsoleView
{
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/ConsoleView/RdpClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
using DotNetVnc;
using XenAdmin.Core;
using XenCenterLib;
using XenAdmin.RDP;

namespace XenAdmin.ConsoleView
Expand Down
1 change: 1 addition & 0 deletions XenAdmin/ConsoleView/VNCGraphicsClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
using DotNetVnc;
using XenAdmin.Core;
using System.Linq;
using XenCenterLib;

namespace XenAdmin.ConsoleView
{
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/ConsoleView/XSVNCScreen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
using XenAdmin.Dialogs;
using System.Security.Cryptography;
using XenAdmin.Network;

using XenCenterLib;
using Console = XenAPI.Console;
using Message = System.Windows.Forms.Message;
using Timer = System.Threading.Timer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using XenCenterLib;
using XenAdmin.Core;
using XenAPI;

Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Controls/ComboBoxes/CDChanger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
using System;
using XenAPI;
using XenAdmin.Actions;
using XenAdmin.Core;
using XenCenterLib;

namespace XenAdmin.Controls
{
Expand Down
6 changes: 3 additions & 3 deletions XenAdmin/Controls/ComboBoxes/ISODropDownBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
using XenAdmin.Core;
using XenAdmin.Network;
using XenAPI;

using XenCenterLib;

namespace XenAdmin.Controls
{
Expand Down Expand Up @@ -204,7 +204,7 @@ private void AddSR(ToStringWrapper<SR> srWrapper)
}
vdis.Sort(new Comparison<ToStringWrapper<VDI>>(delegate(ToStringWrapper<VDI> object1, ToStringWrapper<VDI> object2)
{
return Core.StringUtility.NaturalCompare(object1.item.Name(), object2.item.Name());
return StringUtility.NaturalCompare(object1.item.Name(), object2.item.Name());
}));

Host host = srWrapper.item.GetStorageHost();
Expand Down Expand Up @@ -234,7 +234,7 @@ private void AddSR(ToStringWrapper<SR> srWrapper)
}
items.Sort(new Comparison<ToStringWrapper<VDI>>(delegate(ToStringWrapper<VDI> object1, ToStringWrapper<VDI> object2)
{
return Core.StringUtility.NaturalCompare(object1.item.Name(), object2.item.Name());
return StringUtility.NaturalCompare(object1.item.Name(), object2.item.Name());
}));
}
}
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Controls/ComboBoxes/NonSelectableComboBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using XenAdmin.Core;
using XenCenterLib;


namespace XenAdmin.Controls
Expand Down
1 change: 1 addition & 0 deletions XenAdmin/Controls/ConnectionWrapperWithMoreStuff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
using System.Windows.Forms;
using XenAdmin.Network;
using XenAdmin.Core;
using XenCenterLib;

namespace XenAdmin.Controls
{
Expand Down
4 changes: 1 addition & 3 deletions XenAdmin/Controls/CustomDataGraph/DataEvent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@

using System;
using System.Collections.Generic;
using System.Drawing.Imaging;
using System.Text;
using System.Drawing;
using XenAPI;
using System.Drawing.Drawing2D;
using XenAdmin.Core;
using XenAdmin.XenSearch;
using XenCenterLib;


namespace XenAdmin.Controls.CustomDataGraph
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Controls/CustomDataGraph/DataKey.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@

using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Text;
using System.Windows.Forms;
using XenAdmin.Core;
using XenCenterLib;


namespace XenAdmin.Controls.CustomDataGraph
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Controls/CustomGridView/GridImageItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
using System.Text;
using System.Drawing;
using System.Windows.Forms;
using XenAdmin.Core;
using XenCenterLib;

namespace XenAdmin.Controls.CustomGridView
{
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Controls/CustomGridView/GridStringItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
using System.Text;
using System.Drawing;
using System.Windows.Forms;
using System.Runtime.InteropServices;
using System.Drawing.Text;
using XenCenterLib;
using XenAdmin.Core;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using XenAdmin.Core;
using XenCenterLib;

namespace XenAdmin.Controls.DataGridViewEx
{
Expand Down
4 changes: 1 addition & 3 deletions XenAdmin/Controls/FlickerFreeListBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@
using System.Text;
using System.Windows.Forms;
using System.Drawing;
using System.Reflection;
using System.Runtime.InteropServices;

using XenAdmin.Core;

using XenCenterLib;

namespace XenAdmin.Controls
{
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Controls/FlickerFreePanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
using System.Data;
using System.Text;
using System.Windows.Forms;
using XenAdmin.Core;
using XenCenterLib;

namespace XenAdmin.Controls
{
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Controls/ListViewColumnSorter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
using System;
using System.Collections;
using System.Windows.Forms;

using XenAdmin.Core;
using XenCenterLib;

namespace XenAdmin.Controls
{
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Controls/MainWindowControls/NavigationView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@
using System.Windows.Forms;

using XenAdmin.Commands;
using XenAdmin.Core;
using XenAdmin.Model;
using XenAdmin.Network;
using XenAdmin.XenSearch;

using XenCenterLib;
using XenAPI;

namespace XenAdmin.Controls.MainWindowControls
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Controls/NetworkingTab/NetworkList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,13 @@
using System.Text;
using System.Windows.Forms;
using XenAdmin.Commands;
using XenAdmin.Model;
using XenAPI;
using XenAdmin.Core;
using XenAdmin.Wizards;
using XenAdmin.Actions;
using XenAdmin.Dialogs;
using XenAdmin.Controls.DataGridViewEx;

using XenCenterLib;

namespace XenAdmin.Controls.NetworkingTab
{
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Controls/SRListBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
using XenAPI;
using XenAdmin.Wizards.NewSRWizard_Pages;
using XenAdmin.Core;

using XenCenterLib;

namespace XenAdmin.Controls
{
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Controls/SnapshotTreeView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
using System.Drawing.Drawing2D;
using System.Security.Permissions;
using System.Windows.Forms;
using XenAdmin.Controls;
using XenAdmin.Core;
using XenCenterLib;

using Message = System.Windows.Forms.Message;
using System.Runtime.InteropServices;
Expand Down
5 changes: 2 additions & 3 deletions XenAdmin/Controls/TreeViews/FlickerFreeTreeView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@
*/

using System;
using System.Drawing;
using System.Windows.Forms;
using XenAdmin.Core;
using System.Collections.Generic;
using XenAdmin.Network;
using XenAdmin.XenSearch;

using XenCenterLib;
using XenAPI;
using Message = System.Windows.Forms.Message;

Expand Down Expand Up @@ -83,7 +82,7 @@ protected override void OnAfterExpand(VirtualTreeViewEventArgs e)

protected override void WndProc(ref Message m)
{
if (m.Msg == Core.Win32.WM_ERASEBKGND)
if (m.Msg == Win32.WM_ERASEBKGND)
{
m.Result = IntPtr.Zero;
return;
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Controls/TreeViews/MultiSelectTreeView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@
using System.Windows.Forms;
using System.Drawing;
using System.Collections;
using System.Drawing.Design;
using System.ComponentModel;
using System.Threading;
using XenAdmin.Core;
using XenCenterLib;
using System.Runtime.InteropServices;

namespace XenAdmin.Controls
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Controls/XenSearch/QueryElement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
using XenAdmin.Core;
using XenAdmin.Network;
using XenAdmin.Model;

using XenCenterLib;

namespace XenAdmin.Controls.XenSearch
{
Expand Down
1 change: 1 addition & 0 deletions XenAdmin/Core/Clip.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
using System.Runtime.InteropServices;
using System.Threading;
using System.Windows.Forms;
using XenCenterLib;

namespace XenAdmin.Core
{
Expand Down
4 changes: 2 additions & 2 deletions XenAdmin/Core/HealthCheck.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
using XenAdmin.Actions;
using XenAPI;
using XenAdmin.Network;
using XenAdmin.Model;

using XenAdmin.Model;
using XenCenterLib;

namespace XenAdmin.Core
{
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Core/History.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
using XenAdmin.XenSearch;
using System.Drawing;
using XenAPI;

using XenCenterLib;

namespace XenAdmin.Core
{
Expand Down
1 change: 1 addition & 0 deletions XenAdmin/Core/Updates.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
using System.Windows.Forms;
using XenAdmin.Dialogs;
using System.Text;
using XenCenterLib;

namespace XenAdmin.Core
{
Expand Down
1 change: 1 addition & 0 deletions XenAdmin/Core/WebBrowser2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
using System.Runtime.InteropServices;
using System.Security.Permissions;
using System.Windows.Forms;
using XenCenterLib;

namespace XenAdmin.Core
{
Expand Down
1 change: 1 addition & 0 deletions XenAdmin/Dialogs/AddServerDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
using XenAdmin.Core;
using XenAdmin.Network;
using XenAdmin.TestResources;
using XenCenterLib;

namespace XenAdmin.Dialogs
{
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Dialogs/DownloadApplianceDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
using System.IO;
using System.Net;
using System.Windows.Forms;
using XenAdmin.Core;

using XenCenterLib;
using XenOvf;

namespace XenAdmin.Dialogs
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Dialogs/EvacuateHostDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
using XenAdmin.Wlb;
using XenAdmin.Commands;
using XenAdmin.Actions.VMActions;

using XenCenterLib;

namespace XenAdmin.Dialogs
{
Expand Down
3 changes: 1 addition & 2 deletions XenAdmin/Dialogs/ExportVMDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
using System.Windows.Forms;
using System.Data;
using System.Runtime.InteropServices;
using XenAdmin.Core;
using System.IO;
using XenCenterLib;


namespace XenAdmin.Dialogs
Expand Down
1 change: 1 addition & 0 deletions XenAdmin/Dialogs/GraphDetailsDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
using XenAdmin.Actions;
using XenAdmin.Controls.CustomDataGraph;
using XenAdmin.Core;
using XenCenterLib;


namespace XenAdmin.Dialogs
Expand Down
Loading

0 comments on commit fb84348

Please sign in to comment.