[chronojump] SqliteRunEncoderExercise.Select returns List<RunEncoderExercise> instead of array

[Xavier de Blas <xaviblas src gnome org>]

commit 485b88d407ab31a30b062a8a80a2985059c082d2
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Feb 14 12:47:03 2022 +0100

    SqliteRunEncoderExercise.Select returns List<RunEncoderExercise> instead of array

 src/exportFiles/re.cs      |  4 ++--
 src/gui/app1/runEncoder.cs | 16 ++++++++--------
 src/sqlite/runEncoder.cs   | 42 +++++++++++++++---------------------------
 3 files changed, 25 insertions(+), 37 deletions(-)
---
diff --git a/src/exportFiles/re.cs b/src/exportFiles/re.cs
index a7fea8e0d..e55c77048 100644
--- a/src/exportFiles/re.cs
+++ b/src/exportFiles/re.cs
@@ -36,7 +36,7 @@ public class RunEncoderExport : ExportFiles
        private bool plotFittedPower;
 
        private List<RunEncoder> re_l;
-       private ArrayList reEx_l;
+       private List<RunEncoderExercise> reEx_l;
        private List<TriggerList> triggerListOfLists;
 
        //constructor
@@ -92,7 +92,7 @@ public class RunEncoderExport : ExportFiles
        {
                re_l = SqliteRunEncoder.Select(false, -1, personID, sessionID);
                personSession_l = SqlitePersonSession.SelectCurrentSessionPersons(sessionID, true);
-               reEx_l = SqliteRunEncoderExercise.Select (false, -1, false);
+               reEx_l = SqliteRunEncoderExercise.Select (false, -1);
 
                //get all the triggers to not be opening and closing sqlite on processSets
                triggerListOfLists = new List<TriggerList>();
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index 6969915bf..dfd1c7471 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -524,8 +524,8 @@ public partial class ChronoJumpWindow
 
        private void assignCurrentRunEncoderExercise()
        {
-               currentRunEncoderExercise = (RunEncoderExercise) SqliteRunEncoderExercise.Select (
-                                false, getExerciseIDFromAnyCombo(combo_run_encoder_exercise, 
runEncoderComboExercisesString, false), false)[0];
+               currentRunEncoderExercise = SqliteRunEncoderExercise.Select (
+                                false, getExerciseIDFromAnyCombo(combo_run_encoder_exercise, 
runEncoderComboExercisesString, false))[0];
        }
 
        //TODO: do all this with an "other" thread like in force sensor to allow connecting messages to be 
displayed
@@ -1861,8 +1861,8 @@ public partial class ChronoJumpWindow
 
        private void fillRunEncoderExerciseCombo(string name)
        {
-               ArrayList runEncoderExercises = SqliteRunEncoderExercise.Select (false, -1, false);
-               if(runEncoderExercises.Count == 0)
+               List<RunEncoderExercise> runEncoderExercises_l = SqliteRunEncoderExercise.Select (false, -1);
+               if(runEncoderExercises_l.Count == 0)
                {
                        runEncoderComboExercisesString = new String [0];
                        UtilGtk.ComboUpdate(combo_run_encoder_exercise, new String[0], "");
@@ -1906,8 +1906,8 @@ public partial class ChronoJumpWindow
                        return;
                }
 
-               RunEncoderExercise ex = (RunEncoderExercise) SqliteRunEncoderExercise.Select (
-                                false, getExerciseIDFromAnyCombo(combo_run_encoder_exercise, 
runEncoderComboExercisesString, false), false)[0];
+               RunEncoderExercise ex = SqliteRunEncoderExercise.Select (
+                                false, getExerciseIDFromAnyCombo(combo_run_encoder_exercise, 
runEncoderComboExercisesString, false))[0];
                LogB.Information("selected exercise: " + ex.ToString());
 
                show_contacts_exercise_add_edit (false);
@@ -2132,8 +2132,8 @@ public partial class ChronoJumpWindow
                        return;
                }
 
-               RunEncoderExercise ex = (RunEncoderExercise) SqliteRunEncoderExercise.Select (
-                                false, getExerciseIDFromAnyCombo(combo_run_encoder_exercise, 
runEncoderComboExercisesString, false), false)[0];
+               RunEncoderExercise ex = SqliteRunEncoderExercise.Select (
+                                false, getExerciseIDFromAnyCombo(combo_run_encoder_exercise, 
runEncoderComboExercisesString, false))[0];
 
                LogB.Information("selected exercise: " + ex.ToString());
 
diff --git a/src/sqlite/runEncoder.cs b/src/sqlite/runEncoder.cs
index 304ff4421..9ae659e8a 100644
--- a/src/sqlite/runEncoder.cs
+++ b/src/sqlite/runEncoder.cs
@@ -436,7 +436,7 @@ class SqliteRunEncoderExercise : Sqlite
        }
 
 
-       public static ArrayList Select (bool dbconOpened, int uniqueID, bool onlyNames)
+       public static List<RunEncoderExercise> Select (bool dbconOpened, int uniqueID)
        {
                if(! dbconOpened)
                        Sqlite.Open();
@@ -445,10 +445,7 @@ class SqliteRunEncoderExercise : Sqlite
                if(uniqueID != -1)
                        uniqueIDStr = " WHERE " + table + ".uniqueID = " + uniqueID;
 
-               if(onlyNames)
-                       dbcmd.CommandText = "SELECT name FROM " + table + uniqueIDStr;
-               else
-                       dbcmd.CommandText = "SELECT * FROM " + table + uniqueIDStr;
+               dbcmd.CommandText = "SELECT * FROM " + table + uniqueIDStr;
 
                LogB.SQL(dbcmd.CommandText.ToString());
                dbcmd.ExecuteNonQuery();
@@ -456,35 +453,26 @@ class SqliteRunEncoderExercise : Sqlite
                SqliteDataReader reader;
                reader = dbcmd.ExecuteReader();
 
-               ArrayList array = new ArrayList(1);
-               RunEncoderExercise ex = new RunEncoderExercise();
+               List<RunEncoderExercise> list = new List<RunEncoderExercise>();
+               while(reader.Read()) {
+                       //int angleDefault = 0;
 
-               if(onlyNames) {
-                       while(reader.Read()) {
-                               ex = new RunEncoderExercise (reader[0].ToString());
-                               array.Add(ex);
-                       }
-               } else {
-                       while(reader.Read()) {
-                               //int angleDefault = 0;
-
-                               ex = new RunEncoderExercise (
-                                               Convert.ToInt32(reader[0].ToString()),  //uniqueID
-                                               reader[1].ToString(),                   //name
-                                               reader[2].ToString(),                   //description
-                                               Convert.ToInt32(reader[3].ToString()),  //segmentMeters
-                                               Util.SQLStringToListInt(reader[4].ToString(), ";"),     
//segmentVariableCm
-                                               Util.IntToBool(Convert.ToInt32(reader[5].ToString()))
-                                               );
-                               array.Add(ex);
-                       }
+                       RunEncoderExercise ex = new RunEncoderExercise (
+                                       Convert.ToInt32(reader[0].ToString()),  //uniqueID
+                                       reader[1].ToString(),                   //name
+                                       reader[2].ToString(),                   //description
+                                       Convert.ToInt32(reader[3].ToString()),  //segmentCm (cm since DB 2.33)
+                                       Util.SQLStringToListInt(reader[4].ToString(), ";"),     
//segmentVariableCm
+                                       Util.IntToBool(Convert.ToInt32(reader[5].ToString()))
+                                       );
+                       list.Add(ex);
                }
 
                reader.Close();
                if(! dbconOpened)
                        Sqlite.Close();
 
-               return array;
+               return list;
        }
 
 }