From 195b002ec1175992632f5530fb425bbd5103713a Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 6 Sep 2013 21:23:59 +0000 Subject: [PATCH] Recent Files - refactor - remove GetFileByPosition() in place of making the object indexable --- BizHawk.MultiClient/MainForm.MenuItems.cs | 8 ++++---- BizHawk.MultiClient/MainForm.cs | 10 ++++----- BizHawk.MultiClient/RecentFiles.cs | 25 +++++++++++++---------- BizHawk.MultiClient/tools/Cheats.cs | 2 +- BizHawk.MultiClient/tools/LuaConsole.cs | 6 +++--- BizHawk.MultiClient/tools/RamSearch.cs | 2 +- BizHawk.MultiClient/tools/RamWatch.cs | 2 +- 7 files changed, 29 insertions(+), 26 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 327a4a843d..0729032f2c 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -730,7 +730,7 @@ namespace BizHawk.MultiClient { for (int x = 0; x < Global.Config.RecentRoms.Count; x++) { - string path = Global.Config.RecentRoms.GetRecentFileByPosition(x); + string path = Global.Config.RecentRoms[x]; var item = new ToolStripMenuItem {Text = path}; item.Click += (o, ev) => LoadRomFromRecent(path); recentROMToolStripMenuItem.DropDownItems.Add(item); @@ -763,7 +763,7 @@ namespace BizHawk.MultiClient { for (int x = 0; x < Global.Config.RecentMovies.Count; x++) { - string path = Global.Config.RecentMovies.GetRecentFileByPosition(x); + string path = Global.Config.RecentMovies[x]; var item = new ToolStripMenuItem {Text = path}; item.Click += (o, ev) => LoadMoviesFromRecent(path); recentToolStripMenuItem.DropDownItems.Add(item); @@ -879,7 +879,7 @@ namespace BizHawk.MultiClient private void loadLastROMToolStripMenuItem_Click(object sender, EventArgs e) { - LoadRomFromRecent(Global.Config.RecentRoms.GetRecentFileByPosition(0)); + LoadRomFromRecent(Global.Config.RecentRoms[0]); } private void enableContextMenuToolStripMenuItem_Click(object sender, EventArgs e) @@ -907,7 +907,7 @@ namespace BizHawk.MultiClient private void loadLastMovieToolStripMenuItem_Click(object sender, EventArgs e) { - LoadMoviesFromRecent(Global.Config.RecentMovies.GetRecentFileByPosition(0)); + LoadMoviesFromRecent(Global.Config.RecentMovies[0]); } private void AddSubtitleToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 00523e00bb..d1f0a95ecf 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -277,7 +277,7 @@ namespace BizHawk.MultiClient } } else if (Global.Config.AutoLoadMostRecentRom && !Global.Config.RecentRoms.Empty) - LoadRomFromRecent(Global.Config.RecentRoms.GetRecentFileByPosition(0)); + LoadRomFromRecent(Global.Config.RecentRoms[0]); if (cmdMovie != null) { @@ -306,7 +306,7 @@ namespace BizHawk.MultiClient } else { - Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0)); + Movie m = new Movie(Global.Config.RecentMovies[0]); StartNewMovie(m, false); } } @@ -1546,7 +1546,7 @@ namespace BizHawk.MultiClient //restarts the lua console if a different rom is loaded. //im not really a fan of how this is done.. - if (Global.Config.RecentRoms.Empty || Global.Config.RecentRoms.GetRecentFileByPosition(0) != file.CanonicalFullPath) + if (Global.Config.RecentRoms.Empty || Global.Config.RecentRoms[0] != file.CanonicalFullPath) { #if WINDOWS LuaConsole1.Restart(); @@ -3348,7 +3348,7 @@ namespace BizHawk.MultiClient RamWatch1 = new RamWatch(); if (Global.Config.AutoLoadRamWatch && Global.Config.RecentWatches.Count > 0) { - RamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches.GetRecentFileByPosition(0)); + RamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches[0]); } if (load_dialog) { @@ -4203,7 +4203,7 @@ namespace BizHawk.MultiClient NewRamWatch1 = new NewRamWatch(); if (Global.Config.AutoLoadRamWatch && Global.Config.RecentWatches.Count > 0) { - NewRamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches.GetRecentFileByPosition(0)); + NewRamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches[0]); } if (load_dialog) { diff --git a/BizHawk.MultiClient/RecentFiles.cs b/BizHawk.MultiClient/RecentFiles.cs index 3f29d3a8f3..b760cc0646 100644 --- a/BizHawk.MultiClient/RecentFiles.cs +++ b/BizHawk.MultiClient/RecentFiles.cs @@ -66,16 +66,19 @@ namespace BizHawk.MultiClient return recentlist.Select(t => t.Substring(0, length)).ToList(); } - public string GetRecentFileByPosition(int position) - { - if (recentlist.Count > 0) - { - return recentlist[position]; - } - else - { - return ""; - } - } + public string this[int index] + { + get + { + if (recentlist.Any()) + { + return recentlist[index]; + } + else + { + return ""; + } + } + } } } diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs index 4756f21af9..8a5f8cf062 100644 --- a/BizHawk.MultiClient/tools/Cheats.cs +++ b/BizHawk.MultiClient/tools/Cheats.cs @@ -267,7 +267,7 @@ namespace BizHawk.MultiClient { for (int x = 0; x < Global.Config.RecentCheats.Count; x++) { - string path = Global.Config.RecentCheats.GetRecentFileByPosition(x); + string path = Global.Config.RecentCheats[x]; var item = new ToolStripMenuItem {Text = path}; item.Click += (o, ev) => LoadCheatFromRecent(path); recentToolStripMenuItem.DropDownItems.Add(item); diff --git a/BizHawk.MultiClient/tools/LuaConsole.cs b/BizHawk.MultiClient/tools/LuaConsole.cs index 6044be92c2..0d5e4340ee 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.cs +++ b/BizHawk.MultiClient/tools/LuaConsole.cs @@ -102,7 +102,7 @@ namespace BizHawk.MultiClient { if (!Global.Config.RecentLuaSession.Empty) { - LoadSessionFromRecent(Global.Config.RecentLuaSession.GetRecentFileByPosition(0)); + LoadSessionFromRecent(Global.Config.RecentLuaSession[0]); } } @@ -545,7 +545,7 @@ namespace BizHawk.MultiClient { for (int x = 0; x < Global.Config.RecentLua.Count; x++) { - string path = Global.Config.RecentLua.GetRecentFileByPosition(x); + string path = Global.Config.RecentLua[x]; var item = new ToolStripMenuItem {Text = path}; item.Click += (o, ev) => LoadLuaFromRecent(path); recentToolStripMenuItem.DropDownItems.Add(item); @@ -1021,7 +1021,7 @@ namespace BizHawk.MultiClient { for (int x = 0; x < Global.Config.RecentLuaSession.Count; x++) { - string path = Global.Config.RecentLuaSession.GetRecentFileByPosition(x); + string path = Global.Config.RecentLuaSession[x]; var item = new ToolStripMenuItem {Text = path}; item.Click += (o, ev) => LoadSessionFromRecent(path); recentSessionsToolStripMenuItem.DropDownItems.Add(item); diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 0d76efff2a..be6709b6f4 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -1869,7 +1869,7 @@ namespace BizHawk.MultiClient { for (int x = 0; x < Global.Config.RecentSearches.Count; x++) { - string path = Global.Config.RecentSearches.GetRecentFileByPosition(x); + string path = Global.Config.RecentSearches[x]; var item = new ToolStripMenuItem { Text = path }; item.Click += (o, ev) => LoadSearchFromRecent(path); recentToolStripMenuItem.DropDownItems.Add(item); diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index 81ba27ebc6..01b0ac0f6a 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -710,7 +710,7 @@ namespace BizHawk.MultiClient { for (int x = 0; x < Global.Config.RecentWatches.Count; x++) { - string path = Global.Config.RecentWatches.GetRecentFileByPosition(x); + string path = Global.Config.RecentWatches[x]; var item = new ToolStripMenuItem {Text = path}; item.Click += (o, ev) => LoadWatchFromRecent(path); recentToolStripMenuItem.DropDownItems.Add(item);