Change use of IllegalStateException to PAIllegalStateException

csv
Laurent 7 years ago
parent 6bcdece057
commit 44d48bdc10
  1. 5
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 3
      app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
  3. 3
      app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollReport.kt
  5. 3
      app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
  6. 5
      app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt
  7. 8
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  8. 3
      app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
  9. 5
      app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt
  10. 7
      app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt
  11. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
  12. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
  13. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt
  14. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt
  15. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
  16. 5
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt
  17. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt

@ -4,6 +4,7 @@ import android.content.Context
import io.realm.Realm import io.realm.Realm
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.calculus.Stat.* import net.pokeranalytics.android.calculus.Stat.*
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.Criteria import net.pokeranalytics.android.model.Criteria
import net.pokeranalytics.android.model.combined import net.pokeranalytics.android.model.combined
import net.pokeranalytics.android.model.extensions.hourlyDuration import net.pokeranalytics.android.model.extensions.hourlyDuration
@ -95,7 +96,7 @@ class Calculator {
TABLE -> TableReportActivity::class.java TABLE -> TableReportActivity::class.java
PROGRESS -> ProgressReportActivity::class.java PROGRESS -> ProgressReportActivity::class.java
COMPARISON -> ComparisonReportActivity::class.java COMPARISON -> ComparisonReportActivity::class.java
else -> throw IllegalStateException("undefined activity for report display") else -> throw PAIllegalStateException("undefined activity for report display")
// MAP -> R.string.map // MAP -> R.string.map
// POLYNOMIAL -> null // POLYNOMIAL -> null
@ -378,7 +379,7 @@ class Calculator {
} }
val session = val session =
computable.session ?: throw IllegalStateException("Computing lone ComputableResult") computable.session ?: throw PAIllegalStateException("Computing lone ComputableResult")
results.addEvolutionValue(tSum, stat = NET_RESULT, data = session) results.addEvolutionValue(tSum, stat = NET_RESULT, data = session)
results.addEvolutionValue(tSum / index, stat = AVERAGE, data = session) results.addEvolutionValue(tSum / index, stat = AVERAGE, data = session)
results.addEvolutionValue(index.toDouble(), stat = NUMBER_OF_GAMES, data = session) results.addEvolutionValue(index.toDouble(), stat = NUMBER_OF_GAMES, data = session)

@ -5,6 +5,7 @@ import com.github.mikephil.charting.data.*
import io.realm.Realm import io.realm.Realm
import io.realm.RealmResults import io.realm.RealmResults
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.filter.Query import net.pokeranalytics.android.model.filter.Query
import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.model.interfaces.GraphIdentifiableEntry import net.pokeranalytics.android.model.interfaces.GraphIdentifiableEntry
@ -440,7 +441,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu
this.computedStat(stat)?.let { this.computedStat(stat)?.let {
return it.format() return it.format()
} ?: run { } ?: run {
throw IllegalStateException("Missing stat in results") throw PAIllegalStateException("Missing stat in results")
} }
} }

@ -3,6 +3,7 @@ package net.pokeranalytics.android.calculus
import android.content.Context import android.content.Context
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.FormattingException import net.pokeranalytics.android.exceptions.FormattingException
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.ui.view.RowViewType
import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.NULL_TEXT
@ -127,7 +128,7 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
MAXIMUM_DURATION -> R.string.longest_session MAXIMUM_DURATION -> R.string.longest_session
DAYS_PLAYED -> R.string.days_played DAYS_PLAYED -> R.string.days_played
TOTAL_BUYIN -> R.string.total_buyin TOTAL_BUYIN -> R.string.total_buyin
else -> throw IllegalStateException("Stat ${this.name} name required but undefined") else -> throw PAIllegalStateException("Stat ${this.name} name required but undefined")
} }
} }

@ -215,7 +215,7 @@ class BankrollReportSetup(val bankrollId: String? = null, val from: Date? = null
val query = Query() val query = Query()
this.bankrollId?.let { this.bankrollId?.let {
val bankroll = realm.findById<Bankroll>(it) ?: throw IllegalStateException("Bankroll not found with id $it") val bankroll = realm.findById<Bankroll>(it) ?: throw PAIllegalStateException("Bankroll not found with id $it")
val bankrollCondition = QueryCondition.AnyBankroll(bankroll) val bankrollCondition = QueryCondition.AnyBankroll(bankroll)
query.add(bankrollCondition) query.add(bankrollCondition)
} }

@ -4,6 +4,7 @@ import io.realm.Realm
import io.realm.Sort import io.realm.Sort
import io.realm.kotlin.where import io.realm.kotlin.where
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.exceptions.PokerAnalyticsException import net.pokeranalytics.android.exceptions.PokerAnalyticsException
import net.pokeranalytics.android.model.Criteria.Bankrolls.comparison import net.pokeranalytics.android.model.Criteria.Bankrolls.comparison
import net.pokeranalytics.android.model.Criteria.Blinds.comparison import net.pokeranalytics.android.model.Criteria.Blinds.comparison
@ -329,7 +330,7 @@ interface CustomFieldCriteria {
var customFieldId: String var customFieldId: String
fun customField(realm: Realm) : CustomField { fun customField(realm: Realm) : CustomField {
return realm.findById(this.customFieldId) ?: throw IllegalStateException("Custom field not found") return realm.findById(this.customFieldId) ?: throw PAIllegalStateException("Custom field not found")
} }
fun customFieldType(realm: Realm): Int { fun customFieldType(realm: Realm): Int {

@ -6,6 +6,7 @@ import io.realm.RealmResults
import io.realm.annotations.Ignore import io.realm.annotations.Ignore
import io.realm.annotations.LinkingObjects import io.realm.annotations.LinkingObjects
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.filter.Filterable import net.pokeranalytics.android.model.filter.Filterable
import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.filter.QueryCondition
@ -52,10 +53,10 @@ open class Result : RealmObject(), Filterable {
this.session?.bankroll?.let { bankroll -> this.session?.bankroll?.let { bankroll ->
if (bankroll.live) { if (bankroll.live) {
throw IllegalStateException("Can't set net result on a live bankroll") throw PAIllegalStateException("Can't set net result on a live bankroll")
} }
} ?: run { } ?: run {
throw IllegalStateException("Session doesn't have any bankroll") throw PAIllegalStateException("Session doesn't have any bankroll")
} }
field = value field = value

@ -500,12 +500,12 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
if (pauseDate != null) { if (pauseDate != null) {
this.breakDuration += Date().time - pauseDate.time this.breakDuration += Date().time - pauseDate.time
} else { } else {
throw IllegalStateException("When resuming, the pause date must be set") throw PAIllegalStateException("When resuming, the pause date must be set")
} }
this.pauseDate = null this.pauseDate = null
} }
else -> { else -> {
throw IllegalStateException("unmanaged session state") throw PAIllegalStateException("unmanaged session state")
} }
} }
} }
@ -526,7 +526,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
SessionState.STARTED -> { SessionState.STARTED -> {
this.pauseDate = Date() this.pauseDate = Date()
} }
else -> throw IllegalStateException("Pausing a session in an unmanaged state") else -> throw PAIllegalStateException("Pausing a session in an unmanaged state")
} }
} }
} }
@ -1100,7 +1100,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
} }
} ?: run { } ?: run {
throw java.lang.IllegalStateException("Asking for statIds on Session without Result") throw PAIllegalStateException("Asking for statIds on Session without Result")
} }
} }

@ -6,6 +6,7 @@ import io.realm.RealmObject
import io.realm.annotations.Ignore import io.realm.annotations.Ignore
import io.realm.annotations.PrimaryKey import io.realm.annotations.PrimaryKey
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.interfaces.DeleteValidityStatus import net.pokeranalytics.android.model.interfaces.DeleteValidityStatus
import net.pokeranalytics.android.model.interfaces.Identifiable import net.pokeranalytics.android.model.interfaces.Identifiable
import net.pokeranalytics.android.model.interfaces.NameManageable import net.pokeranalytics.android.model.interfaces.NameManageable
@ -49,7 +50,7 @@ open class TransactionType : RealmObject(), NameManageable, StaticRowRepresentab
type?.let { type?.let {
return it return it
} }
throw IllegalStateException("Transaction type ${value.name} should exist in database!") throw PAIllegalStateException("Transaction type ${value.name} should exist in database!")
} }
} }

@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.utils
import io.realm.RealmQuery import io.realm.RealmQuery
import io.realm.RealmResults import io.realm.RealmResults
import net.pokeranalytics.android.exceptions.ModelException import net.pokeranalytics.android.exceptions.ModelException
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.model.realm.SessionSet import net.pokeranalytics.android.model.realm.SessionSet
import kotlin.math.max import kotlin.math.max
@ -23,7 +24,7 @@ class SessionSetManager {
fun updateTimeline(session: Session) { fun updateTimeline(session: Session) {
if (!session.realm.isInTransaction) { if (!session.realm.isInTransaction) {
throw IllegalStateException("realm should be in transaction at this point") throw PAIllegalStateException("realm should be in transaction at this point")
} }
if (session.startDate == null) { if (session.startDate == null) {
@ -154,7 +155,7 @@ class SessionSetManager {
fun removeFromTimeline(session: Session) { fun removeFromTimeline(session: Session) {
if (!session.realm.isInTransaction) { if (!session.realm.isInTransaction) {
throw IllegalStateException("realm should be in transaction at this point") throw PAIllegalStateException("realm should be in transaction at this point")
} }
val sessionSet = session.sessionSet val sessionSet = session.sessionSet

@ -1,6 +1,7 @@
package net.pokeranalytics.android.ui.adapter package net.pokeranalytics.android.ui.adapter
import android.content.Context import android.content.Context
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.util.TextFormat
@ -42,21 +43,21 @@ interface StaticRowRepresentableDataSource: RowRepresentableDataSource {
this.adapterRows()?.let { this.adapterRows()?.let {
return it[position] return it[position]
} }
throw IllegalStateException("Need to implement Data Source") throw PAIllegalStateException("Need to implement Data Source")
} }
override fun numberOfRows(): Int { override fun numberOfRows(): Int {
this.adapterRows()?.let { this.adapterRows()?.let {
return it.size return it.size
} }
throw IllegalStateException("Need to implement Data Source") throw PAIllegalStateException("Need to implement Data Source")
} }
override fun viewTypeForPosition(position:Int): Int { override fun viewTypeForPosition(position:Int): Int {
this.rowRepresentableForPosition(position)?.let { this.rowRepresentableForPosition(position)?.let {
return it.viewType return it.viewType
} }
throw IllegalStateException("Need to implement Data Source") throw PAIllegalStateException("Need to implement Data Source")
} }
} }

@ -13,6 +13,7 @@ import io.realm.Realm
import io.realm.RealmResults import io.realm.RealmResults
import kotlinx.android.synthetic.main.fragment_data_list.* import kotlinx.android.synthetic.main.fragment_data_list.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.LiveData
import net.pokeranalytics.android.model.interfaces.Deletable import net.pokeranalytics.android.model.interfaces.Deletable
import net.pokeranalytics.android.model.interfaces.Identifiable import net.pokeranalytics.android.model.interfaces.Identifiable
@ -86,7 +87,7 @@ open class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataS
val itemId = item.id val itemId = item.id
deleteItem(dataListAdapter, items, itemId) deleteItem(dataListAdapter, items, itemId)
} else { } else {
throw IllegalStateException("Item with position $position not found") throw PAIllegalStateException("Item with position $position not found")
} }
} }

@ -11,6 +11,7 @@ import androidx.recyclerview.widget.DiffUtil
import kotlinx.android.synthetic.main.fragment_session.* import kotlinx.android.synthetic.main.fragment_session.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.calculus.bankroll.BankrollReportManager import net.pokeranalytics.android.calculus.bankroll.BankrollReportManager
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.LiveData
import net.pokeranalytics.android.model.extensions.SessionState import net.pokeranalytics.android.model.extensions.SessionState
import net.pokeranalytics.android.model.extensions.getState import net.pokeranalytics.android.model.extensions.getState
@ -173,7 +174,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
sessionHasBeenCustomized = true sessionHasBeenCustomized = true
try { try {
currentSession.updateValue(value, row) currentSession.updateValue(value, row)
} catch (e: IllegalStateException) { } catch (e: PAIllegalStateException) {
Toast.makeText(context, e.message, Toast.LENGTH_LONG).show() Toast.makeText(context, e.message, Toast.LENGTH_LONG).show()
return return
} }

@ -24,6 +24,7 @@ import com.android.billingclient.api.SkuDetails
import com.android.billingclient.api.SkuDetailsResponseListener import com.android.billingclient.api.SkuDetailsResponseListener
import kotlinx.android.synthetic.main.fragment_subscription.* import kotlinx.android.synthetic.main.fragment_subscription.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.ui.extensions.px import net.pokeranalytics.android.ui.extensions.px
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.ScreenSlidePageFragment import net.pokeranalytics.android.ui.fragment.components.ScreenSlidePageFragment
@ -101,7 +102,7 @@ class SubscriptionFragment : PokerAnalyticsFragment(), SkuDetailsResponseListene
this.selectedProduct?.let { this.selectedProduct?.let {
AppGuard.initiatePurchase(this.requireActivity(), it, this) AppGuard.initiatePurchase(this.requireActivity(), it, this)
} ?: run { } ?: run {
throw IllegalStateException("Attempt to initiate purchase while no product has been chosen") throw PAIllegalStateException("Attempt to initiate purchase while no product has been chosen")
} }
} }

@ -13,6 +13,7 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.interfaces.Deletable import net.pokeranalytics.android.model.interfaces.Deletable
import net.pokeranalytics.android.ui.activity.DataListActivity import net.pokeranalytics.android.ui.activity.DataListActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@ -126,7 +127,7 @@ abstract class DeletableItemFragment : RealmFragment() {
} }
snackBar?.show() snackBar?.show()
} ?: run { } ?: run {
throw IllegalStateException("mainLayout is not defined") throw PAIllegalStateException("mainLayout is not defined")
} }
} }

@ -15,6 +15,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import io.realm.RealmModel import io.realm.RealmModel
import kotlinx.android.synthetic.main.fragment_bottom_sheet.* import kotlinx.android.synthetic.main.fragment_bottom_sheet.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.LiveData
import net.pokeranalytics.android.ui.activity.EditableDataActivity import net.pokeranalytics.android.ui.activity.EditableDataActivity
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
@ -132,7 +133,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
SessionRow.TOURNAMENT_NAME -> LiveData.TOURNAMENT_NAME SessionRow.TOURNAMENT_NAME -> LiveData.TOURNAMENT_NAME
SessionRow.TOURNAMENT_FEATURE -> LiveData.TOURNAMENT_FEATURE SessionRow.TOURNAMENT_FEATURE -> LiveData.TOURNAMENT_FEATURE
TransactionRow.TYPE -> LiveData.TRANSACTION_TYPE TransactionRow.TYPE -> LiveData.TRANSACTION_TYPE
else -> throw IllegalStateException("row $row does not have an associated LiveData value") else -> throw PAIllegalStateException("row $row does not have an associated LiveData value")
} }
EditableDataActivity.newInstanceForResult( EditableDataActivity.newInstanceForResult(

@ -8,6 +8,7 @@ import io.realm.RealmResults
import kotlinx.android.synthetic.main.bottom_sheet_list.* import kotlinx.android.synthetic.main.bottom_sheet_list.*
import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.* import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException
import net.pokeranalytics.android.ui.adapter.LiveRowRepresentableDataSource import net.pokeranalytics.android.ui.adapter.LiveRowRepresentableDataSource
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@ -39,14 +40,14 @@ open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentable
realmData?.let { realmData?.let {
return it[position] as RowRepresentable return it[position] as RowRepresentable
} }
throw IllegalStateException("Need to implement Data Source") throw PAIllegalStateException("Need to implement Data Source")
} }
override fun numberOfRows(): Int { override fun numberOfRows(): Int {
realmData?.let { realmData?.let {
return it.size return it.size
} }
throw IllegalStateException("Need to implement Data Source") throw PAIllegalStateException("Need to implement Data Source")
} }
override fun viewTypeForPosition(position: Int): Int { override fun viewTypeForPosition(position: Int): Int {

@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import kotlinx.android.synthetic.main.fragment_progress_report.* import kotlinx.android.synthetic.main.fragment_progress_report.*
import net.pokeranalytics.android.calculus.Report import net.pokeranalytics.android.calculus.Report
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.CustomFieldCriteria import net.pokeranalytics.android.model.CustomFieldCriteria
import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.LiveData
import net.pokeranalytics.android.model.realm.ReportSetup import net.pokeranalytics.android.model.realm.ReportSetup
@ -91,7 +92,7 @@ abstract class AbstractReportFragment : DataManagerFragment() {
dialog.show() dialog.show()
} ?: throw IllegalStateException("Activity cannot be null") } ?: throw PAIllegalStateException("Activity cannot be null")
} }

Loading…
Cancel
Save