Skip to content

Commit 3f1802f

Browse files
committed
Merge pull request androidannotations#511 from KoljaTM/450_Pref_not_processed_on_clean
Check for TypeKind.ERROR in addition to ErrorType. Fixes androidannotations#450
2 parents 135f41c + 3afac43 commit 3f1802f

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ public void isSharedPreference(Element element, AnnotationElements validatedElem
645645
/*
646646
* The type is not available yet because it has just been generated
647647
*/
648-
if (type instanceof ErrorType) {
648+
if (type instanceof ErrorType || type.getKind() == TypeKind.ERROR) {
649649
String elementTypeName = type.toString();
650650

651651
boolean sharedPrefValidatedInRound = false;

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/PrefProcessor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import javax.lang.model.element.Element;
2424
import javax.lang.model.element.TypeElement;
2525
import javax.lang.model.type.ErrorType;
26+
import javax.lang.model.type.TypeKind;
2627
import javax.lang.model.type.TypeMirror;
2728

2829
import org.androidannotations.annotations.sharedpreferences.Pref;
@@ -54,7 +55,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
5455
TypeMirror fieldTypeMirror = element.asType();
5556

5657
String fieldType = fieldTypeMirror.toString();
57-
if (fieldTypeMirror instanceof ErrorType) {
58+
if (fieldTypeMirror instanceof ErrorType || fieldTypeMirror.getKind() == TypeKind.ERROR) {
5859
String elementTypeName = fieldTypeMirror.toString();
5960
String prefTypeName = elementTypeName.substring(0, elementTypeName.length() - GENERATION_SUFFIX.length());
6061
Set<? extends Element> sharedPrefElements = validatedModel.getRootAnnotatedElements(SharedPref.class.getName());

0 commit comments

Comments
 (0)