Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit d2e5d15

Browse files
mathieubonifacemathieuboniface
committed
Merge pull request #469 from excilys/464_ORMLiteDAO_in_Enhanced_Components
Extended @OrmLiteDao support for enhanced components.
2 parents 2fc7e98 + 869de6d commit d2e5d15

5 files changed

Lines changed: 29 additions & 1 deletion

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OrmLiteDaoValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public boolean validate(Element element, AnnotationElements validatedElements) {
4848

4949
validatorHelper.hasOrmLiteJars(element, valid);
5050

51-
validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
51+
validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
5252

5353
validatorHelper.isNotPrivate(element, valid);
5454

‎AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@
2424
import org.androidannotations.annotations.App;
2525
import org.androidannotations.annotations.Click;
2626
import org.androidannotations.annotations.EFragment;
27+
import org.androidannotations.annotations.OrmLiteDao;
2728
import org.androidannotations.annotations.SystemService;
2829
import org.androidannotations.annotations.Trace;
2930
import org.androidannotations.annotations.Transactional;
3031
import org.androidannotations.annotations.UiThread;
3132
import org.androidannotations.annotations.ViewById;
3233
import org.androidannotations.test15.R;
34+
import org.androidannotations.test15.ormlite.DatabaseHelper;
35+
import org.androidannotations.test15.ormlite.User;
36+
import org.androidannotations.test15.ormlite.UserDao;
3337
import org.androidannotations.test15.roboguice.SampleRoboApplication;
3438

3539
@EFragment(R.layout.injected)
@@ -43,6 +47,9 @@ public class MyFragment extends AbstractFragment {
4347

4448
@SystemService
4549
ActivityManager activityManager;
50+
51+
@OrmLiteDao(helper = DatabaseHelper.class, model = User.class)
52+
UserDao userDao;
4653

4754
@Click
4855
void myButton() {

‎AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,16 @@
2626
import org.androidannotations.annotations.Background;
2727
import org.androidannotations.annotations.Bean;
2828
import org.androidannotations.annotations.EProvider;
29+
import org.androidannotations.annotations.OrmLiteDao;
2930
import org.androidannotations.annotations.SystemService;
3031
import org.androidannotations.annotations.Trace;
3132
import org.androidannotations.annotations.UiThread;
3233
import org.androidannotations.annotations.sharedpreferences.Pref;
3334
import org.androidannotations.test15.ebean.EnhancedClass;
3435
import org.androidannotations.test15.eservice.MyService;
36+
import org.androidannotations.test15.ormlite.DatabaseHelper;
37+
import org.androidannotations.test15.ormlite.User;
38+
import org.androidannotations.test15.ormlite.UserDao;
3539
import org.androidannotations.test15.prefs.SomePrefs_;
3640

3741
@EProvider
@@ -43,6 +47,9 @@ public class MyProvider extends ContentProvider {
4347
@Bean
4448
EnhancedClass dependency;
4549

50+
@OrmLiteDao(helper = DatabaseHelper.class, model = User.class)
51+
UserDao userDao;
52+
4653
@Pref
4754
SomePrefs_ somePrefs;
4855

‎AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@
2424
import org.androidannotations.annotations.Background;
2525
import org.androidannotations.annotations.Bean;
2626
import org.androidannotations.annotations.EService;
27+
import org.androidannotations.annotations.OrmLiteDao;
2728
import org.androidannotations.annotations.SystemService;
2829
import org.androidannotations.annotations.Trace;
2930
import org.androidannotations.annotations.UiThread;
3031
import org.androidannotations.test15.ebean.EnhancedClass;
32+
import org.androidannotations.test15.ormlite.DatabaseHelper;
33+
import org.androidannotations.test15.ormlite.User;
34+
import org.androidannotations.test15.ormlite.UserDao;
3135

3236
@EService
3337
public class MyService extends IntentService {
@@ -38,6 +42,9 @@ public class MyService extends IntentService {
3842
@Bean
3943
EnhancedClass dependency;
4044

45+
@OrmLiteDao(helper = DatabaseHelper.class, model = User.class)
46+
UserDao userDao;
47+
4148
public MyService() {
4249
super(MyService.class.getSimpleName());
4350
}

‎AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,21 @@
2222
import com.google.inject.Module;
2323
import org.androidannotations.annotations.Bean;
2424
import org.androidannotations.annotations.EApplication;
25+
import org.androidannotations.annotations.OrmLiteDao;
2526
import org.androidannotations.test15.ebean.EmptyDependency;
27+
import org.androidannotations.test15.ormlite.DatabaseHelper;
28+
import org.androidannotations.test15.ormlite.User;
29+
import org.androidannotations.test15.ormlite.UserDao;
2630

2731
@EApplication
2832
public class SampleRoboApplication extends RoboApplication {
2933

3034
@Bean
3135
public EmptyDependency someDependency;
3236

37+
@OrmLiteDao(helper = DatabaseHelper.class, model = User.class)
38+
UserDao userDao;
39+
3340
private Module module = new RobolectricSampleModule();
3441

3542
@Override

0 commit comments

Comments
 (0)