From 611619fd9c83983cf237246199c9e65ac6d27f7c Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 23 Nov 2016 11:59:50 +0900 Subject: [PATCH] Fix some namespaces. --- .../{Drawable => Drawables}/BeatmapGroup.cs | 11 ++------ .../{Drawable => Drawables}/BeatmapPanel.cs | 4 +-- .../BeatmapSetHeader.cs | 17 +++++------- .../{Drawable => Drawables}/DifficultyIcon.cs | 14 +++++----- .../Beatmaps/{Drawable => Drawables}/Panel.cs | 6 ++--- .../{Background => Backgrounds}/Background.cs | 11 +++----- .../Backgrounds/BackgroundModeBeatmap.cs | 2 +- .../Backgrounds/BackgroundModeCustom.cs | 2 +- .../Backgrounds/BackgroundModeDefault.cs | 2 +- osu.Game/Screens/Select/CarouselContainer.cs | 26 +++++++++---------- osu.Game/Screens/Select/PlaySongSelect.cs | 2 +- osu.Game/osu.Game.csproj | 12 ++++----- 12 files changed, 48 insertions(+), 61 deletions(-) rename osu.Game/Beatmaps/{Drawable => Drawables}/BeatmapGroup.cs (91%) rename osu.Game/Beatmaps/{Drawable => Drawables}/BeatmapPanel.cs (98%) rename osu.Game/Beatmaps/{Drawable => Drawables}/BeatmapSetHeader.cs (96%) rename osu.Game/Beatmaps/{Drawable => Drawables}/DifficultyIcon.cs (94%) rename osu.Game/Beatmaps/{Drawable => Drawables}/Panel.cs (91%) rename osu.Game/Graphics/{Background => Backgrounds}/Background.cs (88%) diff --git a/osu.Game/Beatmaps/Drawable/BeatmapGroup.cs b/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs similarity index 91% rename from osu.Game/Beatmaps/Drawable/BeatmapGroup.cs rename to osu.Game/Beatmaps/Drawables/BeatmapGroup.cs index 348d8abb87..eed7e9369e 100644 --- a/osu.Game/Beatmaps/Drawable/BeatmapGroup.cs +++ b/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs @@ -4,18 +4,11 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Threading; -using System.Threading.Tasks; using osu.Framework; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Primitives; using osu.Game.Database; -using OpenTK; -using osu.Framework.Allocation; - -namespace osu.Game.Beatmaps.Drawable + +namespace osu.Game.Beatmaps.Drawables { class BeatmapGroup : IStateful { diff --git a/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs similarity index 98% rename from osu.Game/Beatmaps/Drawable/BeatmapPanel.cs rename to osu.Game/Beatmaps/Drawables/BeatmapPanel.cs index 920538f935..6de25a853b 100644 --- a/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs +++ b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs @@ -3,6 +3,7 @@ using System; using osu.Framework.Graphics; +using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; @@ -11,9 +12,8 @@ using osu.Game.Graphics; using osu.Game.Graphics.UserInterface; using OpenTK; using OpenTK.Graphics; -using osu.Framework.Graphics.Colour; -namespace osu.Game.Beatmaps.Drawable +namespace osu.Game.Beatmaps.Drawables { class BeatmapPanel : Panel { diff --git a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs similarity index 96% rename from osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs rename to osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs index fb083451e7..709885d132 100644 --- a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs +++ b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs @@ -2,21 +2,19 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; +using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Graphics; +using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; -using osu.Game.Database; +using osu.Game.Configuration; using osu.Game.Graphics; using OpenTK; using OpenTK.Graphics; -using osu.Framework.Allocation; -using osu.Framework.Configuration; -using osu.Game.Configuration; -using osu.Framework.Graphics.Colour; -using osu.Framework; - -namespace osu.Game.Beatmaps.Drawable + +namespace osu.Game.Beatmaps.Drawables { class BeatmapSetHeader : Panel { @@ -31,7 +29,7 @@ namespace osu.Game.Beatmaps.Drawable this.beatmap = beatmap; Hidden = false; - Children = new Framework.Graphics.Drawable[] + Children = new Drawable[] { new PanelBackground(beatmap) { @@ -158,7 +156,6 @@ namespace osu.Game.Beatmaps.Drawable [BackgroundDependencyLoader] private void load(OsuGameBase game) { - //todo: masking check new BeatmapBackground(working) { Anchor = Anchor.Centre, diff --git a/osu.Game/Beatmaps/Drawable/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs similarity index 94% rename from osu.Game/Beatmaps/Drawable/DifficultyIcon.cs rename to osu.Game/Beatmaps/Drawables/DifficultyIcon.cs index aab1e27d3c..4bb02d53c4 100644 --- a/osu.Game/Beatmaps/Drawable/DifficultyIcon.cs +++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs @@ -1,13 +1,13 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Game.Graphics; -using OpenTK; -using OpenTK.Graphics; - -namespace osu.Game.Beatmaps.Drawable +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Game.Graphics; +using OpenTK; +using OpenTK.Graphics; + +namespace osu.Game.Beatmaps.Drawables { class DifficultyIcon : Container { diff --git a/osu.Game/Beatmaps/Drawable/Panel.cs b/osu.Game/Beatmaps/Drawables/Panel.cs similarity index 91% rename from osu.Game/Beatmaps/Drawable/Panel.cs rename to osu.Game/Beatmaps/Drawables/Panel.cs index fe633e4958..cef25d24a5 100644 --- a/osu.Game/Beatmaps/Drawable/Panel.cs +++ b/osu.Game/Beatmaps/Drawables/Panel.cs @@ -8,7 +8,7 @@ using osu.Framework.Input; using OpenTK; using OpenTK.Graphics; -namespace osu.Game.Beatmaps.Drawable +namespace osu.Game.Beatmaps.Drawables { class Panel : Container, IStateful { @@ -17,9 +17,9 @@ namespace osu.Game.Beatmaps.Drawable public bool Hidden = true; private Container nestedContainer; - protected override Container Content => nestedContainer; + protected override Container Content => nestedContainer; - public Panel() + protected Panel() { Height = MAX_HEIGHT; RelativeSizeAxes = Axes.X; diff --git a/osu.Game/Graphics/Background/Background.cs b/osu.Game/Graphics/Backgrounds/Background.cs similarity index 88% rename from osu.Game/Graphics/Background/Background.cs rename to osu.Game/Graphics/Backgrounds/Background.cs index 4698557c96..348e46e65f 100644 --- a/osu.Game/Graphics/Background/Background.cs +++ b/osu.Game/Graphics/Backgrounds/Background.cs @@ -2,18 +2,15 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; +using osu.Framework.Allocation; using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; -using osu.Game.Graphics.Containers; +using osu.Framework.Graphics.Textures; using OpenTK; using OpenTK.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework; -using System.Threading.Tasks; -using osu.Framework.Graphics.Textures; -using osu.Framework.Allocation; -namespace osu.Game.Graphics.Background +namespace osu.Game.Graphics.Backgrounds { public class Background : BufferedContainer { diff --git a/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs index e599198009..5e624658a1 100644 --- a/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs @@ -5,7 +5,7 @@ using osu.Framework.Allocation; using OpenTK; using osu.Framework.Graphics.Transformations; using osu.Game.Beatmaps; -using osu.Game.Graphics.Background; +using osu.Game.Graphics.Backgrounds; namespace osu.Game.Screens.Backgrounds { diff --git a/osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs b/osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs index 9a2901ed63..e78816fdec 100644 --- a/osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs @@ -1,7 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Game.Graphics.Background; +using osu.Game.Graphics.Backgrounds; namespace osu.Game.Screens.Backgrounds { diff --git a/osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs index 8a7be3e03a..57442a0037 100644 --- a/osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs @@ -3,7 +3,7 @@ using osu.Framework; using osu.Framework.Allocation; -using osu.Game.Graphics.Background; +using osu.Game.Graphics.Backgrounds; namespace osu.Game.Screens.Backgrounds { diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs index f072380e3c..f9cc18264a 100644 --- a/osu.Game/Screens/Select/CarouselContainer.cs +++ b/osu.Game/Screens/Select/CarouselContainer.cs @@ -1,17 +1,17 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using OpenTK; -using osu.Framework.Caching; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Transformations; -using osu.Game.Beatmaps.Drawable; -using osu.Game.Database; -using System; -using System.Collections.Generic; -using System.Linq; - +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using OpenTK; +using osu.Framework.Caching; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Transformations; +using osu.Game.Database; +using System; +using System.Collections.Generic; +using System.Linq; +using osu.Game.Beatmaps.Drawables; + namespace osu.Game.Screens.Select { class CarouselContainer : ScrollContainer diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 1b96ec923d..bcb3c46724 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -16,7 +16,6 @@ using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.UserInterface; using osu.Game.Beatmaps; -using osu.Game.Beatmaps.Drawable; using osu.Game.Database; using osu.Game.Modes; using osu.Game.Screens.Backgrounds; @@ -24,6 +23,7 @@ using OpenTK; using OpenTK.Graphics; using osu.Game.Screens.Play; using osu.Framework; +using osu.Game.Beatmaps.Drawables; namespace osu.Game.Screens.Select { diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index fb19272a7d..9cb1535981 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -70,9 +70,9 @@ - - - + + + @@ -107,8 +107,8 @@ - - + + @@ -125,7 +125,7 @@ - +