Skip to content

Commit edc9af1

Browse files
dodgexdodgex
committed
add option to change GENERATION_SUFFIX
1 parent b4ae83a commit edc9af1

29 files changed

Lines changed: 122 additions & 74 deletions

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.androidannotations.helper.AndroidManifest;
3838
import org.androidannotations.helper.AndroidManifestFinder;
3939
import org.androidannotations.helper.ErrorHelper;
40+
import org.androidannotations.helper.ModelConstants;
4041
import org.androidannotations.helper.Option;
4142
import org.androidannotations.helper.OptionsHelper;
4243
import org.androidannotations.logger.Level;
@@ -69,6 +70,8 @@ public class AndroidAnnotationProcessor extends AbstractProcessor {
6970
public synchronized void init(ProcessingEnvironment processingEnv) {
7071
super.init(processingEnv);
7172

73+
ModelConstants.init(processingEnv);
74+
7275
// Configure Logger
7376
LoggerContext loggerContext = LoggerContext.getInstance();
7477
loggerContext.setProcessingEnv(processingEnv);

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AppHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package org.androidannotations.handler;
1717

1818
import static com.sun.codemodel.JExpr.ref;
19+
import static org.androidannotations.helper.ModelConstants.classSuffix;
1920

2021
import javax.annotation.processing.ProcessingEnvironment;
2122
import javax.lang.model.element.Element;
2223

2324
import org.androidannotations.annotations.App;
2425
import org.androidannotations.annotations.EApplication;
25-
import org.androidannotations.helper.ModelConstants;
2626
import org.androidannotations.holder.EApplicationHolder;
2727
import org.androidannotations.holder.EComponentHolder;
2828
import org.androidannotations.model.AnnotationElements;
@@ -49,7 +49,7 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
4949
public void process(Element element, EComponentHolder holder) {
5050
String fieldName = element.getSimpleName().toString();
5151
String applicationQualifiedName = element.asType().toString();
52-
JClass applicationClass = refClass(applicationQualifiedName + ModelConstants.GENERATION_SUFFIX);
52+
JClass applicationClass = refClass(applicationQualifiedName + classSuffix());
5353

5454
holder.getInitBody().assign(ref(fieldName), applicationClass.staticInvoke(EApplicationHolder.GET_APPLICATION_INSTANCE));
5555
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/NonConfigurationInstanceHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static com.sun.codemodel.JExpr._this;
1919
import static com.sun.codemodel.JExpr.cast;
2020
import static com.sun.codemodel.JExpr.ref;
21-
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
21+
import static org.androidannotations.helper.ModelConstants.classSuffix;
2222

2323
import javax.annotation.processing.ProcessingEnvironment;
2424
import javax.lang.model.element.Element;
@@ -91,7 +91,7 @@ private void rebindContextIfBean(Element element, JBlock initIfNonConfigurationN
9191
elementType = element.asType();
9292
}
9393
String typeQualifiedName = elementType.toString();
94-
JClass fieldGeneratedBeanClass = refClass(typeQualifiedName + GENERATION_SUFFIX);
94+
JClass fieldGeneratedBeanClass = refClass(typeQualifiedName + classSuffix());
9595

9696
initIfNonConfigurationNotNullBlock.invoke(cast(fieldGeneratedBeanClass, field), "rebind").arg(_this());
9797
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ReceiverHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.sun.codemodel.JMod.FINAL;
2121
import static com.sun.codemodel.JMod.PRIVATE;
2222
import static com.sun.codemodel.JMod.PUBLIC;
23+
import static org.androidannotations.helper.ModelConstants.generationSuffix;
2324

2425
import java.util.List;
2526

@@ -30,7 +31,6 @@
3031

3132
import org.androidannotations.annotations.Receiver;
3233
import org.androidannotations.helper.APTCodeModelHelper;
33-
import org.androidannotations.helper.ModelConstants;
3434
import org.androidannotations.holder.HasReceiverRegistration;
3535
import org.androidannotations.holder.ReceiverRegistrationHolder.IntentFilterData;
3636
import org.androidannotations.model.AnnotationElements;
@@ -82,7 +82,7 @@ protected void validate(Element element, AnnotationElements validatedElements, I
8282
public void process(Element element, HasReceiverRegistration holder) throws Exception {
8383

8484
String methodName = element.getSimpleName().toString();
85-
String receiverName = methodName + "Receiver" + ModelConstants.GENERATION_SUFFIX;
85+
String receiverName = methodName + "Receiver" + generationSuffix();
8686

8787
Receiver annotation = element.getAnnotation(Receiver.class);
8888
String[] actions = annotation.actions();

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RoboGuiceHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.sun.codemodel.JExpr._super;
2020
import static com.sun.codemodel.JExpr._this;
2121
import static com.sun.codemodel.JExpr.invoke;
22+
import static org.androidannotations.helper.ModelConstants.generationSuffix;
2223

2324
import java.util.ArrayList;
2425
import java.util.Collections;
@@ -96,7 +97,7 @@ private void listenerFields(Element element, EActivityHolder holder) {
9697
int i = 1;
9798
for (TypeMirror listenterTypeMirror : listenerTypeMirrors) {
9899
JClass listenerClass = codeModelHelper.typeMirrorToJClass(listenterTypeMirror, holder);
99-
JFieldVar listener = holder.getGeneratedClass().field(JMod.PRIVATE, listenerClass, "listener" + i + "_");
100+
JFieldVar listener = holder.getGeneratedClass().field(JMod.PRIVATE, listenerClass, "listener" + i + generationSuffix());
100101
codeModelHelper.addSuppressWarnings(listener, "unused");
101102
listener.annotate(classes().INJECT);
102103
i++;

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestServiceHandler.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
*/
1616
package org.androidannotations.handler.rest;
1717

18+
import static org.androidannotations.helper.ModelConstants.classSuffix;
19+
1820
import javax.annotation.processing.ProcessingEnvironment;
1921
import javax.lang.model.element.Element;
2022
import javax.lang.model.type.TypeMirror;
2123

2224
import org.androidannotations.annotations.rest.Rest;
2325
import org.androidannotations.annotations.rest.RestService;
2426
import org.androidannotations.handler.BaseAnnotationHandler;
25-
import org.androidannotations.helper.ModelConstants;
2627
import org.androidannotations.holder.EComponentHolder;
2728
import org.androidannotations.model.AnnotationElements;
2829
import org.androidannotations.process.IsValid;
@@ -53,7 +54,7 @@ public void process(Element element, EComponentHolder holder) {
5354
TypeMirror fieldTypeMirror = element.asType();
5455
String interfaceName = fieldTypeMirror.toString();
5556

56-
String generatedClassName = interfaceName + ModelConstants.GENERATION_SUFFIX;
57+
String generatedClassName = interfaceName + classSuffix();
5758

5859
JBlock methodBody = holder.getInitBody();
5960

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import static com.sun.codemodel.JExpr._new;
1919
import static com.sun.codemodel.JExpr.lit;
20-
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
20+
import static org.androidannotations.helper.ModelConstants.classSuffix;
2121

2222
import java.io.StringWriter;
2323
import java.lang.annotation.Annotation;
@@ -498,7 +498,7 @@ private ExecutableElement getMethod(List<ExecutableElement> methods, String meth
498498
public JInvocation newBeanOrEBean(GeneratedClassHolder holder, DeclaredType beanType, JVar contextVar) {
499499
if (beanType.asElement().getAnnotation(EBean.class) != null) {
500500
String typeQualifiedName = beanType.toString();
501-
JClass injectedClass = holder.refClass(typeQualifiedName + GENERATION_SUFFIX);
501+
JClass injectedClass = holder.refClass(typeQualifiedName + classSuffix());
502502
return injectedClass.staticInvoke(EBeanHolder.GET_INSTANCE_METHOD_NAME).arg(contextVar);
503503
} else {
504504
return _new(holder.refClass(beanType.toString()));

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.sun.codemodel.JMod.PRIVATE;
2121
import static com.sun.codemodel.JMod.PUBLIC;
2222
import static com.sun.codemodel.JMod.STATIC;
23+
import static org.androidannotations.helper.ModelConstants.generationSuffix;
2324

2425
import java.util.List;
2526

@@ -93,10 +94,10 @@ protected JClass getSuperClass() {
9394

9495
private void createAdditionalConstructor() {
9596
if (hasFragmentInClasspath()) {
96-
fragmentField = addFragmentConstructor(holder.classes().FRAGMENT, "fragment_");
97+
fragmentField = addFragmentConstructor(holder.classes().FRAGMENT, "fragment" + generationSuffix());
9798
}
9899
if (hasFragmentSupportInClasspath()) {
99-
fragmentSupportField = addFragmentConstructor(holder.classes().SUPPORT_V4_FRAGMENT, "fragmentSupport_");
100+
fragmentSupportField = addFragmentConstructor(holder.classes().SUPPORT_V4_FRAGMENT, "fragmentSupport" + generationSuffix());
100101
}
101102
}
102103

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package org.androidannotations.helper;
1717

18+
import static org.androidannotations.helper.ModelConstants.classSuffix;
19+
1820
import java.io.File;
1921
import java.io.FileInputStream;
2022
import java.io.IOException;
@@ -282,8 +284,8 @@ private String manifestNameToValidQualifiedName(String applicationPackage, Node
282284
private boolean classOrModelClassExists(String className) {
283285
Elements elementUtils = processingEnv.getElementUtils();
284286

285-
if (className.endsWith("_")) {
286-
className = className.substring(0, className.length() - 1);
287+
if (className.endsWith(classSuffix())) {
288+
className = className.substring(0, className.length() - classSuffix().length());
287289
}
288290
return elementUtils.getTypeElement(className) != null;
289291
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.androidannotations.helper;
1717

18-
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
1918
import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS;
19+
import static org.androidannotations.helper.ModelConstants.classSuffix;
2020

2121
import java.lang.annotation.Annotation;
2222
import java.lang.reflect.InvocationTargetException;
@@ -92,9 +92,9 @@ public String generatedClassQualifiedNameFromQualifiedName(String qualifiedName)
9292
TypeElement type = typeElementFromQualifiedName(qualifiedName);
9393
if (type.getNestingKind() == NestingKind.MEMBER) {
9494
String parentGeneratedClass = generatedClassQualifiedNameFromQualifiedName(type.getEnclosingElement().asType().toString());
95-
return parentGeneratedClass + "." + type.getSimpleName().toString() + GENERATION_SUFFIX;
95+
return parentGeneratedClass + "." + type.getSimpleName().toString() + classSuffix();
9696
} else {
97-
return qualifiedName + GENERATION_SUFFIX;
97+
return qualifiedName + classSuffix();
9898
}
9999
}
100100

0 commit comments

Comments
 (0)