FIX Nullpointer exception in CountryCodeType

austriapro · Apr 19, 2019 · ccd676f · ccd676f
1 parent e7fb8d0
commit ccd676f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/eRechnungWordPlugIn/ebIModels/Models/CountryCodes.cs b/eRechnungWordPlugIn/ebIModels/Models/CountryCodes.cs
@@ -16,6 +16,7 @@ public static class CountryCodes
     {
         private static List<CountryCodeModel> _countryCodes;
         private const string CountryCodeXml = "iso_3166-1_laender.xml";
+        private static CountryCodeModel DefaultCountryCode = new CountryCodeModel();
         private static void LoadCountryCodes()
         {
             IResourceService xmlRes = new ResourceService();
@@ -27,6 +28,11 @@ private static void LoadCountryCodes()
                                  Code = xElement.Element("Shortcut").Value,
                                  Country = getCountry(xElement.Element("Land").Value)
                              }).ToList<CountryCodeModel>();
+            DefaultCountryCode = GetFromCode("AT");
+            if (DefaultCountryCode==null)
+            {
+                DefaultCountryCode = _countryCodes[0];
+            }
         }
         public static List<CountryCodeModel> GetCountryCodeList()
         {
@@ -35,11 +41,11 @@ public static List<CountryCodeModel> GetCountryCodeList()
             return _countryCodes;
         }
 
-        public static CountryCodeModel GetFromCode(string country)
+        public static CountryCodeModel GetFromCode(string countryCode)
         {
             if (_countryCodes == null)
                 LoadCountryCodes();
-            var cText = _countryCodes.FirstOrDefault(p => p.Code == country.ToString());
+            var cText = _countryCodes.FirstOrDefault(p => p.Code == countryCode.ToString());
             return cText;
         }
 

diff --git a/eRechnungWordPlugIn/ebIModels/Models/InvoiceModelExtensions.cs b/eRechnungWordPlugIn/ebIModels/Models/InvoiceModelExtensions.cs
@@ -281,20 +281,21 @@ public string GetFurtherIdentification(FurtherIdentificationType.SupportedIds id
     }
     public partial class CountryType
     {
+
         // private readonly ICountryCodes _countryCodes = new CountryCodesModels();
         public CountryType(CountryCodeType country)
-        {
+        {            
             var cText = CountryCodes.GetFromCode(country.ToString());
+            countryCodeField = country.ToString();
+            valueField = cText?.Country;
         }
         public string CountryCodeText
         {
             get {
-                return CountryCode?.ToString();
+                return CountryCode;
             }
             set {
-                if (CountryCode.ToString().Equals(value) == true)
-                    return;
-                string val = value;
+                string val = value??"AT";
                 CountryCode = ((CountryCodeType)Enum.Parse(typeof(CountryCodeType), val)).ToString();
             }
         }

diff --git a/eRechnungWordPlugIn/ebIModels/XmlData/ProductInfo.xml b/eRechnungWordPlugIn/ebIModels/XmlData/ProductInfo.xml
@@ -3,8 +3,8 @@
   <Title>ebInterface 5.0.3 Word PlugIn</Title>
   <Version>5.0.4+4</Version>
   <CompileInfo>Debug</CompileInfo>
-  <CompileTime>2019-04-12 16:13:01</CompileTime>
+  <CompileTime>2019-04-19 09:58:28</CompileTime>
   <Branch>TestBuild</Branch>
-  <LastCommit>2019-04-12 16:13:01</LastCommit>
-  <ChangeSetId>ff3e4c5</ChangeSetId>
+  <LastCommit>2019-04-19 09:58:28</LastCommit>
+  <ChangeSetId>e7fb8d0</ChangeSetId>
 </ProductInfo>