From 44d48bdc1006fe044586082d243dfc481894b2ad Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 14 Jun 2019 12:34:24 +0200 Subject: [PATCH] Change use of IllegalStateException to PAIllegalStateException --- .../net/pokeranalytics/android/calculus/Calculator.kt | 5 +++-- .../java/net/pokeranalytics/android/calculus/Report.kt | 3 ++- .../main/java/net/pokeranalytics/android/calculus/Stat.kt | 3 ++- .../android/calculus/bankroll/BankrollReport.kt | 2 +- .../java/net/pokeranalytics/android/model/Criteria.kt | 3 ++- .../java/net/pokeranalytics/android/model/realm/Result.kt | 5 +++-- .../net/pokeranalytics/android/model/realm/Session.kt | 8 ++++---- .../pokeranalytics/android/model/realm/TransactionType.kt | 3 ++- .../android/model/utils/SessionSetManager.kt | 5 +++-- .../android/ui/adapter/RowRepresentableDataSource.kt | 7 ++++--- .../android/ui/fragment/DataListFragment.kt | 3 ++- .../pokeranalytics/android/ui/fragment/SessionFragment.kt | 3 ++- .../android/ui/fragment/SubscriptionFragment.kt | 3 ++- .../ui/fragment/components/DeletableItemFragment.kt | 3 ++- .../components/bottomsheet/BottomSheetFragment.kt | 3 ++- .../components/bottomsheet/BottomSheetListFragment.kt | 5 +++-- .../android/ui/fragment/report/AbstractReportFragment.kt | 3 ++- 17 files changed, 41 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt index 2f1726cb..7185f0d9 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt @@ -4,6 +4,7 @@ import android.content.Context import io.realm.Realm import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Stat.* +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.Criteria import net.pokeranalytics.android.model.combined import net.pokeranalytics.android.model.extensions.hourlyDuration @@ -95,7 +96,7 @@ class Calculator { TABLE -> TableReportActivity::class.java PROGRESS -> ProgressReportActivity::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 // POLYNOMIAL -> null @@ -378,7 +379,7 @@ class Calculator { } 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 / index, stat = AVERAGE, data = session) results.addEvolutionValue(index.toDouble(), stat = NUMBER_OF_GAMES, data = session) diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt index 63501b46..03698369 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt @@ -5,6 +5,7 @@ import com.github.mikephil.charting.data.* import io.realm.Realm import io.realm.RealmResults import net.pokeranalytics.android.R +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.filter.Query import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.interfaces.GraphIdentifiableEntry @@ -440,7 +441,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu this.computedStat(stat)?.let { return it.format() } ?: run { - throw IllegalStateException("Missing stat in results") + throw PAIllegalStateException("Missing stat in results") } } diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt index ec9e50a7..ba6b27d7 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.calculus import android.content.Context import net.pokeranalytics.android.R 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.RowViewType 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 DAYS_PLAYED -> R.string.days_played 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") } } diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollReport.kt b/app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollReport.kt index 69df9109..ce66fe36 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollReport.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollReport.kt @@ -215,7 +215,7 @@ class BankrollReportSetup(val bankrollId: String? = null, val from: Date? = null val query = Query() this.bankrollId?.let { - val bankroll = realm.findById(it) ?: throw IllegalStateException("Bankroll not found with id $it") + val bankroll = realm.findById(it) ?: throw PAIllegalStateException("Bankroll not found with id $it") val bankrollCondition = QueryCondition.AnyBankroll(bankroll) query.add(bankrollCondition) } diff --git a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt index fa679d19..67e6f1da 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt @@ -4,6 +4,7 @@ import io.realm.Realm import io.realm.Sort import io.realm.kotlin.where import net.pokeranalytics.android.R +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.exceptions.PokerAnalyticsException import net.pokeranalytics.android.model.Criteria.Bankrolls.comparison import net.pokeranalytics.android.model.Criteria.Blinds.comparison @@ -329,7 +330,7 @@ interface CustomFieldCriteria { var customFieldId: String 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 { diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt index 644d0de3..19394fcd 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt @@ -6,6 +6,7 @@ import io.realm.RealmResults import io.realm.annotations.Ignore import io.realm.annotations.LinkingObjects import io.realm.annotations.RealmClass +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.filter.Filterable import net.pokeranalytics.android.model.filter.QueryCondition @@ -52,10 +53,10 @@ open class Result : RealmObject(), Filterable { this.session?.bankroll?.let { bankroll -> 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 { - throw IllegalStateException("Session doesn't have any bankroll") + throw PAIllegalStateException("Session doesn't have any bankroll") } field = value diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 99e5ed52..af897af9 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -500,12 +500,12 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat if (pauseDate != null) { this.breakDuration += Date().time - pauseDate.time } else { - throw IllegalStateException("When resuming, the pause date must be set") + throw PAIllegalStateException("When resuming, the pause date must be set") } this.pauseDate = null } else -> { - throw IllegalStateException("unmanaged session state") + throw PAIllegalStateException("unmanaged session state") } } } @@ -526,7 +526,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat SessionState.STARTED -> { 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 { - throw java.lang.IllegalStateException("Asking for statIds on Session without Result") + throw PAIllegalStateException("Asking for statIds on Session without Result") } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt index 92edb9bd..b6c7d4e3 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt @@ -6,6 +6,7 @@ import io.realm.RealmObject import io.realm.annotations.Ignore import io.realm.annotations.PrimaryKey import net.pokeranalytics.android.R +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.interfaces.DeleteValidityStatus import net.pokeranalytics.android.model.interfaces.Identifiable import net.pokeranalytics.android.model.interfaces.NameManageable @@ -49,7 +50,7 @@ open class TransactionType : RealmObject(), NameManageable, StaticRowRepresentab type?.let { return it } - throw IllegalStateException("Transaction type ${value.name} should exist in database!") + throw PAIllegalStateException("Transaction type ${value.name} should exist in database!") } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt b/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt index 76cce72c..8efe64ff 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.utils import io.realm.RealmQuery import io.realm.RealmResults 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.SessionSet import kotlin.math.max @@ -23,7 +24,7 @@ class SessionSetManager { fun updateTimeline(session: Session) { 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) { @@ -154,7 +155,7 @@ class SessionSetManager { fun removeFromTimeline(session: Session) { 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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt index 26dec55a..51021a62 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt @@ -1,6 +1,7 @@ package net.pokeranalytics.android.ui.adapter import android.content.Context +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.util.TextFormat @@ -42,21 +43,21 @@ interface StaticRowRepresentableDataSource: RowRepresentableDataSource { this.adapterRows()?.let { return it[position] } - throw IllegalStateException("Need to implement Data Source") + throw PAIllegalStateException("Need to implement Data Source") } override fun numberOfRows(): Int { this.adapterRows()?.let { return it.size } - throw IllegalStateException("Need to implement Data Source") + throw PAIllegalStateException("Need to implement Data Source") } override fun viewTypeForPosition(position:Int): Int { this.rowRepresentableForPosition(position)?.let { return it.viewType } - throw IllegalStateException("Need to implement Data Source") + throw PAIllegalStateException("Need to implement Data Source") } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt index 67186d9d..13c4a9fc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt @@ -13,6 +13,7 @@ import io.realm.Realm import io.realm.RealmResults import kotlinx.android.synthetic.main.fragment_data_list.* import net.pokeranalytics.android.R +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.interfaces.Deletable import net.pokeranalytics.android.model.interfaces.Identifiable @@ -86,7 +87,7 @@ open class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataS val itemId = item.id deleteItem(dataListAdapter, items, itemId) } else { - throw IllegalStateException("Item with position $position not found") + throw PAIllegalStateException("Item with position $position not found") } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index 0f1a2da3..335aa4f4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.DiffUtil import kotlinx.android.synthetic.main.fragment_session.* import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.bankroll.BankrollReportManager +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.extensions.SessionState import net.pokeranalytics.android.model.extensions.getState @@ -173,7 +174,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate { sessionHasBeenCustomized = true try { currentSession.updateValue(value, row) - } catch (e: IllegalStateException) { + } catch (e: PAIllegalStateException) { Toast.makeText(context, e.message, Toast.LENGTH_LONG).show() return } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt index 3f26b19d..a5b20860 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt @@ -24,6 +24,7 @@ import com.android.billingclient.api.SkuDetails import com.android.billingclient.api.SkuDetailsResponseListener import kotlinx.android.synthetic.main.fragment_subscription.* import net.pokeranalytics.android.R +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.ui.extensions.px import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.ui.fragment.components.ScreenSlidePageFragment @@ -101,7 +102,7 @@ class SubscriptionFragment : PokerAnalyticsFragment(), SkuDetailsResponseListene this.selectedProduct?.let { AppGuard.initiatePurchase(this.requireActivity(), it, this) } ?: 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") } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt index 07595c6d..9136dac1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt @@ -13,6 +13,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch import net.pokeranalytics.android.R +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.interfaces.Deletable import net.pokeranalytics.android.ui.activity.DataListActivity import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter @@ -126,7 +127,7 @@ abstract class DeletableItemFragment : RealmFragment() { } snackBar?.show() } ?: run { - throw IllegalStateException("mainLayout is not defined") + throw PAIllegalStateException("mainLayout is not defined") } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index 8657df58..0d437430 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt @@ -15,6 +15,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment import io.realm.RealmModel import kotlinx.android.synthetic.main.fragment_bottom_sheet.* import net.pokeranalytics.android.R +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.ui.activity.EditableDataActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity @@ -132,7 +133,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { SessionRow.TOURNAMENT_NAME -> LiveData.TOURNAMENT_NAME SessionRow.TOURNAMENT_FEATURE -> LiveData.TOURNAMENT_FEATURE 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( diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt index eeece10e..fa5997f7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt @@ -8,6 +8,7 @@ import io.realm.RealmResults import kotlinx.android.synthetic.main.bottom_sheet_list.* import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.* import net.pokeranalytics.android.R +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException import net.pokeranalytics.android.ui.adapter.LiveRowRepresentableDataSource import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter @@ -39,14 +40,14 @@ open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentable realmData?.let { return it[position] as RowRepresentable } - throw IllegalStateException("Need to implement Data Source") + throw PAIllegalStateException("Need to implement Data Source") } override fun numberOfRows(): Int { realmData?.let { return it.size } - throw IllegalStateException("Need to implement Data Source") + throw PAIllegalStateException("Need to implement Data Source") } override fun viewTypeForPosition(position: Int): Int { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt index 3addaa19..fa900fa2 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt @@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat import kotlinx.android.synthetic.main.fragment_progress_report.* import net.pokeranalytics.android.calculus.Report +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.CustomFieldCriteria import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.realm.ReportSetup @@ -91,7 +92,7 @@ abstract class AbstractReportFragment : DataManagerFragment() { dialog.show() - } ?: throw IllegalStateException("Activity cannot be null") + } ?: throw PAIllegalStateException("Activity cannot be null") }