From 6561a7c7d697dafd15d3f35b82d7ccd86552ca0b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 12:06:21 +0900
Subject: [PATCH] Rename DrawableObject -> PoolableDrawableWithLifetime

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs  | 4 ++--
 ...{DrawableObject.cs => PoolableDrawableWithLifetime.cs} | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game/Rulesets/Objects/Pooling/{DrawableObject.cs => PoolableDrawableWithLifetime.cs} (92%)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6ab6a4b984..7739994527 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -26,7 +26,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     [Cached(typeof(DrawableHitObject))]
-    public abstract class DrawableHitObject : DrawableObject<HitObjectLifetimeEntry>
+    public abstract class DrawableHitObject : PoolableDrawableWithLifetime<HitObjectLifetimeEntry>
     {
         /// <summary>
         /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         /// <param name="initialHitObject">
         /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
-        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="DrawableObject{TEntry}.Apply"/> (or automatically via pooling).
+        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="PoolableDrawableWithLifetime{TEntry}.Apply"/> (or automatically via pooling).
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
             : base(initialHitObject != null ? new SyntheticHitObjectEntry(initialHitObject) : null)
diff --git a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
similarity index 92%
rename from osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
rename to osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 27ed4c04f2..93e476be76 100644
--- a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -13,15 +13,15 @@ namespace osu.Game.Rulesets.Objects.Pooling
     /// A <see cref="PoolableDrawable"/> that is controlled by <see cref="Entry"/> to implement drawable pooling and replay rewinding.
     /// </summary>
     /// <typeparam name="TEntry">The <see cref="LifetimeEntry"/> type storing state and controlling this drawable.</typeparam>
-    public abstract class DrawableObject<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
+    public abstract class PoolableDrawableWithLifetime<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
     {
         /// <summary>
-        /// The entry holding essential state of this <see cref="DrawableObject{TEntry}"/>.
+        /// The entry holding essential state of this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
         /// </summary>
         protected TEntry? Entry { get; private set; }
 
         /// <summary>
-        /// Whether <see cref="Entry"/> is applied to this <see cref="DrawableObject{TEntry}"/>.
+        /// Whether <see cref="Entry"/> is applied to this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
         /// When an initial entry is specified in the constructor, <see cref="Entry"/> is set but not applied until loading is completed.
         /// </summary>
         protected bool HasEntryApplied { get; private set; }
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
-        protected DrawableObject(TEntry? initialEntry = null)
+        protected PoolableDrawableWithLifetime(TEntry? initialEntry = null)
         {
             Entry = initialEntry;
         }