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

Use visibility modifier from overridden method #1563

Merged
yDelouis merged 1 commit into from
Sep 28, 2015
Merged

Use visibility modifier from overridden method #1563

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
Use visibility modifier from overridden method
  • Loading branch information
@WonderCsabo
WonderCsabo committed Sep 21, 2015
commit a65ba9091e5e2705c47d6db8b3bc5c7a9be97a05
19 changes: 18 additions & 1 deletion ...re/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.TypeParameterElement;
import javax.lang.model.element.VariableElement;
Expand Down Expand Up @@ -218,7 +220,8 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene

String methodName = executableElement.getSimpleName().toString();
AbstractJClass returnType = typeMirrorToJClass(executableElement.getReturnType(), actualTypes);
JMethod method = holder.getGeneratedClass().method(JMod.PUBLIC, returnType, methodName);
int modifier = elementVisibilityModifierToJMod(executableElement);
JMethod method = holder.getGeneratedClass().method(modifier, returnType, methodName);
copyNonAAAnnotations(method, executableElement.getAnnotationMirrors());

if (!hasAnnotation(method, Override.class)) {
Expand Down Expand Up @@ -247,6 +250,20 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene
return method;
}

public int elementVisibilityModifierToJMod(Element element) {
Set<Modifier> modifiers = element.getModifiers();

if (modifiers.contains(Modifier.PUBLIC)) {
return JMod.PUBLIC;
} else if (modifiers.contains(Modifier.PROTECTED)) {
return JMod.PROTECTED;
} else if (modifiers.contains(Modifier.PRIVATE)) {
return JMod.PRIVATE;
} else {
return JMod.NONE;
}
}

public void generify(IJGenerifiable generifiable, TypeElement fromTypeParameters) {
for (TypeParameterElement param : fromTypeParameters.getTypeParameters()) {
List<AbstractJClass> bounds = typeBoundsToJClass(param.getBounds());
Expand Down