From 8e88d86639989520c65fceb34d01bb99a5175097 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Tue, 2 May 2017 18:00:37 +0900 Subject: [PATCH] Fix naming confusion. --- .../Tests/TestCaseDrawings.cs | 20 +++++++++---------- osu.Game/Screens/Tournament/Drawings.cs | 8 ++++---- osu.Game/Screens/Tournament/Group.cs | 8 ++++---- osu.Game/Screens/Tournament/GroupContainer.cs | 2 +- .../Tournament/ScrollingTeamContainer.cs | 18 ++++++++--------- .../Teams/{Team.cs => DrawingsTeam.cs} | 2 +- .../Screens/Tournament/Teams/ITeamList.cs | 2 +- .../Tournament/Teams/StorageBackedTeamList.cs | 6 +++--- osu.Game/osu.Game.csproj | 2 +- 9 files changed, 34 insertions(+), 34 deletions(-) rename osu.Game/Screens/Tournament/Teams/{Team.cs => DrawingsTeam.cs} (91%) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs b/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs index c4771a2913..ebc9930f93 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs @@ -24,57 +24,57 @@ namespace osu.Desktop.VisualTests.Tests private class TestTeamList : ITeamList { - public IEnumerable Teams { get; } = new[] + public IEnumerable Teams { get; } = new[] { - new Team + new DrawingsTeam { FlagName = "GB", FullName = "United Kingdom", Acronym = "UK" }, - new Team + new DrawingsTeam { FlagName = "FR", FullName = "France", Acronym = "FRA" }, - new Team + new DrawingsTeam { FlagName = "CN", FullName = "China", Acronym = "CHN" }, - new Team + new DrawingsTeam { FlagName = "AU", FullName = "Australia", Acronym = "AUS" }, - new Team + new DrawingsTeam { FlagName = "JP", FullName = "Japan", Acronym = "JPN" }, - new Team + new DrawingsTeam { FlagName = "RO", FullName = "Romania", Acronym = "ROM" }, - new Team + new DrawingsTeam { FlagName = "IT", FullName = "Italy", Acronym = "PIZZA" }, - new Team + new DrawingsTeam { FlagName = "VE", FullName = "Venezuela", Acronym = "VNZ" }, - new Team + new DrawingsTeam { FlagName = "US", FullName = "United States of America", diff --git a/osu.Game/Screens/Tournament/Drawings.cs b/osu.Game/Screens/Tournament/Drawings.cs index 924e7adac4..eada42a53e 100644 --- a/osu.Game/Screens/Tournament/Drawings.cs +++ b/osu.Game/Screens/Tournament/Drawings.cs @@ -37,7 +37,7 @@ namespace osu.Game.Screens.Tournament private GroupContainer groupsContainer; private OsuSpriteText fullTeamNameText; - private readonly List allTeams = new List(); + private readonly List allTeams = new List(); private DrawingsConfigManager drawingsConfig; @@ -249,7 +249,7 @@ namespace osu.Game.Screens.Tournament reset(true); } - private void onTeamSelected(Team team) + private void onTeamSelected(DrawingsTeam team) { groupsContainer.AddTeam(team); @@ -286,7 +286,7 @@ namespace osu.Game.Screens.Tournament teamsContainer.ClearTeams(); allTeams.Clear(); - foreach (Team t in TeamList.Teams) + foreach (DrawingsTeam t in TeamList.Teams) { if (groupsContainer.ContainsTeam(t.FullName)) continue; @@ -322,7 +322,7 @@ namespace osu.Game.Screens.Tournament if (line.ToUpper().StartsWith("GROUP")) continue; - Team teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line); + DrawingsTeam teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line); if (teamToAdd == null) continue; diff --git a/osu.Game/Screens/Tournament/Group.cs b/osu.Game/Screens/Tournament/Group.cs index 697ae17e95..f5695ae1cb 100644 --- a/osu.Game/Screens/Tournament/Group.cs +++ b/osu.Game/Screens/Tournament/Group.cs @@ -73,7 +73,7 @@ namespace osu.Game.Screens.Tournament }; } - public void AddTeam(Team team) + public void AddTeam(DrawingsTeam team) { GroupTeam gt = new GroupTeam(team); @@ -91,7 +91,7 @@ namespace osu.Game.Screens.Tournament return allTeams.Any(t => t.Team.FullName == fullName); } - public bool RemoveTeam(Team team) + public bool RemoveTeam(DrawingsTeam team) { allTeams.RemoveAll(gt => gt.Team == team); @@ -122,12 +122,12 @@ namespace osu.Game.Screens.Tournament private class GroupTeam : Container { - public readonly Team Team; + public readonly DrawingsTeam Team; private readonly FillFlowContainer innerContainer; private readonly Sprite flagSprite; - public GroupTeam(Team team) + public GroupTeam(DrawingsTeam team) { Team = team; diff --git a/osu.Game/Screens/Tournament/GroupContainer.cs b/osu.Game/Screens/Tournament/GroupContainer.cs index bc4c3b71c3..ba73a61c92 100644 --- a/osu.Game/Screens/Tournament/GroupContainer.cs +++ b/osu.Game/Screens/Tournament/GroupContainer.cs @@ -64,7 +64,7 @@ namespace osu.Game.Screens.Tournament } } - public void AddTeam(Team team) + public void AddTeam(DrawingsTeam team) { if (groups[currentGroup].TeamsCount == maxTeams) return; diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs index 4ae26d3a67..3eea239f55 100644 --- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs +++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs @@ -22,9 +22,9 @@ namespace osu.Game.Screens.Tournament public class ScrollingTeamContainer : Container { public event Action OnScrollStarted; - public event Action OnSelected; + public event Action OnSelected; - private readonly List availableTeams = new List(); + private readonly List availableTeams = new List(); private readonly Container tracker; @@ -158,7 +158,7 @@ namespace osu.Game.Screens.Tournament } } - public void AddTeam(Team team) + public void AddTeam(DrawingsTeam team) { if (availableTeams.Contains(team)) return; @@ -169,12 +169,12 @@ namespace osu.Game.Screens.Tournament scrollState = ScrollState.Idle; } - public void AddTeams(IEnumerable teams) + public void AddTeams(IEnumerable teams) { if (teams == null) return; - foreach (Team t in teams) + foreach (DrawingsTeam t in teams) AddTeam(t); } @@ -185,7 +185,7 @@ namespace osu.Game.Screens.Tournament scrollState = ScrollState.Idle; } - public void RemoveTeam(Team team) + public void RemoveTeam(DrawingsTeam team) { availableTeams.Remove(team); @@ -270,7 +270,7 @@ namespace osu.Game.Screens.Tournament private void addFlags() { - foreach (Team t in availableTeams) + foreach (DrawingsTeam t in availableTeams) { Add(new ScrollingTeam(t) { @@ -320,7 +320,7 @@ namespace osu.Game.Screens.Tournament public const float WIDTH = 58; public const float HEIGHT = 41; - public Team Team; + public DrawingsTeam Team; private readonly Sprite flagSprite; private readonly Box outline; @@ -340,7 +340,7 @@ namespace osu.Game.Screens.Tournament } } - public ScrollingTeam(Team team) + public ScrollingTeam(DrawingsTeam team) { Team = team; diff --git a/osu.Game/Screens/Tournament/Teams/Team.cs b/osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs similarity index 91% rename from osu.Game/Screens/Tournament/Teams/Team.cs rename to osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs index 5ffee1fc37..2739711c35 100644 --- a/osu.Game/Screens/Tournament/Teams/Team.cs +++ b/osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs @@ -3,7 +3,7 @@ namespace osu.Game.Screens.Tournament.Teams { - public class Team + public class DrawingsTeam { /// /// The name of this team. diff --git a/osu.Game/Screens/Tournament/Teams/ITeamList.cs b/osu.Game/Screens/Tournament/Teams/ITeamList.cs index a4476b64c6..9427ebc7fb 100644 --- a/osu.Game/Screens/Tournament/Teams/ITeamList.cs +++ b/osu.Game/Screens/Tournament/Teams/ITeamList.cs @@ -7,6 +7,6 @@ namespace osu.Game.Screens.Tournament.Teams { public interface ITeamList { - IEnumerable Teams { get; } + IEnumerable Teams { get; } } } diff --git a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs index 3bca7f2937..1b2d84a666 100644 --- a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs +++ b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs @@ -20,11 +20,11 @@ namespace osu.Game.Screens.Tournament.Teams this.storage = storage; } - public IEnumerable Teams + public IEnumerable Teams { get { - var teams = new List(); + var teams = new List(); try { @@ -52,7 +52,7 @@ namespace osu.Game.Screens.Tournament.Teams string acronym = split.Length >= 3 ? split[2].Trim() : teamName; acronym = acronym.Substring(0, Math.Min(3, acronym.Length)); - teams.Add(new Team + teams.Add(new DrawingsTeam { FlagName = flagName, FullName = teamName, diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 0c41ec91bb..907ba0cd95 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -325,7 +325,7 @@ - +