Skip to content

Commit d085072

Browse files
committed
Removed old code generation implementation, now relying only on CodeModel. Fixes issue 7
1 parent dc2b131 commit d085072

45 files changed

Lines changed: 7 additions & 2258 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,11 @@
6161
import com.googlecode.androidannotations.annotations.res.TextArrayRes;
6262
import com.googlecode.androidannotations.annotations.res.TextRes;
6363
import com.googlecode.androidannotations.generation.CodeModelGenerator;
64-
import com.googlecode.androidannotations.generation.StringModelGenerator;
6564
import com.googlecode.androidannotations.model.AndroidRes;
6665
import com.googlecode.androidannotations.model.AndroidSystemServices;
6766
import com.googlecode.androidannotations.model.AnnotationElements;
6867
import com.googlecode.androidannotations.model.AnnotationElementsHolder;
6968
import com.googlecode.androidannotations.model.EmptyAnnotationElements;
70-
import com.googlecode.androidannotations.model.MetaModel;
7169
import com.googlecode.androidannotations.model.ModelExtractor;
7270
import com.googlecode.androidannotations.processing.BackgroundProcessor;
7371
import com.googlecode.androidannotations.processing.BeforeCreateProcessor;
@@ -185,12 +183,9 @@ private void processThrowing(Set<? extends TypeElement> annotations, RoundEnviro
185183

186184
AnnotationElements validatedModel = validateAnnotations(extractedModel, rClass, androidSystemServices);
187185

188-
JCodeModel codeModel = processAnnotationsToCodeModel(validatedModel, rClass, androidSystemServices);
186+
JCodeModel codeModel = processAnnotations(validatedModel, rClass, androidSystemServices);
189187

190-
MetaModel stringModel = processAnnotationsToStringModel(validatedModel, rClass, androidSystemServices);
191-
192-
generateStringModelSources(stringModel);
193-
generateCodeModelSources(codeModel);
188+
generateSources(codeModel);
194189
}
195190

196191
private AnnotationElementsHolder extractAnnotations(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
@@ -244,14 +239,9 @@ private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices
244239
return modelValidator;
245240
}
246241

247-
private JCodeModel processAnnotationsToCodeModel(AnnotationElements validatedModel, IRClass rClass, AndroidSystemServices androidSystemServices) {
248-
ModelProcessor modelProcessor = buildModelProcessor(rClass, androidSystemServices);
249-
return modelProcessor.processToCodeModel(validatedModel);
250-
}
251-
252-
private MetaModel processAnnotationsToStringModel(AnnotationElements validatedModel, IRClass rClass, AndroidSystemServices androidSystemServices) {
242+
private JCodeModel processAnnotations(AnnotationElements validatedModel, IRClass rClass, AndroidSystemServices androidSystemServices) {
253243
ModelProcessor modelProcessor = buildModelProcessor(rClass, androidSystemServices);
254-
return modelProcessor.processToStringModel(validatedModel);
244+
return modelProcessor.process(validatedModel);
255245
}
256246

257247
private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices androidSystemServices) {
@@ -278,12 +268,7 @@ private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices
278268
return modelProcessor;
279269
}
280270

281-
private void generateStringModelSources(MetaModel model) throws IOException {
282-
StringModelGenerator modelGenerator = new StringModelGenerator(processingEnv.getFiler());
283-
modelGenerator.generate(model);
284-
}
285-
286-
private void generateCodeModelSources(JCodeModel model) throws IOException {
271+
private void generateSources(JCodeModel model) throws IOException {
287272
CodeModelGenerator modelGenerator = new CodeModelGenerator(processingEnv.getFiler());
288273
modelGenerator.generate(model);
289274
}

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/generation/AbstractInstruction.java‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/generation/ActivityGenerator.java‎

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/generation/BackgroundInstruction.java‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎AndroidAnnotations/src/main/java/com/googlecode/androidannotations/generation/BeforeCreateInstruction.java‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)