merge

1 files changed, 2 insertions, 14 deletions

diff --git a/Software/Visual_Studio/Tango.CSV/CsvFile.cs b/Software/Visual_Studio/Tango.CSV/CsvFile.cs
index 9b1d23bb3..1f21ce6e8 100644
--- a/Software/Visual_Studio/Tango.CSV/CsvFile.cs
+++ b/Software/Visual_Studio/Tango.CSV/CsvFile.cs
@@ -73,18 +73,6 @@ namespace Tango.CSV
         }
 
         /// <summary>
-        /// Gets the columns.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="csvSource">The CSV source.</param>
-        /// <returns></returns>
-        public static IEnumerable<string> GetColumns<T>(CsvSource csvSource) where T : new()
-        {
-            var csvFileReader = new CsvFileReader<T>(csvSource);
-            return csvFileReader.Columns;
-        }
-
-        /// <summary>
         /// Gets the field separator.
         /// </summary>
         /// <value>
@@ -106,7 +94,7 @@ namespace Tango.CSV
         /// <value>
         /// The columns.
         /// </value>
-        public IEnumerable<String> Columns { get; protected set; }
+        public IEnumerable<String> Columns { get; private set; }
 
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
@@ -305,7 +293,7 @@ namespace Tango.CSV
             if (pi == null) //Then try get by column index,
             {
                 pi = typeof(T).GetProperties()[index];
-                pi = typeof(T).GetProperties()[index]; //Workaround for some weired problem that makes the program not take the value.
+                pi = typeof(T).GetProperties()[index];
             }
 
             if (CsvFile.UseLambdas)