Merge pull request #1097 from andy840119/remove-tricky-logic-to-acces…

…s-the-editor Use the better way for able to access editor in test scene.
karaoke-dev · Feb 5, 2022 · a24a901 · a24a901
2 parents 202fb9e + cdc0e2e
commit a24a901
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 26 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/TestKaraokeBeatmap.cs b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/TestKaraokeBeatmap.cs
@@ -13,10 +13,6 @@ public class TestKaraokeBeatmap : Beatmap
     {
         public TestKaraokeBeatmap(RulesetInfo ruleset)
         {
-            // It's a tricky way not to trigger change handler throw exception.
-            // not a good solution, but seems ok because there's no other ruleset in the test case.
-            ruleset.OnlineID = 1;
-
             var baseBeatmap = createTestBeatmap();
 
             BeatmapInfo = baseBeatmap.BeatmapInfo;

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneKaraokeEditor.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneKaraokeEditor.cs
@@ -56,7 +56,6 @@ private void load()
             Dependencies.Cache(lyricCheckerManager);
 
             Dependencies.Cache(new EditorClock());
-            Dependencies.CacheAs<IEditorChangeHandler>(new EditorChangeHandler(editorBeatmap));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Edit/ImportLyric/LyricImporter.cs b/osu.Game.Rulesets.Karaoke/Edit/ImportLyric/LyricImporter.cs
@@ -29,7 +29,6 @@ public class LyricImporter : ScreenWithBeatmapBackground, IImportStateResolver
         private readonly BindableBeatDivisor beatDivisor = new();
 
         private EditorBeatmap editorBeatmap;
-        private ImportLyricEditorChangeHandler changeHandler;
 
         private ImportLyricManager importManager;
 
@@ -96,8 +95,6 @@ private void load()
             };
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
             dependencies.CacheAs(editorBeatmap);
-            changeHandler = new ImportLyricEditorChangeHandler(editorBeatmap);
-            dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
             AddInternal(importManager = new ImportLyricManager());
             dependencies.Cache(importManager);
@@ -131,23 +128,5 @@ public LyricImporterWaveContainer()
                 FourthWaveColour = Color4Extensions.FromHex(@"392850");
             }
         }
-
-        /// <summary>
-        /// Use this class as temp class until <see cref="EditorChangeHandler"/> support customized beatmap.
-        /// </summary>
-        private class ImportLyricEditorChangeHandler : TransactionalCommitComponent, IEditorChangeHandler
-        {
-            public event Action OnStateChange;
-
-            public ImportLyricEditorChangeHandler(EditorBeatmap editorBeatmap)
-            {
-            }
-
-            protected override void UpdateState()
-            {
-                // do nothing.
-                OnStateChange?.Invoke();
-            }
-        }
     }
 }