Changeset 2026 for trunk/sources

Timestamp:

06/05/09 14:43:37 (15 years ago)

Author:

aleitner

Message:

Drag'n'Drop for changing group (also subgroup) for client (#626)

Location:

trunk/sources/HeuristicLab.Hive.Server.Console/3.2

Files:

• AddJobForm.cs (modified) (3 diffs)
• HiveServerManagementConsole.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/AddJobForm.cs

@@ -33 +33 @@
 using HeuristicLab.Hive.JobBase;
 using HeuristicLab.Core;
+using System.ServiceModel;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -58 +59 @@
 
     private void AddJob() {
+      try {
+
       jobManager =
         ServiceLocator.GetJobManager();
@@ -74 +77 @@
       foreach (KeyValuePair<Guid, string> kvp in clients) {
         lbGroupsOut.Items.Add(kvp.Value + " (" + kvp.Key + ")");
+      }
+      }
+      catch (FaultException fe) {
+        MessageBox.Show(fe.Message);
       }
 

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

@@ -32 +32 @@
 using HeuristicLab.Hive.Contracts;
 using System.Threading;
+using System.ServiceModel;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -67 +68 @@
     private IClientManager ClientManager {
       get {
-        return ServiceLocator.GetClientManager();
+        try {
+          return ServiceLocator.GetClientManager();
+        }
+        catch (FaultException ex) {
+          MessageBox.Show(ex.Message);
+        }
+        return null;
       }
     }
@@ -161 +168 @@
           TreeNode dropNode = (sender as TreeView).GetNodeAt(dropLocation);
           if (((ClientGroup)dropNode.Tag).Id != Guid.Empty) {
-            List<ClientInfo> clients = new List<ClientInfo>();
+            Dictionary<ClientInfo, Guid> clients = new Dictionary<ClientInfo, Guid>();
             foreach (ListViewItem lvi in lvClientControl.SelectedItems) {
-              clients.Add((ClientInfo)lvi.Tag);
+              Guid groupId = Guid.Empty;
+              foreach (ListViewGroup lvg in lvClientGroups) {
+                if (lvi.Group.Header == ((ClientGroup)lvg.Tag).Name) {
+                  groupId = ((ClientGroup)lvg.Tag).Id;
+                }
+              }
+              clients.Add((ClientInfo)lvi.Tag, groupId);
             }
             ChangeGroup(clients, ((ClientGroup)dropNode.Tag).Id);
@@ -173 +186 @@
     }
 
-    private void ChangeGroup(List<ClientInfo> clients, Guid clientgroupID) {
+    private void ChangeGroup(Dictionary<ClientInfo, Guid> clients, Guid clientgroupID) {
       IClientManager clientManager = ServiceLocator.GetClientManager();
-      Guid groupId = ((ClientGroup)currentGroupNode.Tag).Id;
-      foreach (ClientInfo client in clients) {
-        if (groupId != Guid.Empty) {
-          Response resp = clientManager.DeleteResourceFromGroup(groupId, client.Id);
-        }
-        clientManager.AddResourceToGroup(clientgroupID, client);
+      foreach (KeyValuePair<ClientInfo, Guid> client in clients) {
+        if (client.Key.Id != Guid.Empty) {
+          Response resp = clientManager.DeleteResourceFromGroup(client.Value, client.Key.Id);
+        }
+        clientManager.AddResourceToGroup(clientgroupID, client.Key);
       }
     }
@@ -230 +242 @@
       #region Job
       ResponseList<Job> jobsOld = jobs;
-      IJobManager jobManager =
-          ServiceLocator.GetJobManager();
-
-      jobs = jobManager.GetAllJobs();
-
-      IDictionary<int, Job> jobsOldHelp;
-      CloneList(jobsOld, out jobsOldHelp);
-
-      GetDelta(jobsOld.List, jobsOldHelp);
+      try {
+        IJobManager jobManager =
+                ServiceLocator.GetJobManager();
+
+        jobs = jobManager.GetAllJobs();
+
+        IDictionary<int, Job> jobsOldHelp;
+        CloneList(jobsOld, out jobsOldHelp);
+
+        GetDelta(jobsOld.List, jobsOldHelp);
+
+      }
+      catch (FaultException fe) {
+        MessageBox.Show(fe.Message);
+      }
 
       #endregion
@@ -252 +270 @@
 
     /// <summary>
-    /// Adds jobs to ListView and TreeView
+    /// Adds Exceptionobs to ListView and TreeView
     /// </summary>
     private void AddJobs() {
@@ -310 +328 @@
     }
 
+    List<ListViewGroup> lvClientGroups;
     private void AddClients() {
+      lvClientGroups = new List<ListViewGroup>();
       clientList.Clear();
       tvClientControl.Nodes.Clear();
-
-      ResponseList<ClientGroup> clientGroups = ClientManager.GetAllClientGroups();
-
-      foreach (ClientGroup cg in clientGroups.List) {
-        AddClientOrGroup(cg, null);
-      }
-
-      if (currentGroupNode != null) {
-        lvClientControl.Items.Clear();
-        lvClientControl.Groups.Clear();
-        AddGroupsToListView(currentGroupNode);
-      }
-      tvClientControl.ExpandAll();
+      try {
+        ResponseList<ClientGroup> clientGroups = ClientManager.GetAllClientGroups();
+
+        foreach (ClientGroup cg in clientGroups.List) {
+          AddClientOrGroup(cg, null);
+        }
+
+        if (currentGroupNode != null) {
+          lvClientControl.Items.Clear();
+          lvClientControl.Groups.Clear();
+          AddGroupsToListView(currentGroupNode);
+        }
+        tvClientControl.ExpandAll();
+
+      }
+      catch (FaultException fe) {
+        MessageBox.Show(fe.Message);
+      }
     }
 
@@ -338 +363 @@
       }
       lvClientControl.Groups.Add(lvg);
+      lvg.Tag = clientGroup;
+      lvClientGroups.Add(lvg);
       foreach (Resource resource in clientGroup.Resources) {
         if (resource is ClientInfo) {
@@ -382 +409 @@
         ListViewGroup lvg = new ListViewGroup(node.Text, HorizontalAlignment.Left);
         lvClientControl.Groups.Add(lvg);
+        lvg.Tag = node.Tag;
         foreach (ListViewItem item in clientList[((ClientGroup)node.Tag).Id]) {
           item.Group = lvg;