diff --git a/SabreTools.Library/Dats/DatFile.cs b/SabreTools.Library/Dats/DatFile.cs index 121acb33..484fb52c 100644 --- a/SabreTools.Library/Dats/DatFile.cs +++ b/SabreTools.Library/Dats/DatFile.cs @@ -459,17 +459,6 @@ namespace SabreTools.Library.Dats return contains; } - /// - /// Delete the file dictionary - /// - public void Delete() - { - _items = null; - - // Reset statistics - ResetStatistics(); - } - /// /// Get the keys from the file dictionary /// @@ -567,17 +556,6 @@ namespace SabreTools.Library.Dats } } - /// - /// Reset the file dictionary - /// - public void Reset() - { - _items = new SortedDictionary>(); - - // Reset statistics - ResetStatistics(); - } - #endregion #region Constructors @@ -637,7 +615,7 @@ namespace SabreTools.Library.Dats /// Clones the files dictionary /// /// A new files dictionary instance - public SortedDictionary> CloneFiles() + public SortedDictionary> CloneDictionary() { // Create the placeholder dictionary to be used SortedDictionary> sorted = new SortedDictionary>(); @@ -667,6 +645,28 @@ namespace SabreTools.Library.Dats return sorted; } + /// + /// Delete the file dictionary + /// + public void DeleteDictionary() + { + _items = null; + + // Reset statistics + ResetStatistics(); + } + + /// + /// Reset the file dictionary + /// + public void ResetDictionary() + { + _items = new SortedDictionary>(); + + // Reset statistics + ResetStatistics(); + } + #endregion #endregion // Instance Methods diff --git a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs b/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs index cd372a92..84c2d4b7 100644 --- a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs +++ b/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs @@ -142,7 +142,7 @@ namespace SabreTools.Library.Dats } // Now remove the file dictionary from the souce DAT to save memory - datHeaders[i].Delete(); + datHeaders[i].DeleteDictionary(); }); // Now that we have a merged DAT, filter it @@ -282,7 +282,7 @@ namespace SabreTools.Library.Dats diffData.Name += post; diffData.Description += post; } - diffData.Reset(); + diffData.ResetDictionary(); outDatsArray[j] = diffData; }); @@ -385,7 +385,7 @@ namespace SabreTools.Library.Dats outerDiffData.FileName += post; outerDiffData.Name += post; outerDiffData.Description += post; - outerDiffData.Reset(); + outerDiffData.ResetDictionary(); } // Have External dupes @@ -396,7 +396,7 @@ namespace SabreTools.Library.Dats dupeData.FileName += post; dupeData.Name += post; dupeData.Description += post; - dupeData.Reset(); + dupeData.ResetDictionary(); } // Create a list of DatData objects representing individual output files @@ -414,7 +414,7 @@ namespace SabreTools.Library.Dats diffData.FileName += innerpost; diffData.Name += innerpost; diffData.Description += innerpost; - diffData.Reset(); + diffData.ResetDictionary(); outDatsArray[j] = diffData; }); diff --git a/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs b/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs index 952c517a..04b88219 100644 --- a/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs +++ b/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs @@ -46,8 +46,8 @@ namespace SabreTools.Library.Dats _sortedBy = bucketBy; // Clone the current dictionary into a new one for sorting then reset the internal one - SortedDictionary> sortable = this.CloneFiles(); - this.Reset(); + SortedDictionary> sortable = this.CloneDictionary(); + this.ResetDictionary(); Globals.Logger.User("Organizing roms by {0}" + (deduperoms != DedupeType.None ? " and merging" : ""), bucketBy); diff --git a/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs index 524af444..bcb1bb7b 100644 --- a/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs +++ b/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs @@ -984,7 +984,7 @@ namespace SabreTools.Library.Dats // Setup the fixdat DatFile matched = new DatFile(this); - matched.Reset(); + matched.ResetDictionary(); matched.FileName = "fixDat_" + matched.FileName; matched.Name = "fixDat_" + matched.Name; matched.Description = "fixDat_" + matched.Description;