Use more safe getJClass instead of JCodeModel.ref

WonderCsabo · WonderCsabo · commit 12342808d3eb · 2015-10-14T10:54:21.000+02:00
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
@@ -234,7 +234,7 @@ public IJExpression getExpressionToRestoreFromBundle(AbstractJClass variableClas
 		}
 
 		if (parcelerBean) {
-			expressionToRestore = environment.getCodeModel().ref(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("unwrap").arg(expressionToRestore);
+			expressionToRestore = environment.getJClass(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("unwrap").arg(expressionToRestore);
 		}
 
 		if (restoreCallNeedCastStatement) {
@@ -250,7 +250,7 @@ public IJExpression getExpressionToRestoreFromBundle(AbstractJClass variableClas
 	public IJStatement getExpressionToSaveFromField(IJExpression saveStateBundleParam, IJExpression fieldName, IJExpression variableRef) {
 		IJExpression refExpression = variableRef;
 		if (parcelerBean) {
-			refExpression = environment.getCodeModel().ref(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("wrap").arg(refExpression);
+			refExpression = environment.getJClass(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("wrap").arg(refExpression);
 		}
 		return JExpr.invoke(saveStateBundleParam, methodNameToSave).arg(fieldName).arg(refExpression);
 	}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/IntentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/IntentBuilder.java
@@ -149,7 +149,7 @@ public JInvocation getSuperPutExtraInvocation(TypeMirror elementType, JVar extra
 					extraParameterArg = cast(environment.getClasses().PARCELABLE, extraParameterArg);
 				}
 			} else if (!BundleHelper.METHOD_SUFFIX_BY_TYPE_NAME.containsKey(elementType.toString()) && parcelerHelper.isParcelType(elementType)) {
-				extraParameterArg = environment.getCodeModel().ref(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("wrap").arg(extraParameterArg);
+				extraParameterArg = environment.getJClass(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("wrap").arg(extraParameterArg);
 			} else {
 				TypeMirror stringType = elementUtils.getTypeElement(STRING).asType();
 				if (!typeUtils.isSubtype(elementType, stringType)) {

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public IJExpression getExpressionToRestoreFromBundle(AbstractJClass variableClas`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`if (parcelerBean) {`
`237`		`- expressionToRestore = environment.getCodeModel().ref(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("unwrap").arg(expressionToRestore);`
	`237`	`+ expressionToRestore = environment.getJClass(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("unwrap").arg(expressionToRestore);`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`if (restoreCallNeedCastStatement) {`
`@@ -250,7 +250,7 @@ public IJExpression getExpressionToRestoreFromBundle(AbstractJClass variableClas`
`250`	`250`	`public IJStatement getExpressionToSaveFromField(IJExpression saveStateBundleParam, IJExpression fieldName, IJExpression variableRef) {`
`251`	`251`	`IJExpression refExpression = variableRef;`
`252`	`252`	`if (parcelerBean) {`
`253`		`- refExpression = environment.getCodeModel().ref(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("wrap").arg(refExpression);`
	`253`	`+ refExpression = environment.getJClass(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("wrap").arg(refExpression);`
`254`	`254`	`}`
`255`	`255`	`return JExpr.invoke(saveStateBundleParam, methodNameToSave).arg(fieldName).arg(refExpression);`
`256`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public JInvocation getSuperPutExtraInvocation(TypeMirror elementType, JVar extra`
`149`	`149`	`extraParameterArg = cast(environment.getClasses().PARCELABLE, extraParameterArg);`
`150`	`150`	`}`
`151`	`151`	`} else if (!BundleHelper.METHOD_SUFFIX_BY_TYPE_NAME.containsKey(elementType.toString()) && parcelerHelper.isParcelType(elementType)) {`
`152`		`- extraParameterArg = environment.getCodeModel().ref(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("wrap").arg(extraParameterArg);`
	`152`	`+ extraParameterArg = environment.getJClass(CanonicalNameConstants.PARCELS_UTILITY_CLASS).staticInvoke("wrap").arg(extraParameterArg);`
`153`	`153`	`} else {`
`154`	`154`	`TypeMirror stringType = elementUtils.getTypeElement(STRING).asType();`
`155`	`155`	`if (!typeUtils.isSubtype(elementType, stringType)) {`