Refactoring method signature

feature/top10
Laurent 7 years ago
parent 3f21ba56be
commit aa3e94f30e
  1. 2
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 6
      app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt
  3. 8
      app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt

@ -514,7 +514,7 @@ class SSStats(realm: Realm, sessionSet: SessionSet, conditions: List<QueryCondit
this.initStatsWithSet(sessionSet)
} else { // dynamically filter and compute subset
val setSessions = sessionSet.sessions!!
val filteredSessions = setSessions.filter(realm, conditions)
val filteredSessions = setSessions.filter(conditions)
if (setSessions.size == filteredSessions.size) {
this.initStatsWithSet(sessionSet)
} else {

@ -1,6 +1,5 @@
package net.pokeranalytics.android.model.filter
import io.realm.Realm
import io.realm.RealmModel
import io.realm.RealmResults
import net.pokeranalytics.android.model.realm.ComputableResult
@ -49,9 +48,8 @@ interface Filterable : RealmModel {
}
inline fun <reified T : Filterable> RealmResults<T>.filter(realm: Realm, conditions: List<QueryCondition>) : RealmResults<T> {
val query = conditions.queryWith(this.where())
return query.findAll()
inline fun <reified T : Filterable> RealmResults<T>.filter(conditions: List<QueryCondition>) : RealmResults<T> {
return conditions.queryWith(this.where()).findAll()
}
class FilterHelper {

@ -1,8 +1,6 @@
package net.pokeranalytics.android.model.filter
import io.realm.Realm
import io.realm.RealmQuery
import io.realm.kotlin.where
import net.pokeranalytics.android.exceptions.PokerAnalyticsException
import net.pokeranalytics.android.model.realm.FilterCondition
import net.pokeranalytics.android.model.realm.Session
@ -14,9 +12,9 @@ fun List<QueryCondition>.name() : String {
return this.map { it.name }.joinToString(" / ")
}
inline fun <reified T : Filterable> List<QueryCondition>.query(realm: Realm): RealmQuery<T> {
return this.queryWith(realm.where())
}
//inline fun <reified T : Filterable> List<QueryCondition>.query(realm: Realm): RealmQuery<T> {
// return this.queryWith(realm.where())
//}
inline fun <reified T : Filterable> List<QueryCondition>.queryWith(query: RealmQuery<T>): RealmQuery<T> {
var realmQuery = query

Loading…
Cancel
Save