CP-14647: Intermediate check-in xenserver#4

stephen-turner · Nov 8, 2015 · ce609e3 · ce609e3
1 parent c667e51
commit ce609e3
Show file tree

Hide file tree

Showing 63 changed files with 62 additions and 30,324 deletions.
diff --git a/XenAdmin/Actions/SetCslgCredentialsAction.cs b/XenAdmin/Actions/SetCslgCredentialsAction.cs
diff --git a/XenAdmin/Actions/SetCslgCredentialsToPoolAction.cs b/XenAdmin/Actions/SetCslgCredentialsToPoolAction.cs
diff --git a/XenAdmin/Commands/DestroySRCommand.cs b/XenAdmin/Commands/DestroySRCommand.cs
@@ -41,7 +41,7 @@ namespace XenAdmin.Commands
     /// <summary>
     /// Destroys the selected SRs. Shows a confirmation dialog.
     /// </summary>
-    internal class DestroySRCommand : SRCommand
+    internal class DestroySRCommand : Command
     {
         /// <summary>
         /// Initializes a new instance of this Command. The parameter-less constructor is required in the derived

diff --git a/XenAdmin/Commands/DragDropIntoFolderCommand.cs b/XenAdmin/Commands/DragDropIntoFolderCommand.cs
@@ -77,12 +77,6 @@ private bool DraggedObjectsAreValid()
             {
                 Folder folder = obj as Folder;
 
-                // can't put StorageLink objects in folders.
-                if (obj is IStorageLinkObject)
-                {
-                    return false;
-                }
-
                 // if all items are already in the target folder then cancel.
                 if (GetItemsNotAlreadyInTargetFolder().Count == 0)
                 {

diff --git a/XenAdmin/Commands/DragDropTagCommand.cs b/XenAdmin/Commands/DragDropTagCommand.cs
@@ -67,14 +67,7 @@ protected override bool CanExecuteCore()
                 {
                     // can't tag folders.
                     if (xenObject is Folder)
-                    {
                         return false;
-                    }
-                    // can't tag StorageLink objects
-                    if(xenObject is IStorageLinkObject)
-                    {
-                        return false;
-                    }
                 }
 
                 return gt.Grouping.GroupingName == Messages.TAGS && !string.IsNullOrEmpty(gt.Group as string);

diff --git a/XenAdmin/Commands/ForgetSRCommand.cs b/XenAdmin/Commands/ForgetSRCommand.cs
@@ -41,7 +41,7 @@ namespace XenAdmin.Commands
     /// <summary>
     /// Forgets the selected SRs. Shows a confirmation dialog.
     /// </summary>
-    internal class ForgetSRCommand : SRCommand
+    internal class ForgetSRCommand : Command
     {
         /// <summary>
         /// Initializes a new instance of this Command. The parameter-less constructor is required if 

diff --git a/XenAdmin/Commands/NewSRCommand.cs b/XenAdmin/Commands/NewSRCommand.cs
@@ -68,14 +68,7 @@ public NewSRCommand(IMainWindow mainWindow, IXenConnection connection)
 
         protected override void ExecuteCore(SelectedItemCollection selection)
         {
-            if (selection.FirstIsStorageLink)
-            {
-                new NewSRWizard(null, null, (IStorageLinkObject)selection[0].XenObject).Show(Parent);
-            }
-            else
-            {
-                MainWindowCommandInterface.ShowPerConnectionWizard(selection[0].Connection, new NewSRWizard(selection[0].Connection));
-            }
+            MainWindowCommandInterface.ShowPerConnectionWizard(selection[0].Connection, new NewSRWizard(selection[0].Connection));
         }
 
         private static bool CanExecuteOnHost(Host host)

diff --git a/XenAdmin/Commands/SRCommand.cs b/XenAdmin/Commands/SRCommand.cs
diff --git a/XenAdmin/Commands/SelectedItemCollection.cs b/XenAdmin/Commands/SelectedItemCollection.cs
@@ -39,7 +39,6 @@
 using XenAPI;
 using XenAdmin.Core;
 using XenAdmin.Network;
-using XenAdmin.Network.StorageLink;
 
 namespace XenAdmin.Commands
 {
@@ -351,17 +350,6 @@ public bool FirstIsGroup
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether the first item is a StorageLink object.
-        /// </summary>
-        public bool FirstIsStorageLink
-        {
-            get
-            {
-                return First is IStorageLinkObject;
-            }
-        }
-
         /// <summary>
         /// Gets the connection of first item. If the collection is empty then null is returned.
         /// </summary>