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

Added a break statement at the end of each case statement... #428

Merged
mathieuboniface merged 1 commit into from
Dec 8, 2012
Merged

Added a break statement at the end of each case statement... #428

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
3 changes: 1 addition & 2 deletions ...tions/androidannotations/src/main/java/org/androidannotations/processing/EBeanHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.androidannotations.processing.EBeansHolder.Classes;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JCase;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JDefinedClass;
Expand Down Expand Up @@ -94,7 +93,7 @@ public class EBeanHolder {
/**
* OnActivityResult byResultCode
*/
public final HashMap<Integer, JCase> onActivityResultCases = new HashMap<Integer, JCase>();
public final HashMap<Integer, JBlock> onActivityResultCases = new HashMap<Integer, JBlock>();

public JSwitch onActivityResultSwitch;
public JMethod onActivityResultMethod;
Expand Down
21 changes: 13 additions & 8 deletions ...nnotations/src/main/java/org/androidannotations/processing/OnActivityResultProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.rclass.IRClass;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JCase;
import com.sun.codemodel.JClass;
Expand Down Expand Up @@ -83,10 +84,10 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {

int requestCode = executableElement.getAnnotation(OnActivityResult.class).value();

JCase onActivityResultCase = getOrCreateOnActivityResultMethodBody(codeModel, holder, requestCode);
JBlock onActivityResultCase = getOrCreateOnActivityResultMethodBody(codeModel, holder, requestCode);

JExpression activityRef = holder.generatedClass.staticRef("this");
JInvocation onResultInvocation = onActivityResultCase.body().invoke(activityRef, methodName);
JInvocation onResultInvocation = onActivityResultCase.invoke(activityRef, methodName);

for (int i = 0; i < parameters.size(); i++) {
if (i == intentParameterPosition) {
Expand All @@ -100,7 +101,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {

}

public JCase getOrCreateOnActivityResultMethodBody(JCodeModel codeModel, EBeanHolder holder, int requestCode) {
public JBlock getOrCreateOnActivityResultMethodBody(JCodeModel codeModel, EBeanHolder holder, int requestCode) {
JClass intentClass = holder.classes().INTENT;

if (holder.onActivityResultSwitch == null) {
Expand All @@ -120,16 +121,20 @@ public JCase getOrCreateOnActivityResultMethodBody(JCodeModel codeModel, EBeanHo

JSwitch onActivityResultSwitch = holder.onActivityResultSwitch;

JCase onActivityResultCase = holder.onActivityResultCases.get(requestCode);
JBlock onActivityResultCaseBlock = holder.onActivityResultCases.get(requestCode);

if (onActivityResultCaseBlock == null) {

JCase onActivityResultCase = onActivityResultSwitch._case(JExpr.lit(requestCode));

if (onActivityResultCase == null) {
onActivityResultCaseBlock = onActivityResultCase.body().block();

onActivityResultCase = onActivityResultSwitch._case(JExpr.lit(requestCode));
onActivityResultCase.body()._break();

holder.onActivityResultCases.put(requestCode, onActivityResultCase);
holder.onActivityResultCases.put(requestCode, onActivityResultCaseBlock);

}

return onActivityResultCase;
return onActivityResultCaseBlock;
}
}
70 changes: 70 additions & 0 deletions ...est-1-5-tests/src/test/java/org/androidannotations/test15/AwaitingResultActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/**
* Copyright (C) 2010-2012 eBusiness Information, Excilys Group
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.test15;

import static org.fest.assertions.Assertions.assertThat;

import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(AndroidAnnotationsTestRunner.class)
public class AwaitingResultActivityTest {

@Test
public void onlyFirstRequestAnnotatedMethodAreCalled() {
AwaitingResultActivity_ activity = new AwaitingResultActivity_();

activity.onActivityResult(AwaitingResultActivity.FIRST_REQUEST, 0, null);

assertThat(activity.onResultCalled).isTrue();
assertThat(activity.onResultWithDataCalled).isFalse();
assertThat(activity.onActivityResultWithResultCodeAndDataCalled).isFalse();
assertThat(activity.onActivityResultWithDataAndResultCodeCalled).isFalse();
assertThat(activity.onResultWithIntResultCodeCalled).isFalse();
assertThat(activity.onResultWithIntegerResultCodeCalled).isFalse();
}


@Test
public void onlySecondRequestAnnotatedMethodAreCalled() {
AwaitingResultActivity_ activity = new AwaitingResultActivity_();

activity.onActivityResult(AwaitingResultActivity.SECOND_REQUEST, 0, null);

assertThat(activity.onResultCalled).isFalse();
assertThat(activity.onResultWithDataCalled).isTrue();
assertThat(activity.onActivityResultWithResultCodeAndDataCalled).isTrue();
assertThat(activity.onActivityResultWithDataAndResultCodeCalled).isTrue();
assertThat(activity.onResultWithIntResultCodeCalled).isFalse();
assertThat(activity.onResultWithIntegerResultCodeCalled).isFalse();
}


@Test
public void onlyThirdRequestAnnotatedMethodAreCalled() {
AwaitingResultActivity_ activity = new AwaitingResultActivity_();

activity.onActivityResult(AwaitingResultActivity.THIRD_REQUEST, 0, null);

assertThat(activity.onResultCalled).isFalse();
assertThat(activity.onResultWithDataCalled).isFalse();
assertThat(activity.onActivityResultWithResultCodeAndDataCalled).isFalse();
assertThat(activity.onActivityResultWithDataAndResultCodeCalled).isFalse();
assertThat(activity.onResultWithIntResultCodeCalled).isTrue();
assertThat(activity.onResultWithIntegerResultCodeCalled).isTrue();
}

}
19 changes: 16 additions & 3 deletions ...nctional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,45 @@
@EActivity(R.layout.views_injected)
public class AwaitingResultActivity extends Activity {

private static final int FIRST_REQUEST = 11;
private static final int SECOND_REQUEST = 22;
private static final int THIRD_REQUEST = 33;
static final int FIRST_REQUEST = 11;
static final int SECOND_REQUEST = 22;
static final int THIRD_REQUEST = 33;

boolean onResultCalled = false;
boolean onResultWithDataCalled = false;
boolean onActivityResultWithResultCodeAndDataCalled = false;
boolean onActivityResultWithDataAndResultCodeCalled = false;
boolean onResultWithIntResultCodeCalled = false;
boolean onResultWithIntegerResultCodeCalled = false;

@OnActivityResult(FIRST_REQUEST)
void onResult() {
onResultCalled = true;
}

@OnActivityResult(SECOND_REQUEST)
void onResultWithData(Intent intentData) {
onResultWithDataCalled = true;
}

@OnActivityResult(SECOND_REQUEST)
void onActivityResultWithResultCodeAndData(int result, Intent intentData) {
onActivityResultWithResultCodeAndDataCalled = true;
}

@OnActivityResult(SECOND_REQUEST)
void onActivityResultWithDataAndResultCode(Intent intentData, int result) {
onActivityResultWithDataAndResultCodeCalled = true;
}

@OnActivityResult(THIRD_REQUEST)
void onResultWithIntResultCode(int resultCode) {
onResultWithIntResultCodeCalled = true;
}

@OnActivityResult(THIRD_REQUEST)
void onResultWithIntegerResultCode(Integer resultCodeInteger) {
onResultWithIntegerResultCodeCalled = true;
}

}