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

Commit 7a7a175

Browse files
WonderCsaboWonderCsabo
authored
Merge pull request #2230 from dodgex/revert-2215-add_useful_methods_plugin_class_holder
Revert "Add useful methods to PluginClassHolder"
2 parents bcd4eba + d740878 commit 7a7a175

13 files changed

Lines changed: 232 additions & 279 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import org.androidannotations.handler.AnnotationHandler;
2727
import org.androidannotations.handler.GeneratingAnnotationHandler;
2828
import org.androidannotations.helper.AndroidManifest;
29-
import org.androidannotations.helper.ClassesHolder;
3029
import org.androidannotations.holder.GeneratedClassHolder;
3130
import org.androidannotations.internal.model.AnnotationElements;
31+
import org.androidannotations.internal.process.ProcessHolder;
3232
import org.androidannotations.plugin.AndroidAnnotationsPlugin;
3333
import org.androidannotations.rclass.IRClass;
3434

@@ -76,7 +76,7 @@ public interface AndroidAnnotationsEnvironment {
7676

7777
GeneratedClassHolder getGeneratedClassHolder(Element element);
7878

79-
ClassesHolder.Classes getClasses();
79+
ProcessHolder.Classes getClasses();
8080

8181
List<Class<? extends Annotation>> getGeneratingAnnotations();
8282

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
22
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
3-
* Copyright (C) 2016-2019 the AndroidAnnotations project
43
*
54
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
65
* use this file except in compliance with the License. You may obtain a copy of
@@ -27,10 +26,10 @@
2726
import org.androidannotations.AndroidAnnotationsEnvironment;
2827
import org.androidannotations.ElementValidation;
2928
import org.androidannotations.helper.APTCodeModelHelper;
30-
import org.androidannotations.helper.ClassesHolder;
3129
import org.androidannotations.helper.IdAnnotationHelper;
3230
import org.androidannotations.helper.IdValidatorHelper;
3331
import org.androidannotations.holder.GeneratedClassHolder;
32+
import org.androidannotations.internal.process.ProcessHolder;
3433

3534
import com.helger.jcodemodel.AbstractJClass;
3635
import com.helger.jcodemodel.JCodeModel;
@@ -81,7 +80,7 @@ protected ProcessingEnvironment getProcessingEnvironment() {
8180
return environment.getProcessingEnvironment();
8281
}
8382

84-
protected ClassesHolder.Classes getClasses() {
83+
protected ProcessHolder.Classes getClasses() {
8584
return environment.getClasses();
8685
}
8786

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ClassesHolder.java‎

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

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
22
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
3-
* Copyright (C) 2016-2019 the AndroidAnnotations project
43
*
54
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
65
* use this file except in compliance with the License. You may obtain a copy of
@@ -33,7 +32,7 @@
3332
import org.androidannotations.AndroidAnnotationsEnvironment;
3433
import org.androidannotations.Option;
3534
import org.androidannotations.helper.APTCodeModelHelper;
36-
import org.androidannotations.helper.ClassesHolder;
35+
import org.androidannotations.internal.process.ProcessHolder;
3736

3837
import com.helger.jcodemodel.AbstractJClass;
3938
import com.helger.jcodemodel.EClassType;
@@ -114,7 +113,7 @@ protected ProcessingEnvironment getProcessingEnvironment() {
114113
return environment.getProcessingEnvironment();
115114
}
116115

117-
protected ClassesHolder.Classes getClasses() {
116+
protected ProcessHolder.Classes getClasses() {
118117
return environment.getClasses();
119118
}
120119

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ public JBlock getIntentFilterInitializationBlock(IntentFilterData intentFilterDa
105105

106106
@Override
107107
public JBlock getStartLifecycleAfterSuperBlock() {
108-
if (onCreateAfterSuperBlock == null) {
109-
setOnCreate();
110-
}
111108
return onCreateAfterSuperBlock;
112109
}
113110

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
22
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
3-
* Copyright (C) 2016-2019 the AndroidAnnotations project
43
*
54
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
65
* use this file except in compliance with the License. You may obtain a copy of
@@ -19,7 +18,7 @@
1918
import static com.helger.jcodemodel.JExpr._null;
2019
import static com.helger.jcodemodel.JExpr.cast;
2120

22-
import org.androidannotations.helper.ClassesHolder;
21+
import org.androidannotations.internal.process.ProcessHolder;
2322

2423
import com.helger.jcodemodel.AbstractJClass;
2524
import com.helger.jcodemodel.IJExpression;
@@ -67,7 +66,7 @@ public JBlock getIfNotNullBlock() {
6766
return ifNotNullBlock;
6867
}
6968

70-
protected ClassesHolder.Classes getClasses() {
69+
protected ProcessHolder.Classes getClasses() {
7170
return holder.getEnvironment().getClasses();
7271
}
7372
}

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
22
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
3-
* Copyright (C) 2016-2019 the AndroidAnnotations project
43
*
54
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
65
* use this file except in compliance with the License. You may obtain a copy of
@@ -19,7 +18,7 @@
1918
import javax.lang.model.element.TypeElement;
2019

2120
import org.androidannotations.AndroidAnnotationsEnvironment;
22-
import org.androidannotations.helper.ClassesHolder.Classes;
21+
import org.androidannotations.internal.process.ProcessHolder.Classes;
2322

2423
import com.helger.jcodemodel.AbstractJClass;
2524
import com.helger.jcodemodel.JCodeModel;

0 commit comments

Comments
 (0)