From 82d7ce9c6f3444aaae35be4ed40000199573236d Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 19 Dec 2018 15:06:13 -0800 Subject: [PATCH] Simplify as suggested by IDE --- .../VersionManagement/WebRequestHandler.cs | 31 ++++--------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/MatterControlLib/VersionManagement/WebRequestHandler.cs b/MatterControlLib/VersionManagement/WebRequestHandler.cs index 09923309f..1942dae91 100644 --- a/MatterControlLib/VersionManagement/WebRequestHandler.cs +++ b/MatterControlLib/VersionManagement/WebRequestHandler.cs @@ -105,29 +105,19 @@ namespace MatterHackers.MatterControl.VersionManagement //This gets called after failure or success protected void OnRequestComplete() { - if (RequestComplete != null) - { - RequestComplete(this, null); - } + RequestComplete?.Invoke(this, null); } protected void OnRequestFailed(JsonResponseDictionary responseValues) { - if (RequestFailed != null) - { - RequestFailed(this, new ResponseErrorEventArgs() { ResponseValues = responseValues }); - } + RequestFailed?.Invoke(this, new ResponseErrorEventArgs() { ResponseValues = responseValues }); ApplicationController.WebRequestFailed?.Invoke(); } protected void OnRequestSuceeded(ResponseType responseItem) { - EventHandler> tempHandler = RequestSucceeded; - if (tempHandler != null) - { - tempHandler(this, new ResponseSuccessEventArgs() { ResponseItem = responseItem }); - } + RequestSucceeded?.Invoke(this, new ResponseSuccessEventArgs() { ResponseItem = responseItem }); ApplicationController.WebRequestSucceeded?.Invoke(); } @@ -264,26 +254,17 @@ namespace MatterHackers.MatterControl.VersionManagement //This gets called after failure or success protected void OnRequestComplete() { - if (RequestComplete != null) - { - RequestComplete(this, null); - } + RequestComplete?.Invoke(this, null); } protected void OnRequestFailed(JsonResponseDictionary responseValues) { - if (RequestFailed != null) - { - RequestFailed(this, new ResponseErrorEventArgs() { ResponseValues = responseValues }); - } + RequestFailed?.Invoke(this, new ResponseErrorEventArgs() { ResponseValues = responseValues }); } protected void OnRequestSuceeded() { - if (RequestSucceeded != null) - { - RequestSucceeded(this, null); - } + RequestSucceeded?.Invoke(this, null); } protected virtual void ProcessResponse(object sender, RunWorkerCompletedEventArgs e) {