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

Commit 2a3706a

Browse files
yDelouisyDelouis
committed
Merge pull request #1179 from yDelouis/1177_fixProtectedInnerClass
Fix compilation error on protected inner classes
2 parents c857376 + 71f3879 commit 2a3706a

3 files changed

Lines changed: 24 additions & 22 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
*/
1616
package org.androidannotations.helper;
1717

18-
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
19-
import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS;
20-
21-
import java.lang.annotation.Annotation;
22-
import java.lang.reflect.InvocationTargetException;
23-
import java.lang.reflect.Method;
24-
import java.util.ArrayList;
25-
import java.util.List;
26-
import java.util.Map;
18+
import com.sun.codemodel.JFieldRef;
19+
import org.androidannotations.annotations.OnActivityResult;
20+
import org.androidannotations.annotations.OptionsItem;
21+
import org.androidannotations.annotations.ResId;
22+
import org.androidannotations.logger.Level;
23+
import org.androidannotations.logger.Logger;
24+
import org.androidannotations.logger.LoggerFactory;
25+
import org.androidannotations.process.ProcessHolder;
26+
import org.androidannotations.rclass.IRInnerClass;
27+
import org.androidannotations.rclass.RInnerClass;
2728

2829
import javax.annotation.processing.ProcessingEnvironment;
2930
import javax.lang.model.element.AnnotationMirror;
@@ -38,18 +39,15 @@
3839
import javax.lang.model.type.TypeMirror;
3940
import javax.lang.model.util.Elements;
4041
import javax.lang.model.util.Types;
42+
import java.lang.annotation.Annotation;
43+
import java.lang.reflect.InvocationTargetException;
44+
import java.lang.reflect.Method;
45+
import java.util.ArrayList;
46+
import java.util.List;
47+
import java.util.Map;
4148

42-
import org.androidannotations.annotations.OnActivityResult;
43-
import org.androidannotations.annotations.OptionsItem;
44-
import org.androidannotations.annotations.ResId;
45-
import org.androidannotations.logger.Level;
46-
import org.androidannotations.logger.Logger;
47-
import org.androidannotations.logger.LoggerFactory;
48-
import org.androidannotations.process.ProcessHolder;
49-
import org.androidannotations.rclass.IRInnerClass;
50-
import org.androidannotations.rclass.RInnerClass;
51-
52-
import com.sun.codemodel.JFieldRef;
49+
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
50+
import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS;
5351

5452
public class AnnotationHelper {
5553

@@ -143,6 +141,10 @@ public boolean isPublic(Element element) {
143141
return element.getModifiers().contains(Modifier.PUBLIC);
144142
}
145143

144+
public boolean isStatic(Element element) {
145+
return element.getModifiers().contains(Modifier.STATIC);
146+
}
147+
146148
public boolean isAbstract(Element element) {
147149
return element.getModifiers().contains(Modifier.ABSTRACT);
148150
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void isPublic(Element element, IsValid valid) {
193193
}
194194

195195
public void isStatic(Element element, IsValid valid) {
196-
if (!annotationHelper.isPublic(element)) {
196+
if (!annotationHelper.isStatic(element)) {
197197
valid.invalidate();
198198
annotationHelper.printAnnotationError(element, "%s cannot be used on a non static inner element");
199199
}

‎AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public InnerViewGroup(Context context) {
4242
}
4343

4444
@EBean
45-
public static class InnerBean {
45+
protected static class InnerBean {
4646

4747
}
4848

0 commit comments

Comments
 (0)