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

Support new type in bundles #1651

Merged
WonderCsabo merged 3 commits into from
Dec 16, 2015
Merged

Support new type in bundles #1651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fda43a0
Added support of new bundle type for CharSequence[] and java.util.Arr…
shiraji Dec 11, 2015
309c776
Added SparseArray support for bundle
shiraji Dec 14, 2015
78ed909
Added test cases for new bundle types
shiraji Dec 12, 2015
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
Prev Previous commit
Next Next commit
Added SparseArray support for bundle
  • Loading branch information
@shiraji
shiraji committed Dec 14, 2015
commit 309c7762d38ade613301c232118de80308be9eca
4 changes: 3 additions & 1 deletion ...ons-core/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ public BundleHelper(AndroidAnnotationsEnvironment environment, TypeMirror elemen
restoreCallNeedCastStatement = true;
restoreCallNeedsSuppressWarning = true;
}

} else if (typeString.startsWith(CanonicalNameConstants.SPARSE_ARRAY)) {
methodNameToSave = "put" + "SparseParcelableArray";
methodNameToRestore = "get" + "SparseParcelableArray";
} else {

boolean hasTypeArguments = element.getKind() == TypeKind.DECLARED && hasTypeArguments(element) || //
Expand Down
11 changes: 8 additions & 3 deletions ...-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,14 @@ public void canBePutInABundle(Element element, ElementValidation valid) {
if (typeMirror.getKind() != TypeKind.NONE) {
TypeMirror parcelableType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.PARCELABLE).asType();
TypeMirror serializableType = annotationHelper.typeElementFromQualifiedName("java.io.Serializable").asType();
if (!annotationHelper.isSubtype(typeMirror, parcelableType)
&& !annotationHelper.isSubtype(typeMirror, serializableType)
&& !parcelerHelper.isParcelType(typeMirror)) {

if (typeString.startsWith(CanonicalNameConstants.SPARSE_ARRAY)) {
DeclaredType declaredType = (DeclaredType) typeMirror;
List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
if (typeArguments.size() != 1 || !annotationHelper.isSubtype(typeArguments.get(0), parcelableType)) {
valid.addError("Unrecognized type. The type argument of SparseArray should implement Parcelable.");
}
} else if (!annotationHelper.isSubtype(typeMirror, parcelableType) && !annotationHelper.isSubtype(typeMirror, serializableType) && !parcelerHelper.isParcelType(typeMirror)) {
valid.addError("Unrecognized type. Please let your attribute be primitive or implement Serializable or Parcelable or an annotated Parceler bean.");
}
}
Expand Down