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

Allow subclasses to override @OptionsItem handling #1296

Merged
yDelouis merged 1 commit into from
Mar 23, 2015
Merged

Allow subclasses to override @OptionsItem handling #1296

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
5 changes: 4 additions & 1 deletion ...s/androidannotations/src/main/java/org/androidannotations/handler/OptionsItemHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,15 @@ public void process(Element element, HasOptionsMenu holder) {
boolean hasItemParameter = parameters.size() == 1;

List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);

JBlock block = holder.getOnOptionsItemSelectedMiddleBlock();

JExpression ifExpr = holder.getOnOptionsItemSelectedItemId().eq(idsRefs.get(0));
for (int i = 1; i < idsRefs.size(); i++) {
ifExpr = ifExpr.cor(holder.getOnOptionsItemSelectedItemId().eq(idsRefs.get(i)));
}

JBlock itemIfBody = holder.getOnOptionsItemSelectedIfElseBlock()._if(ifExpr)._then();
JBlock itemIfBody = block._if(ifExpr)._then();
JInvocation methodCall = invoke(methodName);

if (returnMethodResult) {
Expand Down
18 changes: 8 additions & 10 deletions ...tions/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package org.androidannotations.holder;

import static com.sun.codemodel.JExpr.FALSE;
import static com.sun.codemodel.JExpr.TRUE;
import static com.sun.codemodel.JExpr._new;
import static com.sun.codemodel.JExpr._null;
import static com.sun.codemodel.JExpr._super;
Expand Down Expand Up @@ -84,7 +82,7 @@ public class EActivityHolder extends EComponentWithViewSupportHolder implements
private JVar onCreateOptionsMenuMenuParam;
private JVar onOptionsItemSelectedItem;
private JVar onOptionsItemSelectedItemId;
private JBlock onOptionsItemSelectedIfElseBlock;
private JBlock onOptionsItemSelectedMiddleBlock;
private NonConfigurationHolder nonConfigurationHolder;
private JBlock initIfNonConfigurationNotNullBlock;
private JVar initNonConfigurationInstance;
Expand Down Expand Up @@ -273,11 +271,10 @@ private void setOnOptionsItemSelected() {
method.annotate(Override.class);
JBlock methodBody = method.body();
onOptionsItemSelectedItem = method.param(menuItemClass, "item");
JVar handled = methodBody.decl(codeModel().BOOLEAN, "handled", invoke(_super(), method).arg(onOptionsItemSelectedItem));
methodBody._if(handled)._then()._return(TRUE);
onOptionsItemSelectedItemId = methodBody.decl(codeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
onOptionsItemSelectedIfElseBlock = methodBody.block();
methodBody._return(FALSE);
onOptionsItemSelectedMiddleBlock = methodBody.block();

methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
}

private boolean usesActionBarSherlock() {
Expand Down Expand Up @@ -563,11 +560,11 @@ public JVar getOnOptionsItemSelectedItemId() {
}

@Override
public JBlock getOnOptionsItemSelectedIfElseBlock() {
if (onOptionsItemSelectedIfElseBlock == null) {
public JBlock getOnOptionsItemSelectedMiddleBlock() {
if (onOptionsItemSelectedMiddleBlock == null) {
setOnOptionsItemSelected();
}
return onOptionsItemSelectedIfElseBlock;
return onOptionsItemSelectedMiddleBlock;
}

public NonConfigurationHolder getNonConfigurationHolder() throws JClassAlreadyExistsException {
Expand Down Expand Up @@ -769,4 +766,5 @@ protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {

return databaseHelperRef;
}

}
17 changes: 7 additions & 10 deletions ...tions/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package org.androidannotations.holder;

import static com.sun.codemodel.JExpr.FALSE;
import static com.sun.codemodel.JExpr.TRUE;
import static com.sun.codemodel.JExpr._new;
import static com.sun.codemodel.JExpr._null;
import static com.sun.codemodel.JExpr._super;
Expand Down Expand Up @@ -71,7 +69,7 @@ public class EFragmentHolder extends EComponentWithViewSupportHolder implements
private JVar onCreateOptionsMenuMenuParam;
private JVar onOptionsItemSelectedItem;
private JVar onOptionsItemSelectedItemId;
private JBlock onOptionsItemSelectedIfElseBlock;
private JBlock onOptionsItemSelectedMiddleBlock;
private JBlock onCreateAfterSuperBlock;
private JBlock onDestroyBeforeSuperBlock;
private JBlock onStartAfterSuperBlock;
Expand Down Expand Up @@ -208,11 +206,10 @@ private void setOnOptionsItemSelected() {
method.annotate(Override.class);
JBlock methodBody = method.body();
onOptionsItemSelectedItem = method.param(menuItemClass, "item");
JVar handled = methodBody.decl(codeModel().BOOLEAN, "handled", invoke(_super(), method).arg(onOptionsItemSelectedItem));
methodBody._if(handled)._then()._return(TRUE);
onOptionsItemSelectedItemId = methodBody.decl(codeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
onOptionsItemSelectedIfElseBlock = methodBody.block();
methodBody._return(FALSE);
onOptionsItemSelectedMiddleBlock = methodBody.block();

methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
}

private boolean usesActionBarSherlock() {
Expand Down Expand Up @@ -450,11 +447,11 @@ public JVar getOnOptionsItemSelectedItemId() {
}

@Override
public JBlock getOnOptionsItemSelectedIfElseBlock() {
if (onOptionsItemSelectedIfElseBlock == null) {
public JBlock getOnOptionsItemSelectedMiddleBlock() {
if (onOptionsItemSelectedMiddleBlock == null) {
setOnOptionsItemSelected();
}
return onOptionsItemSelectedIfElseBlock;
return onOptionsItemSelectedMiddleBlock;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ations/androidannotations/src/main/java/org/androidannotations/holder/HasOptionsMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ public interface HasOptionsMenu extends GeneratedClassHolder {

JVar getOnOptionsItemSelectedItemId();

JBlock getOnOptionsItemSelectedIfElseBlock();
JBlock getOnOptionsItemSelectedMiddleBlock();
}
9 changes: 9 additions & 0 deletions ...tional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class OptionsMenuActivity extends Activity {
MenuItem aMenuByResName;

boolean menuRefreshSelected;
boolean menuRefreshSelectedFromAnnotatedClass;
boolean multipleMenuItems;
boolean menuAdd;

Expand All @@ -69,4 +70,12 @@ void menu_add(MenuItem item) {
menuAdd = true;
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.menu_refresh) {
menuRefreshSelectedFromAnnotatedClass = true;
}
return super.onOptionsItemSelected(item);
}

}
12 changes: 12 additions & 0 deletions ...al-test-1-5/src/test/java/org/androidannotations/test15/menu/OptionsMenuActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,16 @@ public void defaultIdUnderscore() {
assertThat(activity.menuAdd).isTrue();
}

@Test
public void subclassTakesPrecedenceInMenuItemHandling() {
MenuItem item = mock(MenuItem.class);

when(item.getItemId()).thenReturn(R.id.menu_refresh);

activity.onOptionsItemSelected(item);

assertThat(activity.menuRefreshSelected).isTrue();
assertThat(activity.menuRefreshSelectedFromAnnotatedClass).isFalse();
}

}