This repository was archived by the owner on Feb 26, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Add @Result annotation for @OnActivityResult #1058
Merged
yDelouis
merged 3 commits into
androidannotations:develop
from
simonz:796_Result_Annotation
Oct 4, 2014
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
...tions/androidannotations-api/src/main/java/org/androidannotations/annotations/Result.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /** | ||
| * Copyright (C) 2010-2014 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.annotations; | ||
|
|
||
| import android.content.Intent; | ||
| import android.os.Parcelable; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| /** | ||
| * <p> | ||
| * Use on any native, {@link Parcelable} or {@link Serializable} parameter of an | ||
| * {@link OnActivityResult} annotated method to bind it with the value from the Intent. | ||
| * </p> | ||
| * <p> | ||
| * The annotation value is the key used for the result data. If not set, the field name | ||
| * will be used as the key. | ||
| * </p> | ||
| * | ||
| * <blockquote> | ||
| * | ||
| * Some usage examples of @Result annotation: | ||
| * | ||
| * <pre> | ||
| * @OnActivityResult(REQUEST_CODE) | ||
| * void onResult(int resultCode, Intent data, <b>@Result String value</b>) { | ||
| * } | ||
| * | ||
| * @OnActivityResult(REQUEST_CODE) | ||
| * void onResult(int resultCode, <b>@Result(value = "key") String value</b>) { | ||
| * } | ||
| * | ||
| * @OnActivityResult(REQUEST_CODE) | ||
| * void onResult(<b>@Result String strVal</b>, <b>@Result int intVal</b>) { | ||
| * } | ||
| * </pre> | ||
| * | ||
| * </blockquote> | ||
| * | ||
| * @see android.app.Activity#onActivityResult(int, int, Intent) | ||
| * @see OnActivityResult | ||
| */ | ||
|
|
||
| @Retention(RetentionPolicy.CLASS) | ||
| @Target(ElementType.PARAMETER) | ||
| public @interface Result { | ||
| String value() default ""; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
...ations/androidannotations/src/main/java/org/androidannotations/handler/ResultHandler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /** | ||
| * Copyright (C) 2010-2014 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.handler; | ||
|
|
||
| import javax.annotation.processing.ProcessingEnvironment; | ||
| import javax.lang.model.element.Element; | ||
| import javax.lang.model.element.Name; | ||
| import javax.lang.model.element.VariableElement; | ||
|
|
||
| import org.androidannotations.annotations.Result; | ||
| import org.androidannotations.helper.APTCodeModelHelper; | ||
| import org.androidannotations.helper.AnnotationHelper; | ||
| import org.androidannotations.helper.BundleHelper; | ||
| import org.androidannotations.helper.IdValidatorHelper; | ||
| import org.androidannotations.helper.TargetAnnotationHelper; | ||
| import org.androidannotations.helper.ValidatorHelper; | ||
| import org.androidannotations.holder.HasOnActivityResult; | ||
| import org.androidannotations.model.AnnotationElements; | ||
|
|
||
| import com.sun.codemodel.JBlock; | ||
| import com.sun.codemodel.JClass; | ||
| import com.sun.codemodel.JExpr; | ||
| import com.sun.codemodel.JExpression; | ||
| import com.sun.codemodel.JVar; | ||
| import org.androidannotations.process.IsValid; | ||
|
|
||
| public class ResultHandler { | ||
|
|
||
| private final static APTCodeModelHelper codeModelHelper = new APTCodeModelHelper(); | ||
|
|
||
| public static JExpression getExtraValue(HasOnActivityResult holder, JBlock block, | ||
| VariableElement parameter) { | ||
| Result annotation = parameter.getAnnotation(Result.class); | ||
| String parameterName = parameter.getSimpleName().toString(); | ||
| String extraKey = annotation.value(); | ||
| if (extraKey.isEmpty()) { | ||
| extraKey = parameterName; | ||
| } | ||
|
|
||
| JVar extras = holder.getOnActivityResultExtras(); | ||
| BundleHelper bundleHelper = new BundleHelper(new AnnotationHelper(holder.processingEnvironment()), parameter); | ||
| JExpression restoreMethodCall = JExpr.invoke(extras, bundleHelper.getMethodNameToRestore()).arg(extraKey); | ||
| JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameter.asType(), holder); | ||
| if (bundleHelper.restoreCallNeedCastStatement()) { | ||
| restoreMethodCall = JExpr.cast(parameterClass, restoreMethodCall); | ||
| } | ||
| return block.decl(parameterClass, parameterName + "_", restoreMethodCall); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please, add some javadoc on the annotation. See existing annotations to have some examples.