diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs index da0c379f90..0f2cf6a730 100644 --- a/osu.Game/Beatmaps/BeatmapManager.cs +++ b/osu.Game/Beatmaps/BeatmapManager.cs @@ -205,16 +205,16 @@ namespace osu.Game.Beatmaps return beatmapModelManager.IsAvailableLocally(model); } - public Action ItemUpdated + public event Action ItemUpdated { - get => beatmapModelManager.ItemUpdated; - set => beatmapModelManager.ItemUpdated = value; + add => beatmapModelManager.ItemUpdated += value; + remove => beatmapModelManager.ItemUpdated -= value; } - public Action ItemRemoved + public event Action ItemRemoved { - get => beatmapModelManager.ItemRemoved; - set => beatmapModelManager.ItemRemoved = value; + add => beatmapModelManager.ItemRemoved += value; + remove => beatmapModelManager.ItemRemoved -= value; } public Task ImportFromStableAsync(StableStorage stableStorage) @@ -261,16 +261,16 @@ namespace osu.Game.Beatmaps #region Implementation of IModelDownloader - public Action> DownloadBegan + public event Action> DownloadBegan { - get => beatmapModelDownloader.DownloadBegan; - set => beatmapModelDownloader.DownloadBegan = value; + add => beatmapModelDownloader.DownloadBegan += value; + remove => beatmapModelDownloader.DownloadBegan -= value; } - public Action> DownloadFailed + public event Action> DownloadFailed { - get => beatmapModelDownloader.DownloadFailed; - set => beatmapModelDownloader.DownloadFailed = value; + add => beatmapModelDownloader.DownloadFailed += value; + remove => beatmapModelDownloader.DownloadFailed -= value; } public bool Download(IBeatmapSetInfo model, bool minimiseDownloadSize = false) diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs index 85419aeedb..019749760f 100644 --- a/osu.Game/Database/ArchiveModelManager.cs +++ b/osu.Game/Database/ArchiveModelManager.cs @@ -62,13 +62,13 @@ namespace osu.Game.Database /// Fired when a new or updated becomes available in the database. /// This is not guaranteed to run on the update thread. /// - public Action ItemUpdated { get; set; } + public event Action ItemUpdated; /// /// Fired when a is removed from the database. /// This is not guaranteed to run on the update thread. /// - public Action ItemRemoved { get; set; } + public event Action ItemRemoved; public virtual IEnumerable HandledExtensions => new[] { @".zip" }; diff --git a/osu.Game/Database/IModelDownloader.cs b/osu.Game/Database/IModelDownloader.cs index d8e3dad8b5..81fba14244 100644 --- a/osu.Game/Database/IModelDownloader.cs +++ b/osu.Game/Database/IModelDownloader.cs @@ -17,13 +17,13 @@ namespace osu.Game.Database /// Fired when a download begins. /// This is NOT run on the update thread and should be scheduled. /// - Action> DownloadBegan { get; set; } + event Action> DownloadBegan; /// /// Fired when a download is interrupted, either due to user cancellation or failure. /// This is NOT run on the update thread and should be scheduled. /// - Action> DownloadFailed { get; set; } + event Action> DownloadFailed; /// /// Begin a download for the requested . diff --git a/osu.Game/Database/IModelManager.cs b/osu.Game/Database/IModelManager.cs index c9257f5877..15ad455f21 100644 --- a/osu.Game/Database/IModelManager.cs +++ b/osu.Game/Database/IModelManager.cs @@ -19,12 +19,12 @@ namespace osu.Game.Database /// /// Fired when an item is updated. /// - Action ItemUpdated { get; set; } + event Action ItemUpdated; /// /// Fired when an item is removed. /// - Action ItemRemoved { get; set; } + event Action ItemRemoved; /// /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future. diff --git a/osu.Game/Database/ModelDownloader.cs b/osu.Game/Database/ModelDownloader.cs index 3684dea456..3c1f181f24 100644 --- a/osu.Game/Database/ModelDownloader.cs +++ b/osu.Game/Database/ModelDownloader.cs @@ -19,9 +19,9 @@ namespace osu.Game.Database { public Action PostNotification { protected get; set; } - public Action> DownloadBegan { get; set; } + public event Action> DownloadBegan; - public Action> DownloadFailed { get; set; } + public event Action> DownloadFailed; private readonly IModelImporter importer; private readonly IAPIProvider api; diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs index 0cb5ae2236..9b4216084e 100644 --- a/osu.Game/Scoring/ScoreManager.cs +++ b/osu.Game/Scoring/ScoreManager.cs @@ -246,16 +246,16 @@ namespace osu.Game.Scoring #region Implementation of IModelManager - public Action ItemUpdated + public event Action ItemUpdated { - get => scoreModelManager.ItemUpdated; - set => scoreModelManager.ItemUpdated = value; + add => scoreModelManager.ItemUpdated += value; + remove => scoreModelManager.ItemUpdated -= value; } - public Action ItemRemoved + public event Action ItemRemoved { - get => scoreModelManager.ItemRemoved; - set => scoreModelManager.ItemRemoved = value; + add => scoreModelManager.ItemRemoved += value; + remove => scoreModelManager.ItemRemoved -= value; } public Task ImportFromStableAsync(StableStorage stableStorage) @@ -358,16 +358,16 @@ namespace osu.Game.Scoring #region Implementation of IModelDownloader - public Action> DownloadBegan + public event Action> DownloadBegan { - get => scoreModelDownloader.DownloadBegan; - set => scoreModelDownloader.DownloadBegan = value; + add => scoreModelDownloader.DownloadBegan += value; + remove => scoreModelDownloader.DownloadBegan -= value; } - public Action> DownloadFailed + public event Action> DownloadFailed { - get => scoreModelDownloader.DownloadFailed; - set => scoreModelDownloader.DownloadFailed = value; + add => scoreModelDownloader.DownloadFailed += value; + remove => scoreModelDownloader.DownloadFailed -= value; } public bool Download(IScoreInfo model, bool minimiseDownloadSize) =>