Changed static members to instance members

Changed static members of NCldrBinaryFileDataSource to instance members
GuySmithFerrier · Mar 28, 2013 · 97516cd · 97516cd
1 parent 03966d9
commit 97516cd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/NCldr/NCldrBinaryFileDataSource.cs b/NCldr/NCldrBinaryFileDataSource.cs
@@ -14,12 +14,12 @@ public class NCldrBinaryFileDataSource
         /// <summary>
         /// Gets or sets the path to the NCldr data file (includes the folder name only with no filename)
         /// </summary>
-        public static string NCldrDataPath { get; set; }
+        public string NCldrDataPath { get; set; }
 
         /// <summary>
         /// Gets the data file name including the path
         /// </summary>
-        public static string NCldrDataFilename
+        public string NCldrDataFilename
         {
             get
             {
@@ -31,7 +31,7 @@ public static string NCldrDataFilename
         /// Exists returns true if the NCldr data file exists
         /// </summary>
         /// <returns>True if the NCldr data file exists</returns>
-        public static bool Exists()
+        public bool Exists()
         {
             return File.Exists(NCldrDataFilename);
         }
@@ -40,7 +40,7 @@ public static bool Exists()
         /// Loads loads the raw data from the NCldr data file and returns an NCldrData object
         /// </summary>
         /// <returns>An INCldrData object from the NCldr data file</returns>
-        public static INCldrData Load()
+        public INCldrData Load()
         {
             if (!Exists())
             {
@@ -71,7 +71,7 @@ public static INCldrData Load()
         /// Save saves the NCldrData object to the NCldr data file
         /// </summary>
         /// <param name="ncldrData">The INCldrData object to save</param>
-        public static void Save(INCldrData ncldrData)
+        public void Save(INCldrData ncldrData)
         {
             FileStream fileStream = new FileStream(NCldrDataFilename, FileMode.Create);
             BinaryFormatter formatter = new BinaryFormatter();

diff --git a/NCldrBuilder/NCldrBuilder.cs b/NCldrBuilder/NCldrBuilder.cs
@@ -162,13 +162,14 @@ private static string GetDotNetCultureName(string cldrCultureName)
 
         private static void Build(NCldrData ncldrData)
         {
-            NCldrBinaryFileDataSource.NCldrDataPath = ncldrPath;
+            NCldrBinaryFileDataSource ncldrBinaryFileDataSource = new NCldrBinaryFileDataSource();
+            ncldrBinaryFileDataSource.NCldrDataPath = ncldrPath;
 
-            Progress("Writing data file", NCldrBinaryFileDataSource.NCldrDataFilename, ProgressEventType.Writing);
+            Progress("Writing data file", ncldrBinaryFileDataSource.NCldrDataFilename, ProgressEventType.Writing);
 
             try
             {
-                NCldrBinaryFileDataSource.Save(ncldrData);
+                ncldrBinaryFileDataSource.Save(ncldrData);
             }
             catch (SerializationException exception)
             {

diff --git a/NCldrBuilderGui/Form1.cs b/NCldrBuilderGui/Form1.cs
@@ -324,8 +324,9 @@ private void btnBuild_Click(object sender, EventArgs e)
             else
             {
                 previousSection = null;
-                NCldrBinaryFileDataSource.NCldrDataPath = tbxCldrPath.Text;
-                if (!NCldrBinaryFileDataSource.Exists() || MessageBox.Show("The NCLDR data file exists - overwrite it ?", "NCLDR Builder", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                NCldrBinaryFileDataSource ncldrBinaryFileDataSource = new NCldrBinaryFileDataSource();
+                ncldrBinaryFileDataSource.NCldrDataPath = tbxCldrPath.Text;
+                if (!ncldrBinaryFileDataSource.Exists() || MessageBox.Show("The NCLDR data file exists - overwrite it ?", "NCLDR Builder", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
                     tbxProgress.Text = String.Empty;
 

diff --git a/NCldrExplorer/Form1.cs b/NCldrExplorer/Form1.cs
@@ -39,8 +39,9 @@ private void btnLoadNCldrData_Click(object sender, EventArgs e)
             lblLoading.Visible = true;
             Application.DoEvents();
 
-            NCldrBinaryFileDataSource.NCldrDataPath = tbxNCldrDataPath.Text;
-            NCldr.NCldr.NCldrData = NCldrBinaryFileDataSource.Load();
+            NCldrBinaryFileDataSource ncldrBinaryFileDataSource = new NCldrBinaryFileDataSource();
+            ncldrBinaryFileDataSource.NCldrDataPath = tbxNCldrDataPath.Text;
+            NCldr.NCldr.NCldrData = ncldrBinaryFileDataSource.Load();
             lblLoading.Visible = false;
 
             foreach (string culture in NCldr.NCldr.CultureNames)