Skip to content

Commit 2bc991c

Browse files
mathieubonifacemathieuboniface
committed
Merge pull request androidannotations#453 from naixx/use_canonical_names
Use canonical names
2 parents 0103f78 + de1874b commit 2bc991c

9 files changed

Lines changed: 32 additions & 22 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public String getMethodNameToRestore() {
159159

160160
private boolean isTypeParcelable(TypeElement elementType) {
161161

162-
TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName("android.os.Parcelable");
162+
TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.PARCELABLE);
163163

164164
return elementType != null && annotationHelper.isSubtype(elementType, parcelableType);
165165
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ public void returnTypeIsVoidOrBoolean(ExecutableElement executableElement, IsVal
450450

451451
TypeKind returnKind = returnType.getKind();
452452

453-
if (returnKind != TypeKind.BOOLEAN && returnKind != TypeKind.VOID && !returnType.toString().equals("java.lang.Boolean")) {
453+
if (returnKind != TypeKind.BOOLEAN && returnKind != TypeKind.VOID && !returnType.toString().equals(CanonicalNameConstants.BOOLEAN)) {
454454
valid.invalidate();
455455
annotationHelper.printAnnotationError(executableElement, "%s can only be used on a method with a boolean or a void return type");
456456
}
@@ -714,7 +714,7 @@ public void hasOneOrTwoParametersAndFirstIsBoolean(ExecutableElement executableE
714714

715715
TypeKind parameterKind = firstParameter.asType().getKind();
716716

717-
if (parameterKind != TypeKind.BOOLEAN && !firstParameter.toString().equals("java.lang.Boolean")) {
717+
if (parameterKind != TypeKind.BOOLEAN && !firstParameter.toString().equals(CanonicalNameConstants.BOOLEAN)) {
718718
valid.invalidate();
719719
annotationHelper.printAnnotationError(executableElement, "the first parameter should be a boolean");
720720
}
@@ -1071,7 +1071,7 @@ public void canBeSavedAsInstanceState(Element element, IsValid isValid) {
10711071
}
10721072

10731073
if (elementType != null) {
1074-
TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName("android.os.Parcelable");
1074+
TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.PARCELABLE);
10751075
TypeElement serializableType = annotationHelper.typeElementFromQualifiedName("java.io.Serializable");
10761076
if (!annotationHelper.isSubtype(elementType, parcelableType) && !annotationHelper.isSubtype(elementType, serializableType)) {
10771077
annotationHelper.printAnnotationError(element, "Unrecognized type. Please let your attribute be primitive or implement Serializable or Parcelable");

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626

2727
import org.androidannotations.annotations.AfterTextChange;
2828
import org.androidannotations.helper.APTCodeModelHelper;
29+
import org.androidannotations.helper.CanonicalNameConstants;
2930
import org.androidannotations.helper.TextWatcherHelper;
3031
import org.androidannotations.rclass.IRClass;
3132
import org.androidannotations.rclass.IRClass.Res;
33+
3234
import com.sun.codemodel.JBlock;
3335
import com.sun.codemodel.JCodeModel;
3436
import com.sun.codemodel.JExpression;
@@ -72,10 +74,10 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
7274
VariableElement parameter = parameters.get(i);
7375
TypeMirror parameterType = parameter.asType();
7476

75-
if ("android.text.Editable".equals(parameterType.toString())) {
77+
if (CanonicalNameConstants.EDITABLE.equals(parameterType.toString())) {
7678
editableParameterPosition = i;
7779
} else {
78-
TypeMirror textViewType = helper.typeElementFromQualifiedName("android.widget.TextView").asType();
80+
TypeMirror textViewType = helper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType();
7981
if (helper.isSubtype(parameterType, textViewType)) {
8082
viewParameterPosition = i;
8183
viewParameterType = parameterType;

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727

2828
import org.androidannotations.annotations.BeforeTextChange;
2929
import org.androidannotations.helper.APTCodeModelHelper;
30+
import org.androidannotations.helper.CanonicalNameConstants;
3031
import org.androidannotations.helper.TextWatcherHelper;
3132
import org.androidannotations.rclass.IRClass;
3233
import org.androidannotations.rclass.IRClass.Res;
34+
3335
import com.sun.codemodel.JBlock;
3436
import com.sun.codemodel.JCodeModel;
3537
import com.sun.codemodel.JExpression;
@@ -77,9 +79,9 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
7779
String parameterName = parameter.toString();
7880
TypeMirror parameterType = parameter.asType();
7981

80-
if ("java.lang.CharSequence".equals(parameterType.toString())) {
82+
if (CanonicalNameConstants.CHAR_SEQUENCE.equals(parameterType.toString())) {
8183
charSequenceParameterPosition = i;
82-
} else if (parameterType.getKind() == TypeKind.INT || "java.lang.Integer".equals(parameterType.toString())) {
84+
} else if (parameterType.getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType.toString())) {
8385
if ("start".equals(parameterName)) {
8486
startParameterPosition = i;
8587
} else if ("count".equals(parameterName)) {
@@ -88,7 +90,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
8890
afterParameterPosition = i;
8991
}
9092
} else {
91-
TypeMirror textViewType = helper.typeElementFromQualifiedName("android.widget.TextView").asType();
93+
TypeMirror textViewType = helper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType();
9294
if (helper.isSubtype(parameterType, textViewType)) {
9395
viewParameterPosition = i;
9496
viewParameterType = parameterType;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030

3131
import org.androidannotations.annotations.FragmentByTag;
3232
import org.androidannotations.helper.AnnotationHelper;
33+
import org.androidannotations.helper.CanonicalNameConstants;
3334
import org.androidannotations.processing.EBeansHolder.Classes;
35+
3436
import com.sun.codemodel.JBlock;
3537
import com.sun.codemodel.JCodeModel;
3638
import com.sun.codemodel.JMethod;
@@ -65,7 +67,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
6567
tagValue = fieldName;
6668
}
6769

68-
TypeMirror nativeFragmentType = annotationHelper.typeElementFromQualifiedName("android.app.Fragment").asType();
70+
TypeMirror nativeFragmentType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.FRAGMENT).asType();
6971

7072
JMethod findFragmentByTag;
7173
if (annotationHelper.isSubtype(elementType, nativeFragmentType)) {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
5454
import org.androidannotations.api.sharedpreferences.StringPrefEditorField;
5555
import org.androidannotations.api.sharedpreferences.StringPrefField;
56+
import org.androidannotations.helper.CanonicalNameConstants;
5657
import org.androidannotations.helper.ModelConstants;
5758

5859
import com.sun.codemodel.ClassType;
@@ -85,7 +86,7 @@ public EditorFieldHolder(Class<?> fieldClass, String fieldMethodName) {
8586
put("float", new EditorFieldHolder(FloatPrefEditorField.class, "floatField"));
8687
put("int", new EditorFieldHolder(IntPrefEditorField.class, "intField"));
8788
put("long", new EditorFieldHolder(LongPrefEditorField.class, "longField"));
88-
put("java.lang.String", new EditorFieldHolder(StringPrefEditorField.class, "stringField"));
89+
put(CanonicalNameConstants.STRING, new EditorFieldHolder(StringPrefEditorField.class, "stringField"));
8990
}
9091
};
9192

@@ -139,7 +140,7 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder eBeansHo
139140
}
140141

141142
// Helper constructor
142-
JClass contextClass = eBeansHolder.refClass("android.content.Context");
143+
JClass contextClass = eBeansHolder.refClass(CanonicalNameConstants.CONTEXT);
143144

144145
SharedPref sharedPrefAnnotation = typeElement.getAnnotation(SharedPref.class);
145146
Scope scope = sharedPrefAnnotation.value();
@@ -230,7 +231,7 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder eBeansHo
230231
defaultValue = JExpr.lit(0l);
231232
}
232233
addFieldHelperMethod(helperClass, fieldName, defaultValue, LongPrefField.class, "longField");
233-
} else if ("java.lang.String".equals(returnType)) {
234+
} else if (CanonicalNameConstants.STRING.equals(returnType)) {
234235
JExpression defaultValue;
235236
DefaultString defaultAnnotation = method.getAnnotation(DefaultString.class);
236237
if (defaultAnnotation != null) {
@@ -253,7 +254,7 @@ private JMethod getLocalClassName(EBeansHolder eBeansHolder, JDefinedClass helpe
253254

254255
JClass stringClass = eBeansHolder.refClass(String.class);
255256
JMethod getLocalClassName = helperClass.method(PRIVATE | STATIC, stringClass, "getLocalClassName");
256-
JClass contextClass = eBeansHolder.refClass("android.content.Context");
257+
JClass contextClass = eBeansHolder.refClass(CanonicalNameConstants.CONTEXT);
257258

258259
JVar contextParam = getLocalClassName.param(contextClass, "context");
259260

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterTextChangeValidator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import javax.lang.model.element.VariableElement;
2525

2626
import org.androidannotations.annotations.AfterTextChange;
27+
import org.androidannotations.helper.CanonicalNameConstants;
2728
import org.androidannotations.helper.IdAnnotationHelper;
2829
import org.androidannotations.helper.IdValidatorHelper;
2930
import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
@@ -74,15 +75,15 @@ private void haveAfterTextChangedMethodParameters(ExecutableElement executableEl
7475
boolean textViewParameterFound = false;
7576
for (VariableElement parameter : parameters) {
7677
String parameterType = parameter.asType().toString();
77-
if (parameterType.equals("android.text.Editable")) {
78+
if (parameterType.equals(CanonicalNameConstants.EDITABLE)) {
7879
if (editableParameterFound) {
7980
annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.text.Editable");
8081
valid.invalidate();
8182
}
8283
editableParameterFound = true;
8384
continue;
8485
}
85-
if (parameterType.equals("android.widget.TextView")) {
86+
if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
8687
if (textViewParameterFound) {
8788
annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
8889
valid.invalidate();

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeforeTextChangeValidator.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import javax.lang.model.type.TypeKind;
2626

2727
import org.androidannotations.annotations.BeforeTextChange;
28+
import org.androidannotations.helper.CanonicalNameConstants;
2829
import org.androidannotations.helper.IdAnnotationHelper;
2930
import org.androidannotations.helper.IdValidatorHelper;
3031
import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
@@ -75,23 +76,23 @@ private void haveBeforeTextChangedMethodParameters(ExecutableElement executableE
7576
boolean textViewParameterFound = false;
7677
for (VariableElement parameter : parameters) {
7778
String parameterType = parameter.asType().toString();
78-
if (parameterType.equals("java.lang.CharSequence")) {
79+
if (parameterType.equals(CanonicalNameConstants.CHAR_SEQUENCE)) {
7980
if (charSequenceParameterFound) {
8081
annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type java.lang.CharSequence");
8182
valid.invalidate();
8283
}
8384
charSequenceParameterFound = true;
8485
continue;
8586
}
86-
if (parameterType.equals("android.widget.TextView")) {
87+
if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
8788
if (textViewParameterFound) {
8889
annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
8990
valid.invalidate();
9091
}
9192
textViewParameterFound = true;
9293
continue;
9394
}
94-
if (parameter.asType().getKind() == TypeKind.INT || "java.lang.Integer".equals(parameterType)) {
95+
if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) {
9596
String parameterName = parameter.toString();
9697
if ("start".equals(parameterName) || "count".equals(parameterName) || "after".equals(parameterName)) {
9798
continue;

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TextChangeValidator.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import javax.lang.model.type.TypeKind;
2626

2727
import org.androidannotations.annotations.TextChange;
28+
import org.androidannotations.helper.CanonicalNameConstants;
2829
import org.androidannotations.helper.IdAnnotationHelper;
2930
import org.androidannotations.helper.IdValidatorHelper;
3031
import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
@@ -75,23 +76,23 @@ private void haveTextChangedMethodParameters(ExecutableElement executableElement
7576
boolean textViewParameterFound = false;
7677
for (VariableElement parameter : parameters) {
7778
String parameterType = parameter.asType().toString();
78-
if (parameterType.equals("java.lang.CharSequence")) {
79+
if (parameterType.equals(CanonicalNameConstants.CHAR_SEQUENCE)) {
7980
if (charSequenceParameterFound) {
8081
annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type java.lang.CharSequence");
8182
valid.invalidate();
8283
}
8384
charSequenceParameterFound = true;
8485
continue;
8586
}
86-
if (parameterType.equals("android.widget.TextView")) {
87+
if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
8788
if (textViewParameterFound) {
8889
annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
8990
valid.invalidate();
9091
}
9192
textViewParameterFound = true;
9293
continue;
9394
}
94-
if (parameter.asType().getKind() == TypeKind.INT || "java.lang.Integer".equals(parameterType)) {
95+
if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) {
9596
String parameterName = parameter.toString();
9697
if ("start".equals(parameterName) || "before".equals(parameterName) || "count".equals(parameterName)) {
9798
continue;

0 commit comments

Comments
 (0)