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

@EApplication now stores the app instance as a static singleton #515

Merged
pyricau merged 1 commit into from
Feb 28, 2013
Merged

@EApplication now stores the app instance as a static singleton #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...s/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices
modelValidator.register(new PostValidator(processingEnv));
modelValidator.register(new PutValidator(processingEnv));
modelValidator.register(new AcceptValidator(processingEnv));
modelValidator.register(new AppValidator(processingEnv, androidManifest));
modelValidator.register(new AppValidator(processingEnv));
modelValidator.register(new OptionsMenuValidator(processingEnv, rClass));
modelValidator.register(new OptionsItemValidator(processingEnv, rClass));
modelValidator.register(new NoTitleValidator(processingEnv));
Expand Down
10 changes: 4 additions & 6 deletions ...androidannotations/src/main/java/org/androidannotations/helper/AndroidManifestFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,18 +195,16 @@ private Option<AndroidManifest> parse(File androidManifestFile, boolean libraryP

NodeList applicationNodes = documentElement.getElementsByTagName("application");

String applicationQualifiedName = null;
String applicationClassQualifiedName = null;
boolean applicationDebuggableMode = false;

if (applicationNodes.getLength() > 0) {
Node applicationNode = applicationNodes.item(0);
Node nameAttribute = applicationNode.getAttributes().getNamedItem("android:name");

String qualifiedName = manifestNameToValidQualifiedName(applicationPackage, nameAttribute);
applicationClassQualifiedName = manifestNameToValidQualifiedName(applicationPackage, nameAttribute);

if (qualifiedName != null) {
applicationQualifiedName = qualifiedName;
} else {
if (applicationClassQualifiedName == null) {
Messager messager = processingEnv.getMessager();
if (nameAttribute != null) {
messager.printMessage(Kind.NOTE, String.format("The class application declared in the AndroidManifest.xml cannot be found in the compile path: [%s]", nameAttribute.getNodeValue()));
Expand Down Expand Up @@ -243,7 +241,7 @@ private Option<AndroidManifest> parse(File androidManifestFile, boolean libraryP
List<String> permissionQualifiedNames = new ArrayList<String>();
permissionQualifiedNames.addAll(usesPermissionQualifiedNames);

return Option.of(AndroidManifest.createManifest(applicationPackage, applicationQualifiedName, componentQualifiedNames, permissionQualifiedNames, applicationDebuggableMode));
return Option.of(AndroidManifest.createManifest(applicationPackage, applicationClassQualifiedName, componentQualifiedNames, permissionQualifiedNames, applicationDebuggableMode));
}

private List<String> extractComponentNames(String applicationPackage, NodeList componentNodes) {
Expand Down
27 changes: 2 additions & 25 deletions ...tions/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 @@ -586,29 +586,6 @@ public void hasASqlLiteOpenHelperParameterizedType(Element element, IsValid vali
}
}

public void upperclassOfRegisteredApplication(Element element, AndroidManifest manifest, IsValid valid) {

if (manifest.isLibraryProject()) {
return;
}

String applicationClassName = manifest.getApplicationClassName();
if (applicationClassName != null) {
if (applicationClassName.endsWith(GENERATION_SUFFIX)) {
applicationClassName = applicationClassName.substring(0, applicationClassName.length() - GENERATION_SUFFIX.length());
}
TypeMirror elementType = element.asType();
TypeMirror manifestType = annotationHelper.typeElementFromQualifiedName(applicationClassName).asType();
if (!annotationHelper.isSubtype(manifestType, elementType)) {
valid.invalidate();
annotationHelper.printAnnotationError(element, "%s can only be used on an element that is an instance of the following class (or one of it's superclass): " + applicationClassName);
}
} else {
valid.invalidate();
annotationHelper.printAnnotationError(element, "No application class is registered in the AndroidManifest.xml");
}
}

public void applicationRegistered(Element element, AndroidManifest manifest, IsValid valid) {

if (manifest.isLibraryProject()) {
Expand Down Expand Up @@ -645,7 +622,7 @@ public void isSharedPreference(Element element, AnnotationElements validatedElem
/*
* The type is not available yet because it has just been generated
*/
if (type instanceof ErrorType || type.getKind() == TypeKind.ERROR) {
if (type instanceof ErrorType || type.getKind() == TypeKind.ERROR) {
String elementTypeName = type.toString();

boolean sharedPrefValidatedInRound = false;
Expand Down Expand Up @@ -1181,7 +1158,7 @@ public void validateInterceptors(Element element, IsValid valid) {
TypeMirror clientHttpRequestInterceptorType = annotationHelper.typeElementFromQualifiedName(CLIENT_HTTP_REQUEST_INTERCEPTOR).asType();
TypeMirror clientHttpRequestInterceptorTypeErased = annotationHelper.getTypeUtils().erasure(clientHttpRequestInterceptorType);
List<DeclaredType> interceptors = annotationHelper.extractAnnotationClassArrayParameter(element, annotationHelper.getTarget(), "interceptors");
if(interceptors == null) {
if (interceptors == null) {
return;
}
for (DeclaredType interceptorType : interceptors) {
Expand Down
21 changes: 7 additions & 14 deletions ...ions/androidannotations/src/main/java/org/androidannotations/processing/AppProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,17 @@
*/
package org.androidannotations.processing;

import static org.androidannotations.helper.CanonicalNameConstants.APPLICATION;
import static com.sun.codemodel.JExpr.cast;
import static com.sun.codemodel.JExpr.ref;

import java.lang.annotation.Annotation;

import javax.lang.model.element.Element;
import javax.lang.model.type.TypeMirror;

import org.androidannotations.annotations.App;
import org.androidannotations.helper.ModelConstants;

import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JInvocation;

public class AppProcessor implements DecoratingElementProcessor {

Expand All @@ -38,18 +37,12 @@ public Class<? extends Annotation> getTarget() {
@Override
public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {

String fieldName = element.getSimpleName().toString();

TypeMirror elementType = element.asType();
String applicationQualifiedName = element.asType().toString();
JClass applicationClass = holder.refClass(applicationQualifiedName + ModelConstants.GENERATION_SUFFIX);

JInvocation getApplication = holder.initActivityRef.invoke("getApplication");
String fieldName = element.getSimpleName().toString();

String applicationTypeQualifiedName = elementType.toString();
if (APPLICATION.equals(applicationTypeQualifiedName)) {
holder.initIfActivityBody.assign(ref(fieldName), getApplication);
} else {
holder.initIfActivityBody.assign(ref(fieldName), cast(holder.refClass(applicationTypeQualifiedName), getApplication));
}
holder.init.body().assign(ref(fieldName), applicationClass.staticInvoke(EApplicationProcessor.GET_APPLICATION_INSTANCE));

}

Expand Down
24 changes: 22 additions & 2 deletions ...oidannotations/src/main/java/org/androidannotations/processing/EApplicationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static com.sun.codemodel.JMod.FINAL;
import static com.sun.codemodel.JMod.PRIVATE;
import static com.sun.codemodel.JMod.PUBLIC;
import static com.sun.codemodel.JMod.STATIC;

import java.lang.annotation.Annotation;

Expand All @@ -27,16 +28,22 @@

import org.androidannotations.annotations.EApplication;
import org.androidannotations.helper.ModelConstants;

import com.sun.codemodel.ClassType;
import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JDefinedClass;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JFieldVar;
import com.sun.codemodel.JMethod;
import com.sun.codemodel.JMod;
import com.sun.codemodel.JVar;

public class EApplicationProcessor implements GeneratingElementProcessor {

public static final String GET_APPLICATION_INSTANCE = "getInstance";

@Override
public Class<? extends Annotation> getTarget() {
return EApplication.class;
Expand All @@ -60,21 +67,34 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder eBeansHo

holder.contextRef = _this();

JFieldVar staticInstanceField = holder.generatedClass.field(PRIVATE | STATIC, annotatedComponent, "INSTANCE_");
{
// Static singleton getter and setter
JMethod getInstance = holder.generatedClass.method(PUBLIC | JMod.STATIC, annotatedComponent, GET_APPLICATION_INSTANCE);
getInstance.body()._return(staticInstanceField);

JMethod setInstance = holder.generatedClass.method(PUBLIC | JMod.STATIC, codeModel.VOID, "setForTesting");
setInstance.javadoc().append("Visible for testing purposes");
JVar applicationParam = setInstance.param(annotatedComponent, "application");
setInstance.body().assign(staticInstanceField, applicationParam);
}

holder.init = holder.generatedClass.method(PRIVATE, codeModel.VOID, "init_");
{
// onCreate
JMethod onCreate = holder.generatedClass.method(PUBLIC, codeModel.VOID, "onCreate");
onCreate.annotate(Override.class);
JBlock onCreateBody = onCreate.body();
onCreateBody.assign(staticInstanceField, _this());
onCreateBody.invoke(holder.init);
onCreateBody.invoke(JExpr._super(), onCreate);
}

{
/*
* Setting to null shouldn't be a problem as long as we don't allow
* Setting to null shouldn't be a problem as long as we do not allow
*
* @App and @Extra on this component
* @Extra on this component
*/
holder.initIfActivityBody = null;
holder.initActivityRef = null;
Expand Down
13 changes: 4 additions & 9 deletions ...ions/androidannotations/src/main/java/org/androidannotations/validation/AppValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,16 @@
import javax.lang.model.element.Element;

import org.androidannotations.annotations.App;
import org.androidannotations.helper.AndroidManifest;
import org.androidannotations.annotations.EApplication;
import org.androidannotations.helper.TargetAnnotationHelper;
import org.androidannotations.helper.ValidatorHelper;
import org.androidannotations.model.AnnotationElements;

public class AppValidator implements ElementValidator {

private ValidatorHelper validatorHelper;
private final AndroidManifest manifest;

public AppValidator(ProcessingEnvironment processingEnv, AndroidManifest manifest) {
this.manifest = manifest;
public AppValidator(ProcessingEnvironment processingEnv) {
TargetAnnotationHelper annotationHelper = new TargetAnnotationHelper(processingEnv, getTarget());
validatorHelper = new ValidatorHelper(annotationHelper);
}
Expand All @@ -44,14 +42,11 @@ public Class<? extends Annotation> getTarget() {

@Override
public boolean validate(Element element, AnnotationElements validatedElements) {

IsValid valid = new IsValid();

validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);

validatorHelper.extendsApplication(element, valid);
validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);

validatorHelper.upperclassOfRegisteredApplication(element, manifest, valid);
validatorHelper.typeHasAnnotation(EApplication.class, element, valid);

validatorHelper.isNotPrivate(element, valid);

Expand Down
18 changes: 17 additions & 1 deletion ...-5-tests/src/test/java/org/androidannotations/test15/ApplicationInjectedActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,35 @@

import static org.fest.assertions.Assertions.assertThat;

import org.androidannotations.test15.roboguice.SampleRoboApplication;
import org.androidannotations.test15.roboguice.SampleRoboApplication_;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(AndroidAnnotationsTestRunner.class)
public class ApplicationInjectedActivityTest {

@Test
public void shouldHaveLayoutAfterCreate() {
public void should_have_application_after_create() {
ApplicationInjectedActivity_ activity = new ApplicationInjectedActivity_();

activity.onCreate(null);

assertThat(activity.customApplication).isNotNull();
}

@Test
public void application_can_be_replaced_for_tests() {
SampleRoboApplication testApp = new SampleRoboApplication();

SampleRoboApplication_.setForTesting(testApp);

ApplicationInjectedActivity_ activity = new ApplicationInjectedActivity_();

activity.onCreate(null);

assertThat(activity.customApplication).isSameAs(testApp);
}


}
X Tutup