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

Commit 8c7d4c6

Browse files
committed
Merge pull request #277 from naixx/276_@InstanceState_in_fragments
Allow @InstanceState in fragments
2 parents 79cbcea + f293950 commit 8c7d4c6

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EFragmentProcessor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder eBeansHo
7979
{
8080
// init
8181
holder.init = holder.eBean.method(PRIVATE, codeModel.VOID, "init_");
82+
holder.init.param(holder.classes().BUNDLE, "savedInstanceState");
8283
}
8384

8485
{
@@ -89,7 +90,7 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder eBeansHo
8990
JVar onCreateSavedInstanceState = onCreate.param(classes.BUNDLE, "savedInstanceState");
9091
JBlock onCreateBody = onCreate.body();
9192

92-
onCreateBody.invoke(holder.init);
93+
onCreateBody.invoke(holder.init).arg(onCreateSavedInstanceState);
9394

9495
onCreateBody.invoke(_super(), onCreate).arg(onCreateSavedInstanceState);
9596
}

‎AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/InstanceStateValidator.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@
2626
import com.googlecode.androidannotations.model.AnnotationElements;
2727

2828
public class InstanceStateValidator implements ElementValidator {
29-
29+
3030
private ValidatorHelper validatorHelper;
3131

32-
3332
public InstanceStateValidator(ProcessingEnvironment processingEnv) {
3433
TargetAnnotationHelper annotationHelper = new TargetAnnotationHelper(processingEnv, getTarget());
3534
validatorHelper = new ValidatorHelper(annotationHelper);
@@ -42,13 +41,13 @@ public Class<? extends Annotation> getTarget() {
4241

4342
@Override
4443
public boolean validate(Element element, AnnotationElements validatedElements) {
45-
44+
4645
IsValid valid = new IsValid();
4746

48-
validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
47+
validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
4948

5049
validatorHelper.isNotPrivate(element, valid);
51-
50+
5251
validatorHelper.canBeSavedAsInstanceState(element, valid);
5352

5453
return valid.isValid();

0 commit comments

Comments
 (0)