From 882d54a8f8692cdbd508614b7033cff898bd070d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:26:26 +0900
Subject: [PATCH] Remove now unnecessary Apply() method

---
 .../Edit/HitObjectSelectionBlueprint.cs       | 20 +------------------
 .../Components/ComposeBlueprintContainer.cs   |  2 +-
 .../Visual/SelectionBlueprintTestScene.cs     |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
index 6e9172c822..56434b1d82 100644
--- a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="HitObjectSelectionBlueprint"/> applies to.
         /// </summary>
-        public virtual DrawableHitObject DrawableObject { get; private set; }
+        public DrawableHitObject DrawableObject { get; internal set; }
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="DrawableObject"/> is not alive.
@@ -28,24 +28,6 @@ namespace osu.Game.Rulesets.Edit
         {
         }
 
-        protected override void LoadAsyncComplete()
-        {
-            // Must be done before base.LoadAsyncComplete() as this may affect children.
-            Apply(DrawableObject);
-
-            base.LoadAsyncComplete();
-        }
-
-        /// <summary>
-        /// Applies a <see cref="DrawableHitObject"/> to this <see cref="HitObjectSelectionBlueprint"/>.
-        /// The represented <see cref="HitObject"/> model does not change.
-        /// </summary>
-        /// <param name="drawableObject">The new <see cref="DrawableHitObject"/>.</param>
-        public virtual void Apply(DrawableHitObject drawableObject)
-        {
-            DrawableObject = drawableObject;
-        }
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
 
         public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index b3773b9ec1..95f4069edb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -245,7 +245,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (drawable == null)
                 return null;
 
-            return CreateHitObjectBlueprintFor(item).With(b => b.Apply(drawable));
+            return CreateHitObjectBlueprintFor(item).With(b => b.DrawableObject = drawable);
         }
 
         public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index b518465c40..dc12a4999d 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual
         {
             Add(blueprint.With(d =>
             {
-                d.Apply(drawableObject);
+                d.DrawableObject = drawableObject;
                 d.Depth = float.MinValue;
                 d.Select();
             }));