diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java index 538ea01ade..fb186a51a8 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java @@ -159,7 +159,7 @@ public String getMethodNameToRestore() { private boolean isTypeParcelable(TypeElement elementType) { - TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName("android.os.Parcelable"); + TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.PARCELABLE); return elementType != null && annotationHelper.isSubtype(elementType, parcelableType); } diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java index 020e943b93..a4e2a665c5 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java @@ -450,7 +450,7 @@ public void returnTypeIsVoidOrBoolean(ExecutableElement executableElement, IsVal TypeKind returnKind = returnType.getKind(); - if (returnKind != TypeKind.BOOLEAN && returnKind != TypeKind.VOID && !returnType.toString().equals("java.lang.Boolean")) { + if (returnKind != TypeKind.BOOLEAN && returnKind != TypeKind.VOID && !returnType.toString().equals(CanonicalNameConstants.BOOLEAN)) { valid.invalidate(); annotationHelper.printAnnotationError(executableElement, "%s can only be used on a method with a boolean or a void return type"); } @@ -714,7 +714,7 @@ public void hasOneOrTwoParametersAndFirstIsBoolean(ExecutableElement executableE TypeKind parameterKind = firstParameter.asType().getKind(); - if (parameterKind != TypeKind.BOOLEAN && !firstParameter.toString().equals("java.lang.Boolean")) { + if (parameterKind != TypeKind.BOOLEAN && !firstParameter.toString().equals(CanonicalNameConstants.BOOLEAN)) { valid.invalidate(); annotationHelper.printAnnotationError(executableElement, "the first parameter should be a boolean"); } @@ -1071,7 +1071,7 @@ public void canBeSavedAsInstanceState(Element element, IsValid isValid) { } if (elementType != null) { - TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName("android.os.Parcelable"); + TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.PARCELABLE); TypeElement serializableType = annotationHelper.typeElementFromQualifiedName("java.io.Serializable"); if (!annotationHelper.isSubtype(elementType, parcelableType) && !annotationHelper.isSubtype(elementType, serializableType)) { annotationHelper.printAnnotationError(element, "Unrecognized type. Please let your attribute be primitive or implement Serializable or Parcelable"); diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterTextChangeProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterTextChangeProcessor.java index 882a84c688..460c9725a8 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterTextChangeProcessor.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterTextChangeProcessor.java @@ -26,9 +26,11 @@ import org.androidannotations.annotations.AfterTextChange; import org.androidannotations.helper.APTCodeModelHelper; +import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.helper.TextWatcherHelper; import org.androidannotations.rclass.IRClass; import org.androidannotations.rclass.IRClass.Res; + import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; import com.sun.codemodel.JExpression; @@ -72,10 +74,10 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) { VariableElement parameter = parameters.get(i); TypeMirror parameterType = parameter.asType(); - if ("android.text.Editable".equals(parameterType.toString())) { + if (CanonicalNameConstants.EDITABLE.equals(parameterType.toString())) { editableParameterPosition = i; } else { - TypeMirror textViewType = helper.typeElementFromQualifiedName("android.widget.TextView").asType(); + TypeMirror textViewType = helper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType(); if (helper.isSubtype(parameterType, textViewType)) { viewParameterPosition = i; viewParameterType = parameterType; diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeforeTextChangeProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeforeTextChangeProcessor.java index f32e556403..2ccd97dd7e 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeforeTextChangeProcessor.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeforeTextChangeProcessor.java @@ -27,9 +27,11 @@ import org.androidannotations.annotations.BeforeTextChange; import org.androidannotations.helper.APTCodeModelHelper; +import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.helper.TextWatcherHelper; import org.androidannotations.rclass.IRClass; import org.androidannotations.rclass.IRClass.Res; + import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; import com.sun.codemodel.JExpression; @@ -77,9 +79,9 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) { String parameterName = parameter.toString(); TypeMirror parameterType = parameter.asType(); - if ("java.lang.CharSequence".equals(parameterType.toString())) { + if (CanonicalNameConstants.CHAR_SEQUENCE.equals(parameterType.toString())) { charSequenceParameterPosition = i; - } else if (parameterType.getKind() == TypeKind.INT || "java.lang.Integer".equals(parameterType.toString())) { + } else if (parameterType.getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType.toString())) { if ("start".equals(parameterName)) { startParameterPosition = i; } else if ("count".equals(parameterName)) { @@ -88,7 +90,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) { afterParameterPosition = i; } } else { - TypeMirror textViewType = helper.typeElementFromQualifiedName("android.widget.TextView").asType(); + TypeMirror textViewType = helper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType(); if (helper.isSubtype(parameterType, textViewType)) { viewParameterPosition = i; viewParameterType = parameterType; diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByTagProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByTagProcessor.java index 490968d173..9d258a1362 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByTagProcessor.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByTagProcessor.java @@ -30,7 +30,9 @@ import org.androidannotations.annotations.FragmentByTag; import org.androidannotations.helper.AnnotationHelper; +import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.processing.EBeansHolder.Classes; + import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; import com.sun.codemodel.JMethod; @@ -65,7 +67,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) { tagValue = fieldName; } - TypeMirror nativeFragmentType = annotationHelper.typeElementFromQualifiedName("android.app.Fragment").asType(); + TypeMirror nativeFragmentType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.FRAGMENT).asType(); JMethod findFragmentByTag; if (annotationHelper.isSubtype(elementType, nativeFragmentType)) { diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java index 61f3608c7a..55578855d6 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java @@ -53,6 +53,7 @@ import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper; import org.androidannotations.api.sharedpreferences.StringPrefEditorField; import org.androidannotations.api.sharedpreferences.StringPrefField; +import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.helper.ModelConstants; import com.sun.codemodel.ClassType; @@ -85,7 +86,7 @@ public EditorFieldHolder(Class fieldClass, String fieldMethodName) { put("float", new EditorFieldHolder(FloatPrefEditorField.class, "floatField")); put("int", new EditorFieldHolder(IntPrefEditorField.class, "intField")); put("long", new EditorFieldHolder(LongPrefEditorField.class, "longField")); - put("java.lang.String", new EditorFieldHolder(StringPrefEditorField.class, "stringField")); + put(CanonicalNameConstants.STRING, new EditorFieldHolder(StringPrefEditorField.class, "stringField")); } }; @@ -139,7 +140,7 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder eBeansHo } // Helper constructor - JClass contextClass = eBeansHolder.refClass("android.content.Context"); + JClass contextClass = eBeansHolder.refClass(CanonicalNameConstants.CONTEXT); SharedPref sharedPrefAnnotation = typeElement.getAnnotation(SharedPref.class); Scope scope = sharedPrefAnnotation.value(); @@ -230,7 +231,7 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder eBeansHo defaultValue = JExpr.lit(0l); } addFieldHelperMethod(helperClass, fieldName, defaultValue, LongPrefField.class, "longField"); - } else if ("java.lang.String".equals(returnType)) { + } else if (CanonicalNameConstants.STRING.equals(returnType)) { JExpression defaultValue; DefaultString defaultAnnotation = method.getAnnotation(DefaultString.class); if (defaultAnnotation != null) { @@ -253,7 +254,7 @@ private JMethod getLocalClassName(EBeansHolder eBeansHolder, JDefinedClass helpe JClass stringClass = eBeansHolder.refClass(String.class); JMethod getLocalClassName = helperClass.method(PRIVATE | STATIC, stringClass, "getLocalClassName"); - JClass contextClass = eBeansHolder.refClass("android.content.Context"); + JClass contextClass = eBeansHolder.refClass(CanonicalNameConstants.CONTEXT); JVar contextParam = getLocalClassName.param(contextClass, "context"); diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterTextChangeValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterTextChangeValidator.java index 83ecbf779a..7ec8884dce 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterTextChangeValidator.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterTextChangeValidator.java @@ -24,6 +24,7 @@ import javax.lang.model.element.VariableElement; import org.androidannotations.annotations.AfterTextChange; +import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.helper.IdAnnotationHelper; import org.androidannotations.helper.IdValidatorHelper; import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy; @@ -74,7 +75,7 @@ private void haveAfterTextChangedMethodParameters(ExecutableElement executableEl boolean textViewParameterFound = false; for (VariableElement parameter : parameters) { String parameterType = parameter.asType().toString(); - if (parameterType.equals("android.text.Editable")) { + if (parameterType.equals(CanonicalNameConstants.EDITABLE)) { if (editableParameterFound) { annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.text.Editable"); valid.invalidate(); @@ -82,7 +83,7 @@ private void haveAfterTextChangedMethodParameters(ExecutableElement executableEl editableParameterFound = true; continue; } - if (parameterType.equals("android.widget.TextView")) { + if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) { if (textViewParameterFound) { annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView"); valid.invalidate(); diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeforeTextChangeValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeforeTextChangeValidator.java index b03c03e6a9..1aa5355a95 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeforeTextChangeValidator.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeforeTextChangeValidator.java @@ -25,6 +25,7 @@ import javax.lang.model.type.TypeKind; import org.androidannotations.annotations.BeforeTextChange; +import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.helper.IdAnnotationHelper; import org.androidannotations.helper.IdValidatorHelper; import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy; @@ -75,7 +76,7 @@ private void haveBeforeTextChangedMethodParameters(ExecutableElement executableE boolean textViewParameterFound = false; for (VariableElement parameter : parameters) { String parameterType = parameter.asType().toString(); - if (parameterType.equals("java.lang.CharSequence")) { + if (parameterType.equals(CanonicalNameConstants.CHAR_SEQUENCE)) { if (charSequenceParameterFound) { annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type java.lang.CharSequence"); valid.invalidate(); @@ -83,7 +84,7 @@ private void haveBeforeTextChangedMethodParameters(ExecutableElement executableE charSequenceParameterFound = true; continue; } - if (parameterType.equals("android.widget.TextView")) { + if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) { if (textViewParameterFound) { annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView"); valid.invalidate(); @@ -91,7 +92,7 @@ private void haveBeforeTextChangedMethodParameters(ExecutableElement executableE textViewParameterFound = true; continue; } - if (parameter.asType().getKind() == TypeKind.INT || "java.lang.Integer".equals(parameterType)) { + if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) { String parameterName = parameter.toString(); if ("start".equals(parameterName) || "count".equals(parameterName) || "after".equals(parameterName)) { continue; diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TextChangeValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TextChangeValidator.java index 90d9d79d53..3847b2ff4d 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TextChangeValidator.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TextChangeValidator.java @@ -25,6 +25,7 @@ import javax.lang.model.type.TypeKind; import org.androidannotations.annotations.TextChange; +import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.helper.IdAnnotationHelper; import org.androidannotations.helper.IdValidatorHelper; import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy; @@ -75,7 +76,7 @@ private void haveTextChangedMethodParameters(ExecutableElement executableElement boolean textViewParameterFound = false; for (VariableElement parameter : parameters) { String parameterType = parameter.asType().toString(); - if (parameterType.equals("java.lang.CharSequence")) { + if (parameterType.equals(CanonicalNameConstants.CHAR_SEQUENCE)) { if (charSequenceParameterFound) { annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type java.lang.CharSequence"); valid.invalidate(); @@ -83,7 +84,7 @@ private void haveTextChangedMethodParameters(ExecutableElement executableElement charSequenceParameterFound = true; continue; } - if (parameterType.equals("android.widget.TextView")) { + if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) { if (textViewParameterFound) { annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView"); valid.invalidate(); @@ -91,7 +92,7 @@ private void haveTextChangedMethodParameters(ExecutableElement executableElement textViewParameterFound = true; continue; } - if (parameter.asType().getKind() == TypeKind.INT || "java.lang.Integer".equals(parameterType)) { + if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) { String parameterName = parameter.toString(); if ("start".equals(parameterName) || "before".equals(parameterName) || "count".equals(parameterName)) { continue;