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

Commit 2273155

Browse files
yDelouisyDelouis
committed
Remove refClass from GeneratedClassHolder
1 parent 4b5ae53 commit 2273155

22 files changed

Lines changed: 74 additions & 76 deletions

File tree

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.androidannotations.logger.Logger;
4747
import org.androidannotations.logger.LoggerContext;
4848
import org.androidannotations.logger.LoggerFactory;
49-
import org.androidannotations.model.AndroidSystemServices;
5049
import org.androidannotations.model.AnnotationElements;
5150
import org.androidannotations.model.AnnotationElementsHolder;
5251
import org.androidannotations.model.ModelExtractor;
@@ -165,9 +164,7 @@ private void processThrowing(Set<? extends TypeElement> annotations, RoundEnviro
165164

166165
IRClass rClass = findRClasses(androidManifest);
167166

168-
AndroidSystemServices androidSystemServices = new AndroidSystemServices();
169-
170-
androidAnnotationsEnv.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
167+
androidAnnotationsEnv.setAndroidEnvironment(rClass, androidManifest);
171168

172169
} catch (Exception e) {
173170
return;

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class AndroidAnnotationsEnvironment {
5656
this.processingEnvironment = processingEnvironment;
5757
options = new Options(processingEnvironment);
5858
annotationHandlers = new AnnotationHandlers();
59+
androidSystemServices = new AndroidSystemServices(this);
5960
}
6061

6162
public void setPlugins(List<AndroidAnnotationsPlugin> plugins) {
@@ -66,9 +67,8 @@ public void setPlugins(List<AndroidAnnotationsPlugin> plugins) {
6667
}
6768
}
6869

69-
public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
70+
public void setAndroidEnvironment(IRClass rClass, AndroidManifest androidManifest) {
7071
this.rClass = rClass;
71-
this.androidSystemServices = androidSystemServices;
7272
this.androidManifest = androidManifest;
7373
}
7474

@@ -148,6 +148,10 @@ public JClass getJClass(String fullyQualifiedName) {
148148
return processHolder.refClass(fullyQualifiedName);
149149
}
150150

151+
public JClass getJClass(Class<?> clazz) {
152+
return processHolder.refClass(clazz);
153+
}
154+
151155
public ProcessHolder.Classes getClasses() {
152156
return processHolder.classes();
153157
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected void processParameters(HasPreferences holder, JMethod listenerMethod,
9090
} else if (type.equals(CanonicalNameConstants.INTEGER) || type.equals(int.class.getName()) || //
9191
type.equals(CanonicalNameConstants.FLOAT) || type.equals(float.class.getName()) || //
9292
type.equals(CanonicalNameConstants.LONG) || type.equals(long.class.getName())) {
93-
JClass wrapperClass = type.startsWith("java") ? holder.refClass(type) : JType.parse(getEnvironment().getCodeModel(), type.replace(".class", "")).boxify();
93+
JClass wrapperClass = type.startsWith("java") ? refClass(type) : JType.parse(getEnvironment().getCodeModel(), type.replace(".class", "")).boxify();
9494
call.arg(wrapperClass.staticInvoke("valueOf").arg(JExpr.cast(getClasses().STRING, newValueParam)));
9595
} else {
9696
JClass userParamClass = codeModelHelper.typeMirrorToJClass(variableElement.asType());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private JFieldVar createReceiverField(HasReceiverRegistration holder, String rec
124124
if (extras == null) {
125125
extras = body.decl(getClasses().BUNDLE, "extras_", JOp.cond(intentVar.invoke("getExtras").ne(_null()), intentVar.invoke("getExtras"), _new(getClasses().BUNDLE)));
126126
}
127-
methodCall.arg(extraHandler.getExtraValue(param, intentVar, extras, body, onReceiveMethod, anonymousReceiverClass, holder));
127+
methodCall.arg(extraHandler.getExtraValue(param, intentVar, extras, body, onReceiveMethod, anonymousReceiverClass));
128128
}
129129
}
130130

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void process(Element element, EBeanHolder holder) {
6262
if (CanonicalNameConstants.CONTEXT.equals(typeQualifiedName)) {
6363
body.assign(ref(fieldName), contextRef);
6464
} else {
65-
JClass extendingContextClass = holder.refClass(typeQualifiedName);
65+
JClass extendingContextClass = getEnvironment().getJClass(typeQualifiedName);
6666
JConditional cond = body._if(holder.getContextRef()._instanceof(extendingContextClass));
6767
cond._then() //
6868
.assign(ref(fieldName), cast(extendingContextClass, holder.getContextRef()));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void process(Element element, EComponentHolder holder) {
5858
TypeMirror serviceType = element.asType();
5959
String fieldTypeQualifiedName = serviceType.toString();
6060

61-
JFieldRef serviceRef = getEnvironment().getAndroidSystemServices().getServiceConstant(serviceType, holder);
61+
JFieldRef serviceRef = getEnvironment().getAndroidSystemServices().getServiceConstantRef(serviceType);
6262

6363
JBlock methodBody = holder.getInitBody();
6464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private void createAdditionalIntentMethods() {
8787

8888
@Override
8989
protected JClass getSuperClass() {
90-
JClass superClass = holder.refClass(org.androidannotations.api.builder.ActivityIntentBuilder.class);
90+
JClass superClass = environment.getJClass(org.androidannotations.api.builder.ActivityIntentBuilder.class);
9191
return superClass.narrow(builderClass);
9292
}
9393

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,8 @@ public JInvocation getSuperPutExtraInvocation(TypeMirror elementType, JVar extra
149149
protected ProcessHolder.Classes getClasses() {
150150
return environment.getClasses();
151151
}
152+
153+
protected JClass getJClass(Class<?> clazz) {
154+
return environment.getJClass(clazz);
155+
}
152156
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public ServiceIntentBuilder(HasIntentBuilder holder, AndroidManifest androidMani
2727

2828
@Override
2929
protected JClass getSuperClass() {
30-
JClass superClass = holder.refClass(org.androidannotations.api.builder.ServiceIntentBuilder.class);
30+
JClass superClass = getJClass(org.androidannotations.api.builder.ServiceIntentBuilder.class);
3131
return superClass.narrow(builderClass);
3232
}
3333
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void invokeViewChanged(JBlock block) {
4646
}
4747

4848
public JVar replacePreviousNotifier(JBlock block) {
49-
JClass notifierClass = holder.refClass(OnViewChangedNotifier.class);
49+
JClass notifierClass = holder.getEnvironment().getJClass(OnViewChangedNotifier.class);
5050
if (notifier == null) {
5151
notifier = holder.getGeneratedClass().field(PRIVATE | FINAL, notifierClass, "onViewChangedNotifier" + generationSuffix(), _new(notifierClass));
5252
holder.getGeneratedClass()._implements(HasViews.class);
@@ -55,12 +55,12 @@ public JVar replacePreviousNotifier(JBlock block) {
5555
}
5656

5757
public JVar replacePreviousNotifierWithNull(JBlock block) {
58-
JClass notifierClass = holder.refClass(OnViewChangedNotifier.class);
58+
JClass notifierClass = holder.getEnvironment().getJClass(OnViewChangedNotifier.class);
5959
return block.decl(notifierClass, "previousNotifier", notifierClass.staticInvoke("replaceNotifier").arg(_null()));
6060
}
6161

6262
public void resetPreviousNotifier(JBlock block, JVar previousNotifier) {
63-
JClass notifierClass = holder.refClass(OnViewChangedNotifier.class);
63+
JClass notifierClass = holder.getEnvironment().getJClass(OnViewChangedNotifier.class);
6464
block.staticInvoke(notifierClass, "replaceNotifier").arg(previousNotifier);
6565
}
6666

0 commit comments

Comments
 (0)