Skip to content

Commit 065dfbc

Browse files
pyricaupyricau
committed
Renamed @enhance to @EActivity. Fixes issue 35. Also updated the examples, and fixed some bugs linked startActivity calls
1 parent 03c1edf commit 065dfbc

21 files changed

Lines changed: 54 additions & 54 deletions

File tree

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/AndroidAnnotationProcessor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.googlecode.androidannotations.annotations.Background;
3333
import com.googlecode.androidannotations.annotations.BeforeCreate;
3434
import com.googlecode.androidannotations.annotations.Click;
35-
import com.googlecode.androidannotations.annotations.Enhance;
35+
import com.googlecode.androidannotations.annotations.EActivity;
3636
import com.googlecode.androidannotations.annotations.Extra;
3737
import com.googlecode.androidannotations.annotations.ItemClick;
3838
import com.googlecode.androidannotations.annotations.ItemLongClick;
@@ -73,7 +73,7 @@
7373
import com.googlecode.androidannotations.processing.BackgroundProcessor;
7474
import com.googlecode.androidannotations.processing.BeforeCreateProcessor;
7575
import com.googlecode.androidannotations.processing.ClickProcessor;
76-
import com.googlecode.androidannotations.processing.EnhanceProcessor;
76+
import com.googlecode.androidannotations.processing.EActivityProcessor;
7777
import com.googlecode.androidannotations.processing.ExtraProcessor;
7878
import com.googlecode.androidannotations.processing.ItemClickProcessor;
7979
import com.googlecode.androidannotations.processing.ItemLongClickProcessor;
@@ -96,7 +96,7 @@
9696
import com.googlecode.androidannotations.rclass.ProjectRClassFinder;
9797
import com.googlecode.androidannotations.validation.BeforeCreateValidator;
9898
import com.googlecode.androidannotations.validation.ClickValidator;
99-
import com.googlecode.androidannotations.validation.EnhanceValidator;
99+
import com.googlecode.androidannotations.validation.EActivityValidator;
100100
import com.googlecode.androidannotations.validation.ExtraValidator;
101101
import com.googlecode.androidannotations.validation.ItemClickValidator;
102102
import com.googlecode.androidannotations.validation.ItemLongClickValidator;
@@ -112,7 +112,7 @@
112112
import com.googlecode.androidannotations.validation.ViewByIdValidator;
113113
import com.sun.codemodel.JCodeModel;
114114

115-
@SupportedAnnotationClasses({ Enhance.class, //
115+
@SupportedAnnotationClasses({ EActivity.class, //
116116
BeforeCreate.class, //
117117
RoboGuice.class, //
118118
ViewById.class, //
@@ -227,7 +227,7 @@ private AnnotationElements validateAnnotations(AnnotationElementsHolder extracte
227227

228228
private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
229229
ModelValidator modelValidator = new ModelValidator();
230-
modelValidator.register(new EnhanceValidator(processingEnv, rClass, androidManifest));
230+
modelValidator.register(new EActivityValidator(processingEnv, rClass, androidManifest));
231231
modelValidator.register(new RoboGuiceValidator(processingEnv));
232232
modelValidator.register(new ViewByIdValidator(processingEnv, rClass));
233233
modelValidator.register(new ClickValidator(processingEnv, rClass));
@@ -257,7 +257,7 @@ private JCodeModel processAnnotations(AnnotationElements validatedModel, IRClass
257257

258258
private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
259259
ModelProcessor modelProcessor = new ModelProcessor();
260-
modelProcessor.register(new EnhanceProcessor(processingEnv, rClass));
260+
modelProcessor.register(new EActivityProcessor(processingEnv, rClass));
261261
modelProcessor.register(new RoboGuiceProcessor());
262262
modelProcessor.register(new ViewByIdProcessor(rClass));
263263
modelProcessor.register(new ClickProcessor(rClass));

AndroidAnnotations/src/main/java/com/googlecode/androidannotations/annotations/Enhance.java renamed to AndroidAnnotations/src/main/java/com/googlecode/androidannotations/annotations/EActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
*/
3131
@Retention(RetentionPolicy.SOURCE)
3232
@Target(ElementType.TYPE)
33-
public @interface Enhance {
33+
public @interface EActivity {
3434
int value() default Id.DEFAULT_VALUE;
3535
}

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/helper/IdValidatorHelper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import com.googlecode.androidannotations.annotations.Id;
1010
import com.googlecode.androidannotations.model.AnnotationElements;
11-
import com.googlecode.androidannotations.processing.EnhanceProcessor;
11+
import com.googlecode.androidannotations.processing.EActivityProcessor;
1212
import com.googlecode.androidannotations.rclass.IRClass.Res;
1313
import com.googlecode.androidannotations.validation.IsValid;
1414

@@ -71,7 +71,7 @@ public void uniqueId(Element element, AnnotationElements validatedElements, IsVa
7171
}
7272

7373
public void idListenerMethod(Element element, AnnotationElements validatedElements, IsValid valid) {
74-
enclosingElementHasEnhance(element, validatedElements, valid);
74+
enclosingElementHasEActivity(element, validatedElements, valid);
7575

7676
idExists(element, Res.ID, valid);
7777

@@ -86,12 +86,12 @@ public void activityRegistered(Element element, AndroidManifest androidManifest,
8686
TypeElement typeElement = (TypeElement) element;
8787

8888
String activityQualifiedName = typeElement.getQualifiedName().toString();
89-
String generatedActivityQualifiedName = activityQualifiedName + EnhanceProcessor.NEW_CLASS_SUFFIX;
89+
String generatedActivityQualifiedName = activityQualifiedName + EActivityProcessor.NEW_CLASS_SUFFIX;
9090

9191
List<String> activityQualifiedNames = androidManifest.getActivityQualifiedNames();
9292
if (!activityQualifiedNames.contains(generatedActivityQualifiedName)) {
9393
String simpleName = typeElement.getSimpleName().toString();
94-
String generatedSimpleName = simpleName + EnhanceProcessor.NEW_CLASS_SUFFIX;
94+
String generatedSimpleName = simpleName + EActivityProcessor.NEW_CLASS_SUFFIX;
9595
if (activityQualifiedNames.contains(activityQualifiedName)) {
9696
valid.invalidate();
9797
annotationHelper.printAnnotationError(element, "The AndroidManifest.xml file contains the original activity, and not the AndroidAnnotations generated activity. Please register " + generatedSimpleName + " instead of " + simpleName);

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/helper/ValidatorHelper.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import javax.lang.model.type.TypeMirror;
2727
import javax.lang.model.util.Elements;
2828

29-
import com.googlecode.androidannotations.annotations.Enhance;
29+
import com.googlecode.androidannotations.annotations.EActivity;
3030
import com.googlecode.androidannotations.model.AndroidSystemServices;
3131
import com.googlecode.androidannotations.model.AnnotationElements;
3232
import com.googlecode.androidannotations.validation.IsValid;
@@ -75,23 +75,23 @@ public void isNotPrivate(Element element, IsValid valid) {
7575
}
7676
}
7777

78-
public void enclosingElementHasEnhance(Element element, AnnotationElements validatedElements, IsValid valid) {
78+
public void enclosingElementHasEActivity(Element element, AnnotationElements validatedElements, IsValid valid) {
7979
Element enclosingElement = element.getEnclosingElement();
80-
hasEnhance(element, enclosingElement, validatedElements, valid);
80+
hasEActivity(element, enclosingElement, validatedElements, valid);
8181
}
8282

83-
public void hasEnhance(Element element, AnnotationElements validatedElements, IsValid valid) {
84-
hasEnhance(element, element, validatedElements, valid);
83+
public void hasEActivity(Element element, AnnotationElements validatedElements, IsValid valid) {
84+
hasEActivity(element, element, validatedElements, valid);
8585
}
8686

87-
public void hasEnhance(Element reportElement, Element element, AnnotationElements validatedElements, IsValid valid) {
87+
public void hasEActivity(Element reportElement, Element element, AnnotationElements validatedElements, IsValid valid) {
8888

89-
Set<? extends Element> layoutAnnotatedElements = validatedElements.getAnnotatedElements(Enhance.class);
89+
Set<? extends Element> layoutAnnotatedElements = validatedElements.getAnnotatedElements(EActivity.class);
9090

9191
if (!layoutAnnotatedElements.contains(element)) {
9292
valid.invalidate();
93-
if (element.getAnnotation(Enhance.class) == null) {
94-
annotationHelper.printAnnotationError(reportElement, "%s can only be used in a class annotated with " + TargetAnnotationHelper.annotationName(Enhance.class));
93+
if (element.getAnnotation(EActivity.class) == null) {
94+
annotationHelper.printAnnotationError(reportElement, "%s can only be used in a class annotated with " + TargetAnnotationHelper.annotationName(EActivity.class));
9595
}
9696
}
9797
}

AndroidAnnotations/src/main/java/com/googlecode/androidannotations/processing/EnhanceProcessor.java renamed to AndroidAnnotations/src/main/java/com/googlecode/androidannotations/processing/EActivityProcessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import javax.lang.model.element.Element;
2222
import javax.lang.model.element.TypeElement;
2323

24-
import com.googlecode.androidannotations.annotations.Enhance;
24+
import com.googlecode.androidannotations.annotations.EActivity;
2525
import com.googlecode.androidannotations.annotations.Id;
2626
import com.googlecode.androidannotations.helper.AnnotationHelper;
2727
import com.googlecode.androidannotations.rclass.IRClass;
@@ -36,18 +36,18 @@
3636
import com.sun.codemodel.JMod;
3737
import com.sun.codemodel.JVar;
3838

39-
public class EnhanceProcessor extends AnnotationHelper implements ElementProcessor {
39+
public class EActivityProcessor extends AnnotationHelper implements ElementProcessor {
4040

4141
private final IRClass rClass;
4242

43-
public EnhanceProcessor(ProcessingEnvironment processingEnv, IRClass rClass) {
43+
public EActivityProcessor(ProcessingEnvironment processingEnv, IRClass rClass) {
4444
super(processingEnv);
4545
this.rClass = rClass;
4646
}
4747

4848
@Override
4949
public Class<? extends Annotation> getTarget() {
50-
return Enhance.class;
50+
return EActivity.class;
5151
}
5252

5353
public static final String NEW_CLASS_SUFFIX = "_";
@@ -88,7 +88,7 @@ public void process(Element element, JCodeModel codeModel, ActivitiesHolder acti
8888

8989
onCreateBody.invoke(holder.beforeSetContentView).arg(onCreateSavedInstanceState);
9090

91-
Enhance layoutAnnotation = element.getAnnotation(Enhance.class);
91+
EActivity layoutAnnotation = element.getAnnotation(EActivity.class);
9292
int layoutIdValue = layoutAnnotation.value();
9393

9494
JFieldRef contentViewId;

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/validation/BeforeCreateValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public boolean validate(Element element, AnnotationElements validatedElements) {
4545

4646
IsValid valid = new IsValid();
4747

48-
validatorHelper.enclosingElementHasEnhance(element, validatedElements, valid);
48+
validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
4949

5050
ExecutableElement executableElement = (ExecutableElement) element;
5151

5252
validatorHelper.voidReturnType(executableElement, valid);
5353

54-
validatorHelper.enclosingElementHasEnhance(element, validatedElements, valid);
54+
validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
5555

5656
validatorHelper.isNotPrivate(element, valid);
5757

AndroidAnnotations/src/main/java/com/googlecode/androidannotations/validation/EnhanceValidator.java renamed to AndroidAnnotations/src/main/java/com/googlecode/androidannotations/validation/EActivityValidator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
import javax.lang.model.element.Element;
2222
import javax.lang.model.element.TypeElement;
2323

24-
import com.googlecode.androidannotations.annotations.Enhance;
24+
import com.googlecode.androidannotations.annotations.EActivity;
2525
import com.googlecode.androidannotations.helper.AndroidManifest;
2626
import com.googlecode.androidannotations.helper.IdAnnotationHelper;
2727
import com.googlecode.androidannotations.helper.IdValidatorHelper;
2828
import com.googlecode.androidannotations.model.AnnotationElements;
2929
import com.googlecode.androidannotations.rclass.IRClass;
3030
import com.googlecode.androidannotations.rclass.IRClass.Res;
3131

32-
public class EnhanceValidator implements ElementValidator {
32+
public class EActivityValidator implements ElementValidator {
3333

3434
private final IdValidatorHelper validatorHelper;
3535
private final AndroidManifest androidManifest;
3636

37-
public EnhanceValidator(ProcessingEnvironment processingEnv, IRClass rClass, AndroidManifest androidManifest) {
37+
public EActivityValidator(ProcessingEnvironment processingEnv, IRClass rClass, AndroidManifest androidManifest) {
3838
this.androidManifest = androidManifest;
3939
IdAnnotationHelper annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
4040
validatorHelper = new IdValidatorHelper(annotationHelper);
4141
}
4242

4343
@Override
4444
public Class<? extends Annotation> getTarget() {
45-
return Enhance.class;
45+
return EActivity.class;
4646
}
4747

4848
@Override

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/validation/ExtraValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public Class<? extends Annotation> getTarget() {
4343
public boolean validate(Element element, AnnotationElements validatedElements) {
4444
IsValid valid = new IsValid();
4545

46-
validatorHelper.enclosingElementHasEnhance(element, validatedElements, valid);
46+
validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
4747

4848
validatorHelper.isNotPrivate(element, valid);
4949

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/validation/ResValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public boolean validate(Element element, AnnotationElements validatedElements) {
4848

4949
IsValid valid = new IsValid();
5050

51-
validatorHelper.enclosingElementHasEnhance(element, validatedElements, valid);
51+
validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
5252

5353
TypeMirror fieldTypeMirror = element.asType();
5454

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/validation/RoboGuiceValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public boolean validate(Element element, AnnotationElements validatedElements) {
4444

4545
IsValid valid = new IsValid();
4646

47-
validatorHelper.hasEnhance(element, validatedElements, valid);
47+
validatorHelper.hasEActivity(element, validatedElements, valid);
4848

4949
validatorHelper.hasRoboGuiceJars(element, valid);
5050

0 commit comments

Comments
 (0)