Refactor the definition reader

ProvinceMapper/DefinitionReader.cs

@@ -1,25 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
+
+
 namespace ProvinceMapper
 {
 	class DefinitionReader
 	{
-		public DefinitionReader(string path, StatusUpdate su)
+		public DefinitionReader(string path, StatusUpdate progress)
 		{
-			StreamReader sr = new StreamReader(path, Encoding.GetEncoding(1252));
-			sr.ReadLine(); // discard first line
-			while (!sr.EndOfStream)
+			StreamReader reader = new StreamReader(path, Encoding.GetEncoding(1252));
+			reader.ReadLine(); // discard first line
+
+			while (!reader.EndOfStream)
 			{
-				string province = sr.ReadLine();
+				string province = reader.ReadLine();
 				string[] provinceTokens = province.Split(';');
-				if ((provinceTokens[4] == "RNW") || ((provinceTokens[4].Length > 5) && (provinceTokens[4].Substring(0, 6) == "Unused")))
+				if (IsRNWProvince(provinceTokens) || IsUnusedProvince(provinceTokens))
 				{
 					continue;
 				}
+
 				try
 				{
 					Province p = new Province(provinceTokens);
@@ -28,11 +30,23 @@ public DefinitionReader(string path, StatusUpdate su)
 				catch
 				{
 				}
-				su(100.0 * sr.BaseStream.Position / sr.BaseStream.Length);
+
+				progress(100.0 * reader.BaseStream.Position / reader.BaseStream.Length);
 			}
-			sr.Close();
+
+			reader.Close();
 		}
 
 		public List<Province> provinces = new List<Province>();
+
+		private bool IsRNWProvince(string[] provinceTokens)
+		{
+			return (provinceTokens[4] == "RNW");
+		}
+
+		private bool IsUnusedProvince(string[] provinceTokens)
+		{
+			return ((provinceTokens[4].Length > 5) && (provinceTokens[4].Substring(0, 6) == "Unused"));
+		}
 	}
 }