Remove async modifiers from non-async methods
- Use Task.FromResult where needed
This commit is contained in:
parent
623f009182
commit
b110118e41
7 changed files with 11 additions and 11 deletions
|
|
@ -245,7 +245,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
|
|||
}
|
||||
}
|
||||
|
||||
public async override void RemoveFromCollection()
|
||||
public override void RemoveFromCollection()
|
||||
{
|
||||
libraryDataView.CurrentLibraryProvider.RemoveItem(ItemIndex);
|
||||
}
|
||||
|
|
@ -309,7 +309,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
|
|||
this.Invalidate();
|
||||
}
|
||||
|
||||
protected async override void RemoveThisFromPrintLibrary()
|
||||
protected override void RemoveThisFromPrintLibrary()
|
||||
{
|
||||
// TODO: The LibraryProvider does not need a printitemwrapper to remove an item! Why not an interger like the others?
|
||||
libraryDataView.CurrentLibraryProvider.RemoveItem(ItemIndex);
|
||||
|
|
|
|||
|
|
@ -508,7 +508,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
|
|||
SetEditButtonsStates();
|
||||
}
|
||||
|
||||
private async void SetEditButtonsStates()
|
||||
private void SetEditButtonsStates()
|
||||
{
|
||||
int selectedCount = libraryDataView.SelectedItems.Count;
|
||||
|
||||
|
|
|
|||
|
|
@ -208,11 +208,11 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
|
|||
return Path.GetFileNameWithoutExtension(currentDirectoryFiles[itemIndex]);
|
||||
}
|
||||
|
||||
public async override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int itemIndex)
|
||||
public override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int itemIndex)
|
||||
{
|
||||
string fileName = currentDirectoryFiles[itemIndex];
|
||||
|
||||
return new PrintItemWrapper(new DataStorage.PrintItem(GetPrintItemName(itemIndex), fileName), this.GetProviderLocator());
|
||||
return Task.FromResult(new PrintItemWrapper(new DataStorage.PrintItem(GetPrintItemName(itemIndex), fileName), this.GetProviderLocator()));
|
||||
}
|
||||
|
||||
public override LibraryProvider GetProviderForCollection(PrintItemCollection collection)
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
|
|||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public async override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int index)
|
||||
public override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int index)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
//return PrintHistoryData.Instance.GetPrintItemWrapper(index);
|
||||
|
|
|
|||
|
|
@ -167,9 +167,9 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
|
|||
QueueData.Instance.AddItem(item, indexToInsert);
|
||||
}
|
||||
|
||||
public async override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int index)
|
||||
public override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int index)
|
||||
{
|
||||
return QueueData.Instance.GetPrintItemWrapper(index);
|
||||
return Task.FromResult(QueueData.Instance.GetPrintItemWrapper(index));
|
||||
}
|
||||
|
||||
public override LibraryProvider GetProviderForCollection(PrintItemCollection collection)
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
|
|||
return new PrintItemCollection(provider.Name, provider.ProviderKey);
|
||||
}
|
||||
|
||||
public async override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int itemIndex)
|
||||
public override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int itemIndex)
|
||||
{
|
||||
throw new NotImplementedException("Print items are not allowed at the root level");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -302,11 +302,11 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
|
|||
return printItems[itemIndex].Name;
|
||||
}
|
||||
|
||||
public async override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int index)
|
||||
public override Task<PrintItemWrapper> GetPrintItemWrapperAsync(int index)
|
||||
{
|
||||
if (index >= 0 && index < printItems.Count)
|
||||
{
|
||||
return new PrintItemWrapper(printItems[index], this.GetProviderLocator());
|
||||
return Task.FromResult(new PrintItemWrapper(printItems[index], this.GetProviderLocator()));
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue