diff --git a/app/src/main/kotlin/jackall/moncalc/db/FruitRealmHelper.kt b/app/src/main/kotlin/jackall/moncalc/db/FruitRealmHelper.kt index 36f8d05..3cf449f 100644 --- a/app/src/main/kotlin/jackall/moncalc/db/FruitRealmHelper.kt +++ b/app/src/main/kotlin/jackall/moncalc/db/FruitRealmHelper.kt @@ -1,25 +1,25 @@ package jackall.moncalc.db -import io.realm.Realm +import io.realm.RealmResults import jackall.moncalc.vo.Fruit /** * Created by matsumoto_k on 2017/11/02. */ class FruitRealmHelper : RealmHelper() { - override fun insert(mRealm: Realm, realmObject: Fruit) { - mRealm.executeTransaction { - mRealm.copyToRealmOrUpdate(realmObject) + override fun insert(realmObject: Fruit) { + realm.executeTransaction { + realm.copyToRealmOrUpdate(realmObject) } } - override fun insert(mRealm: Realm, realmObject: List) { - mRealm.executeTransaction { - mRealm.copyToRealmOrUpdate(realmObject) + override fun insert(realmObject: List) { + realm.executeTransaction { + realm.copyToRealmOrUpdate(realmObject) } } - override fun findAll(mRealm: Realm): List { - return mRealm.where(Fruit::class.java).findAll() + override fun findAll(): RealmResults { + return realm.where(Fruit::class.java).findAll() } } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/db/RealmHelper.kt b/app/src/main/kotlin/jackall/moncalc/db/RealmHelper.kt index d04116e..6af1a1a 100644 --- a/app/src/main/kotlin/jackall/moncalc/db/RealmHelper.kt +++ b/app/src/main/kotlin/jackall/moncalc/db/RealmHelper.kt @@ -2,12 +2,17 @@ import io.realm.Realm import io.realm.RealmObject +import io.realm.RealmResults /** * Created by matsumoto_k on 2017/11/02. */ abstract class RealmHelper { - abstract fun insert(mRealm: Realm, realmObject: T) - abstract fun insert(mRealm: Realm, realmObjects: List) - abstract fun findAll(mRealm: Realm): List + protected val realm = Realm.getInstance(RealmConfig().config) + abstract fun insert(realmObject: T) + abstract fun insert(realmObjects: List) + abstract fun findAll(): RealmResults + fun close() { + realm.close() + } } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/db/TempleRealmHelper.kt b/app/src/main/kotlin/jackall/moncalc/db/TempleRealmHelper.kt index e710af2..29ac556 100644 --- a/app/src/main/kotlin/jackall/moncalc/db/TempleRealmHelper.kt +++ b/app/src/main/kotlin/jackall/moncalc/db/TempleRealmHelper.kt @@ -1,25 +1,25 @@ package jackall.moncalc.db -import io.realm.Realm +import io.realm.RealmResults import jackall.moncalc.vo.Temple /** * Created by matsumoto_k on 2017/11/02. */ class TempleRealmHelper : RealmHelper() { - override fun insert(mRealm: Realm, realmObject: Temple) { - mRealm.executeTransaction { - mRealm.copyToRealmOrUpdate(realmObject) + override fun insert(realmObject: Temple) { + realm.executeTransaction { + realm.copyToRealmOrUpdate(realmObject) } } - override fun insert(mRealm: Realm, realmObject: List) { - mRealm.executeTransaction { - mRealm.copyToRealmOrUpdate(realmObject) + override fun insert(realmObject: List) { + realm.executeTransaction { + realm.copyToRealmOrUpdate(realmObject) } } - override fun findAll(mRealm: Realm): List { - return mRealm.where(Temple::class.java).findAll() + override fun findAll(): RealmResults { + return realm.where(Temple::class.java).findAll() } } \ No newline at end of file