Non-generics cleanup.

cincuranet · cincuranet · commit 0b5ee7332563 · 2018-08-20T10:56:56.000+02:00
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient.Tests/FbArrayTests.cs b/Provider/src/FirebirdSql.Data.FirebirdClient.Tests/FbArrayTests.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Linq;
 using System.Security.Cryptography;
 using FirebirdSql.Data.FirebirdClient;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient.Tests/FbCommandTests.cs b/Provider/src/FirebirdSql.Data.FirebirdClient.Tests/FbCommandTests.cs
@@ -16,7 +16,7 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.Text;
 using System.Threading;
@@ -347,7 +347,7 @@ public void UnicodeTest()
 					create.ExecuteNonQuery();
 				}
 
-				var l = new ArrayList();
+				var l = new List<string>();
 
 				l.Add("INSERT INTO VARCHARTEST (VARCHAR_FIELD) VALUES ('1')");
 				l.Add("INSERT INTO VARCHARTEST (VARCHAR_FIELD) VALUES ('11')");
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/SspiHelper.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/SspiHelper.cs
@@ -19,7 +19,6 @@
 
 using System;
 using System.Text;
-using System.Collections;
 using System.Runtime.InteropServices;
 
 using FirebirdSql.Data.Common;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsArray.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsArray.cs
@@ -19,7 +19,6 @@
 using System.Net;
 using System.Text;
 using System.IO;
-using System.Collections;
 using System.Globalization;
 
 using FirebirdSql.Data.Common;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
@@ -533,12 +532,12 @@ public virtual string GetServerVersion()
 			return (string)info[info.Count - 1];
 		}
 
-		public virtual ArrayList GetDatabaseInfo(byte[] items)
+		public virtual List<object> GetDatabaseInfo(byte[] items)
 		{
 			return GetDatabaseInfo(items, IscCodes.DEFAULT_MAX_BUFFER_SIZE);
 		}
 
-		public virtual ArrayList GetDatabaseInfo(byte[] items, int bufferLength)
+		public virtual List<object> GetDatabaseInfo(byte[] items, int bufferLength)
 		{
 			var buffer = new byte[bufferLength];
 			DatabaseInfo(items, buffer, buffer.Length);
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsDatabase.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net), Vladimir Bodecek
 
 using System;
-using System.Collections;
 using System.Data;
 using System.Globalization;
 using System.IO;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsStatement.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsDatabase.cs
@@ -16,7 +16,6 @@
 //$Authors = Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Data;
 using System.Globalization;
 using System.IO;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsStatement.cs
@@ -16,7 +16,6 @@
 //$Authors = Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs
@@ -16,7 +16,6 @@
 //$Authors = Hajime Nakagami, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Data;
 using System.Globalization;
 using System.IO;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsStatement.cs
@@ -16,12 +16,12 @@
 //$Authors = Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
 using FirebirdSql.Data.Common;
+using System.Collections;
 
 namespace FirebirdSql.Data.Client.Managed.Version13
 {
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/XdrStream.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/XdrStream.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.IO;
 using System.Net;
 using System.Text;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesArray.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesArray.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Globalization;
 using System.IO;
 using System.Net;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs
@@ -16,12 +16,12 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Threading;
 using System.Text;
 
 using FirebirdSql.Data.Common;
 using FirebirdSql.Data.Client.Native.Handle;
+using System.Collections.Generic;
 
 namespace FirebirdSql.Data.Client.Native
 {
@@ -299,12 +299,12 @@ public string GetServerVersion()
 			return GetDatabaseInfo(items, IscCodes.BUFFER_SIZE_128)[0].ToString();
 		}
 
-		public ArrayList GetDatabaseInfo(byte[] items)
+		public List<object> GetDatabaseInfo(byte[] items)
 		{
 			return GetDatabaseInfo(items, IscCodes.DEFAULT_MAX_BUFFER_SIZE);
 		}
 
-		public ArrayList GetDatabaseInfo(byte[] items, int bufferLength)
+		public List<object> GetDatabaseInfo(byte[] items, int bufferLength)
 		{
 			var buffer = new byte[bufferLength];
 
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesStatement.cs
@@ -16,7 +16,7 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Text;
 
 using FirebirdSql.Data.Common;
@@ -38,7 +38,7 @@ internal sealed class FesStatement : StatementBase
 		private StatementState _state;
 		private DbStatementType _statementType;
 		private bool _allRowsFetched;
-		private Queue _outputParams;
+		private Queue<DbValue[]> _outputParams;
 		private int _recordsAffected;
 		private bool _returnRecordsAffected;
 		private IntPtr[] _statusVector;
@@ -155,7 +155,7 @@ public FesStatement(IDatabase db, TransactionBase transaction)
 			_recordsAffected = -1;
 			_db = (FesDatabase)db;
 			_handle = new StatementHandle();
-			_outputParams = new Queue();
+			_outputParams = new Queue<DbValue[]>();
 			_statusVector = new IntPtr[IscCodes.ISC_STATUS_LENGTH];
 			_fetchSqlDa = IntPtr.Zero;
 
@@ -428,7 +428,7 @@ public override DbValue[] GetOutputParameters()
 		{
 			if (_outputParams != null && _outputParams.Count > 0)
 			{
-				return (DbValue[])_outputParams.Dequeue();
+				return _outputParams.Dequeue();
 			}
 
 			return null;
@@ -589,10 +589,7 @@ private void ClearStatusVector()
 
 		private void Clear()
 		{
-			if (_outputParams != null && _outputParams.Count > 0)
-			{
-				_outputParams.Clear();
-			}
+			_outputParams?.Clear();
 		}
 
 		private void ClearAll()
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/BlobBase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/BlobBase.cs
@@ -19,7 +19,6 @@
 using System.Data;
 using System.Text;
 using System.IO;
-using System.Collections;
 
 namespace FirebirdSql.Data.Common
 {
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IDatabase.cs
@@ -16,8 +16,8 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
+using System.Collections.Generic;
 using System.Data;
-using System.Collections;
 
 namespace FirebirdSql.Data.Common
 {
@@ -46,8 +46,8 @@ internal interface IDatabase : IDisposable
 		StatementBase CreateStatement();
 		StatementBase CreateStatement(TransactionBase transaction);
 
-		ArrayList GetDatabaseInfo(byte[] items);
-		ArrayList GetDatabaseInfo(byte[] items, int bufferLength);
+		List<object> GetDatabaseInfo(byte[] items);
+		List<object> GetDatabaseInfo(byte[] items, int bufferLength);
 
 		void CloseEventManager();
 		void QueueEvents(RemoteEvent events);
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscException.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscException.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscHelper.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscHelper.cs
@@ -16,7 +16,7 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Resources;
 using System.Text;
@@ -25,9 +25,9 @@ namespace FirebirdSql.Data.Common
 {
 	internal static class IscHelper
 	{
-		public static ArrayList ParseDatabaseInfo(byte[] buffer)
+		public static List<object> ParseDatabaseInfo(byte[] buffer)
 		{
-			var info = new ArrayList();
+			var info = new List<object>();
 
 			var pos = 0;
 			var length = 0;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.ComponentModel;
 using System.Data;
 using System.Data.Common;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnection.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnection.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.ComponentModel;
 using System.Data;
 using System.Data.Common;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionStringBuilder.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionStringBuilder.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Data;
 using System.Data.Common;
 using System.Globalization;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbDataAdapter.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbDataAdapter.cs
@@ -17,7 +17,6 @@
 
 #if !NETSTANDARD1_6
 using System;
-using System.Collections;
 using System.ComponentModel;
 using System.Data;
 using System.Data.Common;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbDatabaseInfo.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbDatabaseInfo.cs
@@ -18,9 +18,10 @@
 using System;
 using System.Text;
 using System.Data;
-using System.Collections;
 
 using FirebirdSql.Data.Common;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace FirebirdSql.Data.FirebirdClient
 {
@@ -215,9 +216,9 @@ public int ActiveTransactions
 			get { return GetInt32(IscCodes.isc_info_active_transactions); }
 		}
 
-		public ArrayList ActiveUsers
+		public List<string> ActiveUsers
 		{
-			get { return GetArrayList(IscCodes.isc_info_user_names); }
+			get { return GetList<string>(IscCodes.isc_info_user_names); }
 		}
 
 		#endregion
@@ -283,7 +284,7 @@ private bool GetBoolean(byte item)
 			return (info.Count > 0 ? (bool)info[0] : false);
 		}
 
-		private ArrayList GetArrayList(byte item)
+		private List<T> GetList<T>(byte item)
 		{
 			FbConnection.EnsureOpen(_connection);
 
@@ -294,7 +295,7 @@ private ArrayList GetArrayList(byte item)
 					IscCodes.isc_info_end
 				};
 
-			return db.GetDatabaseInfo(items);
+			return db.GetDatabaseInfo(items).Cast<T>().ToList();
 		}
 
 		#endregion
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbErrorCollection.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbErrorCollection.cs
@@ -16,11 +16,11 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.ComponentModel;
 using System.Collections.Generic;
 
 using FirebirdSql.Data.Common;
+using System.Collections;
 
 namespace FirebirdSql.Data.FirebirdClient
 {
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbParameterCollection.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbParameterCollection.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -26,6 +25,7 @@
 
 using FirebirdSql.Data.Common;
 using System.Text;
+using System.Collections;
 
 namespace FirebirdSql.Data.FirebirdClient
 {
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbTransaction.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbTransaction.cs
@@ -18,7 +18,6 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Collections;
 
 using FirebirdSql.Data.Common;
 
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Schema/FbSchema.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Schema/FbSchema.cs
@@ -22,7 +22,6 @@
 using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Collections;
 
 using FirebirdSql.Data.FirebirdClient;
 using FirebirdSql.Data.Common;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbRestoreFlags.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbRestoreFlags.cs
@@ -16,7 +16,6 @@
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
 using System;
-using System.Collections;
 
 using FirebirdSql.Data.Common;
 
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbSecurity.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbSecurity.cs
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbServerProperties.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbServerProperties.cs
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbService.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbService.cs
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbStreamingBackup.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbStreamingBackup.cs
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbStreamingRestore.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbStreamingRestore.cs

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`//$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)`
`17`	`17`
`18`	`18`	`using System;`
`19`		`-using System.Collections;`
`20`	`19`	`using System.Collections.Generic;`
`21`	`20`	`using System.Data;`
`22`	`21`	`using System.Globalization;`
`@@ -533,12 +532,12 @@ public virtual string GetServerVersion()`
`533`	`532`	`return (string)info[info.Count - 1];`
`534`	`533`	`}`
`535`	`534`
`536`		`- public virtual ArrayList GetDatabaseInfo(byte[] items)`
	`535`	`+ public virtual List<object> GetDatabaseInfo(byte[] items)`
`537`	`536`	`{`
`538`	`537`	`return GetDatabaseInfo(items, IscCodes.DEFAULT_MAX_BUFFER_SIZE);`
`539`	`538`	`}`
`540`	`539`
`541`		`- public virtual ArrayList GetDatabaseInfo(byte[] items, int bufferLength)`
	`540`	`+ public virtual List<object> GetDatabaseInfo(byte[] items, int bufferLength)`
`542`	`541`	`{`
`543`	`542`	`var buffer = new byte[bufferLength];`
`544`	`543`	`DatabaseInfo(items, buffer, buffer.Length);`