package org.hisp.dhis.android.core.category;


import android.support.annotation.NonNull;

import org.hisp.dhis.android.core.common.DeletableStore;

import java.util.List;

public interface CategoryOptionStore extends DeletableStore {

    long insert(@NonNull CategoryOption categoryOption);

    boolean delete(@NonNull CategoryOption categoryOption);

    boolean update(@NonNull CategoryOption oldCategoryOption,
            @NonNull CategoryOption newCategoryOption);

    List<CategoryOption> queryAll();
}

@@ -43,132 +43,192 @@
 y;%0A%0A
-%0A
 import 
-android.support.annotation.NonNull;%0A%0Aimport org.hisp.dhis.android.core.common.DeletableStore;%0A%0Aimport java.util.List
+org.hisp.dhis.android.core.common.IdentifiableObjectStore;%0Aimport org.hisp.dhis.android.core.common.StoreFactory;%0Aimport org.hisp.dhis.android.core.data.database.DatabaseAdapter
 ;%0A%0Ap
@@ -237,17 +237,19 @@
 lic 
+f
 in
-terface
+al class
  Cat
@@ -269,199 +269,217 @@
 ore 
-extends DeletableStore %7B%0A%0A    long insert(@NonNull CategoryOption categoryOption);%0A%0A    boolean delete(@NonNull CategoryOption categoryOption);%0A%0A    boolean update(@NonNull CategoryOption old
+%7B%0A%0A    private CategoryOptionStore() %7B%7D%0A%0A    public static IdentifiableObjectStore%3CCategoryOptionModel%3E create(DatabaseAdapter databaseAdapter) %7B%0A        return StoreFactory.identifiableStore(databaseAdapter, 
 Cate
@@ -488,16 +488,27 @@
 ryOption
+Model.TABLE
 ,%0A      
@@ -517,16 +517,11 @@
     
-@NonNull
+   
  Cat
@@ -535,65 +535,33 @@
 tion
- newCategoryOption);%0A%0A    List%3CCategoryOption%3E queryA
+Model.Columns.a
 ll()
+)
 ;%0A
+    
 %7D%0A
+%7D

add CategoryOptionStore