nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify as suggested by IDE

Browse source
This commit is contained in:
John Lewin 2018-12-19 15:06:13 -08:00
parent 801363fe49
commit 82d7ce9c6f
1 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

31
MatterControlLib/VersionManagement/WebRequestHandler.cs
View file

@ -105,29 +105,19 @@ namespace MatterHackers.MatterControl.VersionManagement
//This gets called after failure or success //This gets called after failure or success
protected void OnRequestComplete() protected void OnRequestComplete()
{ {
if (RequestComplete != null) RequestComplete?.Invoke(this, null);
{
RequestComplete(this, null);
}
} }
protected void OnRequestFailed(JsonResponseDictionary responseValues) protected void OnRequestFailed(JsonResponseDictionary responseValues)
{ {
if (RequestFailed != null) RequestFailed?.Invoke(this, new ResponseErrorEventArgs() { ResponseValues = responseValues });
{
RequestFailed(this, new ResponseErrorEventArgs() { ResponseValues = responseValues });
}
ApplicationController.WebRequestFailed?.Invoke(); ApplicationController.WebRequestFailed?.Invoke();
} }
protected void OnRequestSuceeded(ResponseType responseItem) protected void OnRequestSuceeded(ResponseType responseItem)
{ {
EventHandler<ResponseSuccessEventArgs<ResponseType>> tempHandler = RequestSucceeded; RequestSucceeded?.Invoke(this, new ResponseSuccessEventArgs<ResponseType>() { ResponseItem = responseItem });
if (tempHandler != null)
{
tempHandler(this, new ResponseSuccessEventArgs<ResponseType>() { ResponseItem = responseItem });
}
ApplicationController.WebRequestSucceeded?.Invoke(); ApplicationController.WebRequestSucceeded?.Invoke();
} }
@ -264,26 +254,17 @@ namespace MatterHackers.MatterControl.VersionManagement
//This gets called after failure or success //This gets called after failure or success
protected void OnRequestComplete() protected void OnRequestComplete()
{ {
if (RequestComplete != null) RequestComplete?.Invoke(this, null);
{
RequestComplete(this, null);
}
} }
protected void OnRequestFailed(JsonResponseDictionary responseValues) protected void OnRequestFailed(JsonResponseDictionary responseValues)
{ {
if (RequestFailed != null) RequestFailed?.Invoke(this, new ResponseErrorEventArgs() { ResponseValues = responseValues });
{
RequestFailed(this, new ResponseErrorEventArgs() { ResponseValues = responseValues });
}
} }
protected void OnRequestSuceeded() protected void OnRequestSuceeded()
{ {
if (RequestSucceeded != null) RequestSucceeded?.Invoke(this, null);
{
RequestSucceeded(this, null);
}
} }
protected virtual void ProcessResponse(object sender, RunWorkerCompletedEventArgs e) protected virtual void ProcessResponse(object sender, RunWorkerCompletedEventArgs e)
{ {