RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ModelInfo -> Model

This commit is contained in:
Dean Herbert 2019-06-27 00:29:09 +09:00
parent 8efc504817
commit 768d6c2fb3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Online/DownloadTrackingComposite.cs
View File

@ -17,7 +17,7 @@ public abstract class DownloadTrackingComposite<TModel, TModelManager> : Composi
where TModel : class, IEquatable<TModel>
where TModelManager : class, IModelDownloader<TModel>
{
protected readonly Bindable<TModel> ModelInfo = new Bindable<TModel>();
protected readonly Bindable<TModel> Model = new Bindable<TModel>();
private TModelManager manager;
@ -30,7 +30,7 @@ public abstract class DownloadTrackingComposite<TModel, TModelManager> : Composi
protected DownloadTrackingComposite(TModel model = null)
{
ModelInfo.Value = model;
Model.Value = model;
}
[BackgroundDependencyLoader(true)]
@ -38,7 +38,7 @@ private void load(TModelManager manager)
{
this.manager = manager;
ModelInfo.BindValueChanged(modelInfo =>
Model.BindValueChanged(modelInfo =>
{
if (modelInfo.NewValue == null)
attachDownload(null);
@ -50,7 +50,7 @@ private void load(TModelManager manager)
manager.DownloadBegan += download =>
{
if (download.Model.Equals(ModelInfo.Value))
if (download.Model.Equals(Model.Value))
attachDownload(download);
};
@ -125,7 +125,7 @@ private void attachDownload(ArchiveDownloadRequest<TModel> request)
private void setDownloadStateFromManager(TModel s, DownloadState state) => Schedule(() =>
{
if (!s.Equals(ModelInfo.Value))
if (!s.Equals(Model.Value))
return;
State.Value = state;

2
osu.Game/Overlays/Direct/BeatmapDownloadTrackingComposite.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Overlays.Direct
{
public abstract class BeatmapDownloadTrackingComposite : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
{
public Bindable<BeatmapSetInfo> BeatmapSet => ModelInfo;
public Bindable<BeatmapSetInfo> BeatmapSet => Model;
protected BeatmapDownloadTrackingComposite(BeatmapSetInfo set = null)
: base(set)