Changeset 16095

Timestamp:

08/29/18 16:45:24 (6 years ago)

Author:

jkarder

Message:

#2839: worked on hive project management

• removed usage of null-conditional operator

Location:

branches/2839_HiveProjectManagement

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (2 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

@@ -436 +436 @@
         }
         treeView.Nodes.Add(ungroupedGroupNode);
-      } else {
-        ungroupedGroupNode?.Nodes.Clear();
+      } else if (ungroupedGroupNode != null) {
+        ungroupedGroupNode.Nodes.Clear();
       }
 

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -338 +338 @@
 
       foreach (var r in resources) {
-        r.ParentResourceId = targetResource?.Id;
+        r.ParentResourceId = targetResource != null ? targetResource.Id : (Guid?)null;
       }
 
@@ -381 +381 @@
       var resources = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IEnumerable<Resource>;
       var targetNode = treeView.GetNodeAt(treeView.PointToClient(new Point(e.X, e.Y)));
-      var targetResource = targetNode?.Tag as Resource;
+      var targetResource = (targetNode != null ? targetNode.Tag : null) as Resource;
 
       if (!IsAdmin()
@@ -637 +637 @@
           n.ForeColor = offlineColor;
           if (s.LastHeartbeat.HasValue)
-            n.Text += " [" + s.LastHeartbeat?.ToString("g") + "]";
+            n.Text += " [" + (s.LastHeartbeat != null ? s.LastHeartbeat.Value.ToString("g") : null) + "]";
         }
       } else {

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -299 +299 @@
           || newIncludedResources.Contains(checkedResource)) {
           e.Cancel = true;
-          ExtractStatistics((Resource)resourcesTreeView.SelectedNode?.Tag);
+
+          var selectedNode = resourcesTreeView.SelectedNode;
+          var selectedResource = (Resource)(selectedNode != null ? selectedNode.Tag : null);
+
+          ExtractStatistics(selectedResource);
         }
       }
@@ -814 +818 @@
     public event EventHandler SelectedProjectChanged;
     private void OnSelectedProjectChanged() {
-      SelectedProjectChanged?.Invoke(this, EventArgs.Empty);
+      var handler = SelectedProjectChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
     public event EventHandler AssignedResourcesChanged;
     private void OnAssignedResourcesChanged() {
-      AssignedResourcesChanged?.Invoke(this, EventArgs.Empty);
+      var handler = AssignedResourcesChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
     public event EventHandler ProjectsTreeViewDoubleClicked;
     private void OnProjectsTreeViewDoubleClicked() {
-      ProjectsTreeViewDoubleClicked?.Invoke(this, EventArgs.Empty);
+      var handler = ProjectsTreeViewDoubleClicked;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
     #endregion