Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Fix compilation error on protected inner classes #1179

Merged
yDelouis merged 1 commit into from
Oct 4, 2014
Merged

Fix compilation error on protected inner classes #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions 42 ...ions/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion 2 ...tions/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion 2 ...ain/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public InnerViewGroup(Context context) {
}

@EBean
public static class InnerBean {
protected static class InnerBean {

}

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.