Skip to content

Commit 63e1cb0

Browse files
committed
Refactor ActivityIntentBuilder to use ElementFilter
1 parent 587c8cf commit 63e1cb0

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424

2525
import java.util.List;
2626

27-
import javax.lang.model.element.Element;
28-
import javax.lang.model.element.ElementKind;
2927
import javax.lang.model.element.ExecutableElement;
3028
import javax.lang.model.element.TypeElement;
3129
import javax.lang.model.element.VariableElement;
30+
import javax.lang.model.util.ElementFilter;
3231

3332
import org.androidannotations.holder.HasIntentBuilder;
3433

@@ -235,16 +234,13 @@ private boolean hasActivityOptions(TypeElement type, int optionsParamPosition) {
235234
return false;
236235
}
237236

238-
for (Element element : type.getEnclosedElements()) {
239-
if (element.getKind() == ElementKind.METHOD) {
240-
ExecutableElement executableElement = (ExecutableElement) element;
241-
if (executableElement.getSimpleName().contentEquals("startActivity")) {
242-
List<? extends VariableElement> parameters = executableElement.getParameters();
243-
if (parameters.size() == optionsParamPosition + 1) {
244-
VariableElement parameter = parameters.get(optionsParamPosition);
245-
if (parameter.asType().toString().equals(CanonicalNameConstants.BUNDLE)) {
246-
return true;
247-
}
237+
for (ExecutableElement element : ElementFilter.methodsIn(elementUtils.getAllMembers(type))) {
238+
if (element.getSimpleName().contentEquals("startActivity")) {
239+
List<? extends VariableElement> parameters = element.getParameters();
240+
if (parameters.size() == optionsParamPosition + 1) {
241+
VariableElement parameter = parameters.get(optionsParamPosition);
242+
if (parameter.asType().toString().equals(CanonicalNameConstants.BUNDLE)) {
243+
return true;
248244
}
249245
}
250246
}

0 commit comments

Comments
 (0)