diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java index 84beb8ca2b..7e96f6daa1 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java @@ -15,15 +15,16 @@ */ package org.androidannotations.helper; -import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX; -import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS; - -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import com.sun.codemodel.JFieldRef; +import org.androidannotations.annotations.OnActivityResult; +import org.androidannotations.annotations.OptionsItem; +import org.androidannotations.annotations.ResId; +import org.androidannotations.logger.Level; +import org.androidannotations.logger.Logger; +import org.androidannotations.logger.LoggerFactory; +import org.androidannotations.process.ProcessHolder; +import org.androidannotations.rclass.IRInnerClass; +import org.androidannotations.rclass.RInnerClass; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; @@ -38,18 +39,15 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; -import org.androidannotations.annotations.OnActivityResult; -import org.androidannotations.annotations.OptionsItem; -import org.androidannotations.annotations.ResId; -import org.androidannotations.logger.Level; -import org.androidannotations.logger.Logger; -import org.androidannotations.logger.LoggerFactory; -import org.androidannotations.process.ProcessHolder; -import org.androidannotations.rclass.IRInnerClass; -import org.androidannotations.rclass.RInnerClass; - -import com.sun.codemodel.JFieldRef; +import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX; +import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS; public class AnnotationHelper { @@ -143,6 +141,10 @@ public boolean isPublic(Element element) { return element.getModifiers().contains(Modifier.PUBLIC); } + public boolean isStatic(Element element) { + return element.getModifiers().contains(Modifier.STATIC); + } + public boolean isAbstract(Element element) { return element.getModifiers().contains(Modifier.ABSTRACT); } diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java index 395241ad99..7ca4cfed4f 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java @@ -193,7 +193,7 @@ public void isPublic(Element element, IsValid valid) { } public void isStatic(Element element, IsValid valid) { - if (!annotationHelper.isPublic(element)) { + if (!annotationHelper.isStatic(element)) { valid.invalidate(); annotationHelper.printAnnotationError(element, "%s cannot be used on a non static inner element"); } diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java index e416b367b4..4a2d97aaff 100644 --- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java @@ -42,7 +42,7 @@ public InnerViewGroup(Context context) { } @EBean - public static class InnerBean { + protected static class InnerBean { }