StdLib deprecations cleanup: length, size, indices and other collection operations.

This commit is contained in:
Ilya Gorbunov
2015-06-25 18:36:52 +03:00
parent 2c31a1a345
commit f3a19ebe11
11 changed files with 42 additions and 42 deletions
@@ -58,7 +58,7 @@ fun ResultSet.getColumnNames() : Array<String> {
* @columnNames you can specify column names to extract otherwise all columns will be extracted
*/
fun ResultSet.getValues(columnNames : Array<String> = getColumnNames()) : Array<Any?> {
return Array<Any?>(columnNames.size, {
return Array<Any?>(columnNames.size(), {
this[columnNames[it]]
})
}
@@ -68,7 +68,7 @@ fun ResultSet.getValues(columnNames : Array<String> = getColumnNames()) : Array<
* @param columnNames you can specify column names to extract otherwise all columns will be extracted
*/
fun ResultSet.getValuesAsMap(columnNames : Array<String> = getColumnNames()) : Map<String, Any?> {
val result = java.util.HashMap<String, Any?>(columnNames.size)
val result = java.util.HashMap<String, Any?>(columnNames.size())
columnNames.forEach {
result[it] = this[it]