From ad41fd5c1a91eb54ff203104fbdecc6e3a0c589d Mon Sep 17 00:00:00 2001 From: Jorolf Date: Mon, 10 Apr 2017 16:49:48 +0200 Subject: [PATCH] more unnecessary stuff --- osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs | 9 ++++----- osu.Game/Graphics/UserInterface/Bar.cs | 2 +- osu.Game/Screens/Select/BeatmapDetails.cs | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs index 3394a6498e..200c2ba786 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs @@ -6,7 +6,6 @@ using osu.Framework.Testing; using osu.Game.Database; using osu.Game.Screens.Select; -using System; using System.Linq; namespace osu.Desktop.VisualTests.Tests @@ -44,8 +43,8 @@ public override void Reset() Metric = new BeatmapMetric { Ratings = Enumerable.Range(0,10).ToArray(), - Fails = Enumerable.Range(lastRange, 100).Select(i => (i % 12) - 6).ToArray(), - Retries = Enumerable.Range(lastRange - 3, 100).Select(i => (i % 12) - 6).ToArray(), + Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6).ToArray(), + Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6).ToArray(), }, }, }); @@ -76,8 +75,8 @@ private void newRetryAndFailValues() Metric = new BeatmapMetric { Ratings = Enumerable.Range(0, 10).ToArray(), - Fails = Enumerable.Range(lastRange, 100).Select(i => (i % 12) - 6).ToArray(), - Retries = Enumerable.Range(lastRange - 3, 100).Select(i => (i % 12) - 6).ToArray(), + Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6).ToArray(), + Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6).ToArray(), }, }; lastRange += 100; diff --git a/osu.Game/Graphics/UserInterface/Bar.cs b/osu.Game/Graphics/UserInterface/Bar.cs index 4647adb91c..07aafbb655 100644 --- a/osu.Game/Graphics/UserInterface/Bar.cs +++ b/osu.Game/Graphics/UserInterface/Bar.cs @@ -12,7 +12,7 @@ namespace osu.Game.Graphics.UserInterface { public class Bar : Container, IHasAccentColour { - private Box background; + private readonly Box background; private readonly Box bar; private const int resize_duration = 250; diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs index e33f42e5b1..2414122d7b 100644 --- a/osu.Game/Screens/Select/BeatmapDetails.cs +++ b/osu.Game/Screens/Select/BeatmapDetails.cs @@ -79,7 +79,7 @@ public BeatmapInfo Beatmap List retries = beatmap.Metric?.Retries?.ToList() ?? new List(); List fails = beatmap.Metric?.Fails?.ToList() ?? new List(); - if ((fails?.Count ?? 0) == 0 || (retries?.Count ?? 0) == 0) + if (fails.Count == 0 || retries.Count == 0) retryAndFailContainer.Hide(); else {