From 869de6d0579d9af879b662d8a1d7f8c433955433 Mon Sep 17 00:00:00 2001 From: Mathieu Boniface Date: Tue, 22 Jan 2013 11:53:19 +0100 Subject: [PATCH] Extended @OrmLiteDao support for enhanced components. --- .../androidannotations/validation/OrmLiteDaoValidator.java | 2 +- .../androidannotations/test15/efragment/MyFragment.java | 7 +++++++ .../androidannotations/test15/eprovider/MyProvider.java | 7 +++++++ .../org/androidannotations/test15/eservice/MyService.java | 7 +++++++ .../test15/roboguice/SampleRoboApplication.java | 7 +++++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OrmLiteDaoValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OrmLiteDaoValidator.java index 35d46cc23d..b9e180c33c 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OrmLiteDaoValidator.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OrmLiteDaoValidator.java @@ -48,7 +48,7 @@ public boolean validate(Element element, AnnotationElements validatedElements) { validatorHelper.hasOrmLiteJars(element, valid); - validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid); + validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid); validatorHelper.isNotPrivate(element, valid); diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java index 93955387b0..b58ea9170d 100644 --- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java @@ -24,12 +24,16 @@ import org.androidannotations.annotations.App; import org.androidannotations.annotations.Click; import org.androidannotations.annotations.EFragment; +import org.androidannotations.annotations.OrmLiteDao; import org.androidannotations.annotations.SystemService; import org.androidannotations.annotations.Trace; import org.androidannotations.annotations.Transactional; import org.androidannotations.annotations.UiThread; import org.androidannotations.annotations.ViewById; import org.androidannotations.test15.R; +import org.androidannotations.test15.ormlite.DatabaseHelper; +import org.androidannotations.test15.ormlite.User; +import org.androidannotations.test15.ormlite.UserDao; import org.androidannotations.test15.roboguice.SampleRoboApplication; @EFragment(R.layout.injected) @@ -43,6 +47,9 @@ public class MyFragment extends AbstractFragment { @SystemService ActivityManager activityManager; + + @OrmLiteDao(helper = DatabaseHelper.class, model = User.class) + UserDao userDao; @Click void myButton() { diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java index a074bb1288..3c7354c289 100644 --- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java @@ -26,12 +26,16 @@ import org.androidannotations.annotations.Background; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EProvider; +import org.androidannotations.annotations.OrmLiteDao; import org.androidannotations.annotations.SystemService; import org.androidannotations.annotations.Trace; import org.androidannotations.annotations.UiThread; import org.androidannotations.annotations.sharedpreferences.Pref; import org.androidannotations.test15.ebean.EnhancedClass; import org.androidannotations.test15.eservice.MyService; +import org.androidannotations.test15.ormlite.DatabaseHelper; +import org.androidannotations.test15.ormlite.User; +import org.androidannotations.test15.ormlite.UserDao; import org.androidannotations.test15.prefs.SomePrefs_; @EProvider @@ -43,6 +47,9 @@ public class MyProvider extends ContentProvider { @Bean EnhancedClass dependency; + @OrmLiteDao(helper = DatabaseHelper.class, model = User.class) + UserDao userDao; + @Pref SomePrefs_ somePrefs; diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java index 2ca3704cda..1395387058 100644 --- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java @@ -24,10 +24,14 @@ import org.androidannotations.annotations.Background; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EService; +import org.androidannotations.annotations.OrmLiteDao; import org.androidannotations.annotations.SystemService; import org.androidannotations.annotations.Trace; import org.androidannotations.annotations.UiThread; import org.androidannotations.test15.ebean.EnhancedClass; +import org.androidannotations.test15.ormlite.DatabaseHelper; +import org.androidannotations.test15.ormlite.User; +import org.androidannotations.test15.ormlite.UserDao; @EService public class MyService extends IntentService { @@ -38,6 +42,9 @@ public class MyService extends IntentService { @Bean EnhancedClass dependency; + @OrmLiteDao(helper = DatabaseHelper.class, model = User.class) + UserDao userDao; + public MyService() { super(MyService.class.getSimpleName()); } diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java index 631e5b7bbf..3529700674 100644 --- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java @@ -22,7 +22,11 @@ import com.google.inject.Module; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EApplication; +import org.androidannotations.annotations.OrmLiteDao; import org.androidannotations.test15.ebean.EmptyDependency; +import org.androidannotations.test15.ormlite.DatabaseHelper; +import org.androidannotations.test15.ormlite.User; +import org.androidannotations.test15.ormlite.UserDao; @EApplication public class SampleRoboApplication extends RoboApplication { @@ -30,6 +34,9 @@ public class SampleRoboApplication extends RoboApplication { @Bean public EmptyDependency someDependency; + @OrmLiteDao(helper = DatabaseHelper.class, model = User.class) + UserDao userDao; + private Module module = new RobolectricSampleModule(); @Override