Rename GameBeatmap -> BindableBeatmap

This commit is contained in:
smoogipoo
2018-06-06 20:16:20 +09:00
parent 4086ff7313
commit 72cc53aded
23 changed files with 55 additions and 55 deletions

View File

@ -13,7 +13,7 @@ namespace osu.Game.Tests.Visual
public abstract class OsuTestCase : TestCase
{
private readonly OsuTestBeatmap beatmap = new OsuTestBeatmap(new DummyWorkingBeatmap());
protected GameBeatmap Beatmap => beatmap;
protected BindableBeatmap Beatmap => beatmap;
private DependencyContainer dependencies;
@ -21,8 +21,8 @@ namespace osu.Game.Tests.Visual
{
dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
dependencies.CacheAs<GameBeatmap>(beatmap);
dependencies.CacheAs<IGameBeatmap>(beatmap);
dependencies.CacheAs<BindableBeatmap>(beatmap);
dependencies.CacheAs<IBindableBeatmap>(beatmap);
return dependencies;
}
@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual
public void RunTestBlocking(TestCase test) => runner.RunTestBlocking(test);
}
private class OsuTestBeatmap : GameBeatmap
private class OsuTestBeatmap : BindableBeatmap
{
public OsuTestBeatmap(WorkingBeatmap defaultValue)
: base(defaultValue)
@ -72,7 +72,7 @@ namespace osu.Game.Tests.Visual
public void SetAudioManager(AudioManager audioManager) => RegisterAudioManager(audioManager);
public override GameBeatmap GetBoundCopy()
public override BindableBeatmap GetBoundCopy()
{
var copy = new OsuTestBeatmap(Default);
copy.BindTo(this);

View File

@ -108,9 +108,9 @@ namespace osu.Game.Tests.Visual
{
private readonly Container<BeatmapDisplay> beatmapDisplays;
private readonly Ruleset ruleset;
private readonly GameBeatmap beatmapBindable;
private readonly BindableBeatmap beatmapBindable;
public BeatmapList(Ruleset ruleset, GameBeatmap beatmapBindable)
public BeatmapList(Ruleset ruleset, BindableBeatmap beatmapBindable)
{
this.ruleset = ruleset;
this.beatmapBindable = beatmapBindable;
@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual
private readonly OsuSpriteText text;
private readonly BeatmapInfo beatmap;
private readonly GameBeatmap beatmapBindable;
private readonly BindableBeatmap beatmapBindable;
private BeatmapManager beatmaps;
@ -148,7 +148,7 @@ namespace osu.Game.Tests.Visual
public string TooltipText => text.Text;
public BeatmapDisplay(BeatmapInfo beatmap, GameBeatmap beatmapBindable)
public BeatmapDisplay(BeatmapInfo beatmap, BindableBeatmap beatmapBindable)
{
this.beatmap = beatmap;
this.beatmapBindable = beatmapBindable;
@ -223,7 +223,7 @@ namespace osu.Game.Tests.Visual
}
[BackgroundDependencyLoader]
private void load(IGameBeatmap beatmap, APIAccess api)
private void load(IBindableBeatmap beatmap, APIAccess api)
{
this.api = api;
@ -336,7 +336,7 @@ namespace osu.Game.Tests.Visual
}
[BackgroundDependencyLoader]
private void load(IGameBeatmap beatmap)
private void load(IBindableBeatmap beatmap)
{
beatmap.ValueChanged += beatmapChanged;
}