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

Commit 068dd25

Browse files
yDelouisyDelouis
committed
Remove codemodel method from GeneratedClassHolder
1 parent da65f78 commit 068dd25

21 files changed

Lines changed: 85 additions & 90 deletions

File tree

‎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(holder.codeModel(), type.replace(".class", "")).boxify();
93+
JClass wrapperClass = type.startsWith("java") ? holder.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/helper/ActivityIntentBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ private JFieldVar addFragmentConstructor(JClass fragmentClass, String fieldName)
114114
}
115115

116116
private void overrideStartForResultMethod() {
117-
JMethod method = holder.getIntentBuilderClass().method(PUBLIC, holder.codeModel().VOID, "startForResult");
117+
JMethod method = holder.getIntentBuilderClass().method(PUBLIC, environment.getCodeModel().VOID, "startForResult");
118118
method.annotate(Override.class);
119-
JVar requestCode = method.param(holder.codeModel().INT, "requestCode");
119+
JVar requestCode = method.param(environment.getCodeModel().INT, "requestCode");
120120
JBlock body = method.body();
121121

122122
JConditional condition = null;

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public BaseGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeE
5858

5959
protected void setGeneratedClass() throws Exception {
6060
String annotatedComponentQualifiedName = annotatedElement.getQualifiedName().toString();
61-
annotatedClass = codeModel().directClass(annotatedElement.asType().toString());
61+
annotatedClass = getCodeModel().directClass(annotatedElement.asType().toString());
6262

6363
if (annotatedElement.getNestingKind().isNested()) {
6464
Element enclosingElement = annotatedElement.getEnclosingElement();
@@ -67,7 +67,7 @@ protected void setGeneratedClass() throws Exception {
6767
generatedClass = enclosingHolder.getGeneratedClass()._class(PUBLIC | FINAL | STATIC, generatedBeanSimpleName, ClassType.CLASS);
6868
} else {
6969
String generatedClassQualifiedName = annotatedComponentQualifiedName + classSuffix();
70-
generatedClass = codeModel()._class(PUBLIC | FINAL, generatedClassQualifiedName, ClassType.CLASS);
70+
generatedClass = getCodeModel()._class(PUBLIC | FINAL, generatedClassQualifiedName, ClassType.CLASS);
7171
}
7272
for (TypeParameterElement typeParam : annotatedElement.getTypeParameters()) {
7373
JClass bound = codeModelHelper.typeBoundsToJClass(typeParam.getBounds());
@@ -82,7 +82,7 @@ public JClass getAnnotatedClass() {
8282
}
8383

8484
protected void setExtends() {
85-
JClass annotatedComponent = codeModel().directClass(annotatedElement.asType().toString());
85+
JClass annotatedComponent = getCodeModel().directClass(annotatedElement.asType().toString());
8686
generatedClass._extends(annotatedComponent);
8787
}
8888

@@ -105,12 +105,11 @@ public ProcessHolder processHolder() {
105105
}
106106

107107
protected ProcessHolder.Classes getClasses() {
108-
return processHolder().classes();
108+
return environment.getClasses();
109109
}
110110

111-
@Override
112-
public JCodeModel codeModel() {
113-
return processHolder().codeModel();
111+
protected JCodeModel getCodeModel() {
112+
return environment().getCodeModel();
114113
}
115114

116115
@Override
@@ -136,7 +135,7 @@ public AndroidAnnotationsEnvironment environment() {
136135
public JClass narrow(JClass toNarrow) {
137136
List<JClass> classes = new ArrayList<>();
138137
for (JTypeVar type : generatedClass.typeParams()) {
139-
classes.add(codeModel().directClass(type.name()));
138+
classes.add(getCodeModel().directClass(type.name()));
140139
}
141140
if (classes.isEmpty()) {
142141
return toNarrow;

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ protected void setContextRef() {
119119

120120
@Override
121121
protected void setInit() {
122-
init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
122+
init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
123123
JClass bundleClass = getClasses().BUNDLE;
124124
initSavedInstanceParam = init.param(bundleClass, "savedInstanceState");
125125
getOnCreate();
@@ -140,7 +140,7 @@ public JMethod getSetIntent() {
140140
}
141141

142142
private void setOnCreate() {
143-
onCreate = generatedClass.method(PUBLIC, codeModel().VOID, "onCreate");
143+
onCreate = generatedClass.method(PUBLIC, getCodeModel().VOID, "onCreate");
144144
onCreate.annotate(Override.class);
145145
JClass bundleClass = getClasses().BUNDLE;
146146
JVar onCreateSavedInstanceState = onCreate.param(bundleClass, "savedInstanceState");
@@ -154,7 +154,7 @@ private void setOnCreate() {
154154
// CHECKSTYLE:OFF
155155

156156
private void setOnStart() {
157-
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onStart");
157+
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onStart");
158158
method.annotate(Override.class);
159159
JBlock body = method.body();
160160
onStartBeforeSuperBlock = body.block();
@@ -170,7 +170,7 @@ public JBlock getOnRestartAfterSuperBlock() {
170170
}
171171

172172
private void setOnRestart() {
173-
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onRestart");
173+
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onRestart");
174174
method.annotate(Override.class);
175175
JBlock body = method.body();
176176
onRestartBeforeSuperBlock = body.block();
@@ -179,7 +179,7 @@ private void setOnRestart() {
179179
}
180180

181181
private void setOnResume() {
182-
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onResume");
182+
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onResume");
183183
method.annotate(Override.class);
184184
JBlock body = method.body();
185185
onResumeBeforeSuperBlock = body.block();
@@ -188,7 +188,7 @@ private void setOnResume() {
188188
}
189189

190190
private void setOnPause() {
191-
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onPause");
191+
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onPause");
192192
method.annotate(Override.class);
193193
JBlock body = method.body();
194194
onPauseBeforeSuperBlock = body.block();
@@ -197,7 +197,7 @@ private void setOnPause() {
197197
}
198198

199199
private void setOnNewIntent() {
200-
onNewIntentMethod = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onNewIntent");
200+
onNewIntentMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onNewIntent");
201201
onNewIntentMethod.annotate(Override.class);
202202
JVar intent = onNewIntentMethod.param(getClasses().INTENT, "intent");
203203
JBlock body = onNewIntentMethod.body();
@@ -207,7 +207,7 @@ private void setOnNewIntent() {
207207
}
208208

209209
private void setSetIntent() {
210-
setIntent = generatedClass.method(PUBLIC, codeModel().VOID, "setIntent");
210+
setIntent = generatedClass.method(PUBLIC, getCodeModel().VOID, "setIntent");
211211
setIntent.annotate(Override.class);
212212
JVar methodParam = setIntent.param(getClasses().INTENT, "newIntent");
213213
JBlock setIntentBody = setIntent.body();
@@ -222,7 +222,7 @@ public JMethod getOnStop() {
222222
}
223223

224224
private void setOnStop() {
225-
onStopMethod = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onStop");
225+
onStopMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onStop");
226226
onStopMethod.annotate(Override.class);
227227
JBlock body = onStopMethod.body();
228228
onStopBeforeSuperBlock = body.block();
@@ -237,7 +237,7 @@ public JMethod getOnDestroy() {
237237
}
238238

239239
private void setOnDestroy() {
240-
onDestroyMethod = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onDestroy");
240+
onDestroyMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onDestroy");
241241
onDestroyMethod.annotate(Override.class);
242242
JBlock body = onDestroyMethod.body();
243243
onDestroyBeforeSuperBlock = body.block();
@@ -267,7 +267,7 @@ public JVar getOnConfigurationChangedNewConfigParam() {
267267
}
268268

269269
private void setOnConfigurationChanged() {
270-
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onConfigurationChanged");
270+
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onConfigurationChanged");
271271
method.annotate(Override.class);
272272
JClass configurationClass = getClasses().CONFIGURATION;
273273
onConfigurationChangedNewConfigParam = method.param(configurationClass, "newConfig");
@@ -292,15 +292,15 @@ public JBlock getOnContentChangedAfterSuperBlock() {
292292
}
293293

294294
private void setOnContentChanged() {
295-
onContentChanged = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onContentChanged");
295+
onContentChanged = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onContentChanged");
296296
onContentChanged.annotate(Override.class);
297297
JBlock body = onContentChanged.body();
298298
body.invoke(_super(), onContentChanged);
299299
onContentChangedAfterSuperBlock = body.block();
300300
}
301301

302302
private void setOnCreateOptionsMenu() {
303-
JMethod method = generatedClass.method(PUBLIC, codeModel().BOOLEAN, "onCreateOptionsMenu");
303+
JMethod method = generatedClass.method(PUBLIC, getCodeModel().BOOLEAN, "onCreateOptionsMenu");
304304
method.annotate(Override.class);
305305
JBlock methodBody = method.body();
306306
onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
@@ -310,11 +310,11 @@ private void setOnCreateOptionsMenu() {
310310
}
311311

312312
private void setOnOptionsItemSelected() {
313-
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onOptionsItemSelected");
313+
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onOptionsItemSelected");
314314
method.annotate(Override.class);
315315
JBlock methodBody = method.body();
316316
onOptionsItemSelectedItem = method.param(getClasses().MENU_ITEM, "item");
317-
onOptionsItemSelectedItemId = methodBody.decl(codeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
317+
onOptionsItemSelectedItemId = methodBody.decl(getCodeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
318318
onOptionsItemSelectedMiddleBlock = methodBody.block();
319319

320320
methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
@@ -323,7 +323,7 @@ private void setOnOptionsItemSelected() {
323323
@Override
324324
protected void setFindNativeFragmentById() {
325325
JMethod method = generatedClass.method(PRIVATE, getClasses().FRAGMENT, "findNativeFragmentById");
326-
JVar idParam = method.param(codeModel().INT, "id");
326+
JVar idParam = method.param(getCodeModel().INT, "id");
327327
JBlock body = method.body();
328328
body._return(invoke("getFragmentManager").invoke("findFragmentById").arg(idParam));
329329
findNativeFragmentById = method;
@@ -332,7 +332,7 @@ protected void setFindNativeFragmentById() {
332332
@Override
333333
protected void setFindSupportFragmentById() {
334334
JMethod method = generatedClass.method(PRIVATE, getClasses().SUPPORT_V4_FRAGMENT, "findSupportFragmentById");
335-
JVar idParam = method.param(codeModel().INT, "id");
335+
JVar idParam = method.param(getCodeModel().INT, "id");
336336
JBlock body = method.body();
337337
body._return(invoke("getSupportFragmentManager").invoke("findFragmentById").arg(idParam));
338338
findSupportFragmentById = method;
@@ -368,13 +368,13 @@ private void setSetContentView() {
368368

369369
JClass layoutParamsClass = getClasses().VIEW_GROUP_LAYOUT_PARAMS;
370370

371-
setContentViewLayout = setContentViewMethod(new JType[] { codeModel().INT }, new String[] { "layoutResID" });
371+
setContentViewLayout = setContentViewMethod(new JType[] { getCodeModel().INT }, new String[] { "layoutResID" });
372372
setContentViewMethod(new JType[] { getClasses().VIEW, layoutParamsClass }, new String[] { "view", "params" });
373373
setContentViewMethod(new JType[] { getClasses().VIEW }, new String[] { "view" });
374374
}
375375

376376
private JMethod setContentViewMethod(JType[] paramTypes, String[] paramNames) {
377-
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "setContentView");
377+
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "setContentView");
378378
method.annotate(Override.class);
379379

380380
List<JVar> params = new ArrayList<>();
@@ -437,7 +437,7 @@ public JVar getInjectExtras() {
437437
}
438438

439439
private void setInjectExtras() {
440-
injectExtrasMethod = generatedClass.method(PRIVATE, codeModel().VOID, "injectExtras" + generationSuffix());
440+
injectExtrasMethod = generatedClass.method(PRIVATE, getCodeModel().VOID, "injectExtras" + generationSuffix());
441441
JBlock injectExtrasBody = injectExtrasMethod.body();
442442
injectExtras = injectExtrasBody.decl(getClasses().BUNDLE, "extras_", invoke("getIntent").invoke("getExtras"));
443443
injectExtrasBlock = injectExtrasBody._if(injectExtras.ne(_null()))._then();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ private void createSingleton() {
5353
JMethod getInstance = generatedClass.method(PUBLIC | STATIC, annotatedComponent, GET_APPLICATION_INSTANCE);
5454
getInstance.body()._return(staticInstanceField);
5555

56-
JMethod setInstance = generatedClass.method(PUBLIC | STATIC, codeModel().VOID, "setForTesting");
56+
JMethod setInstance = generatedClass.method(PUBLIC | STATIC, getCodeModel().VOID, "setForTesting");
5757
setInstance.javadoc().append("Visible for testing purposes");
5858
JVar applicationParam = setInstance.param(annotatedComponent, "application");
5959
setInstance.body().assign(staticInstanceField, applicationParam);
6060
}
6161

6262
private void createOnCreate() {
63-
JMethod onCreate = generatedClass.method(PUBLIC, codeModel().VOID, "onCreate");
63+
JMethod onCreate = generatedClass.method(PUBLIC, getCodeModel().VOID, "onCreate");
6464
onCreate.annotate(Override.class);
6565
JBlock onCreateBody = onCreate.body();
6666
onCreateBody.assign(staticInstanceField, _this());
@@ -75,6 +75,6 @@ protected void setContextRef() {
7575

7676
@Override
7777
protected void setInit() {
78-
init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
78+
init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
7979
}
8080
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected void setContextRef() {
7474

7575
@Override
7676
protected void setInit() {
77-
init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
77+
init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
7878
}
7979

8080
public void invokeInitInConstructor() {
@@ -116,7 +116,7 @@ public void createFactoryMethod(boolean hasSingletonScope) {
116116
}
117117

118118
public void createRebindMethod() {
119-
JMethod rebindMethod = generatedClass.method(PUBLIC, codeModel().VOID, "rebind");
119+
JMethod rebindMethod = generatedClass.method(PUBLIC, getCodeModel().VOID, "rebind");
120120
JVar contextParam = rebindMethod.param(getClasses().CONTEXT, "context");
121121
JBlock body = rebindMethod.body();
122122
body.assign(getContextField(), contextParam);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public JVar getOnViewChangedHasViewsParam() {
8989

9090
protected void setOnViewChanged() {
9191
getGeneratedClass()._implements(OnViewChangedListener.class);
92-
onViewChanged = getGeneratedClass().method(PUBLIC, codeModel().VOID, "onViewChanged");
92+
onViewChanged = getGeneratedClass().method(PUBLIC, getCodeModel().VOID, "onViewChanged");
9393
onViewChanged.annotate(Override.class);
9494
onViewChangedBody = onViewChanged.body();
9595
onViewChangedBodyBeforeFindViews = onViewChangedBody.block();
@@ -165,7 +165,7 @@ public JMethod getFindNativeFragmentById() {
165165

166166
protected void setFindNativeFragmentById() {
167167
findNativeFragmentById = getGeneratedClass().method(PRIVATE, getClasses().FRAGMENT, "findNativeFragmentById");
168-
JVar idParam = findNativeFragmentById.param(codeModel().INT, "id");
168+
JVar idParam = findNativeFragmentById.param(getCodeModel().INT, "id");
169169

170170
JBlock body = findNativeFragmentById.body();
171171

@@ -185,7 +185,7 @@ public JMethod getFindSupportFragmentById() {
185185

186186
protected void setFindSupportFragmentById() {
187187
findSupportFragmentById = getGeneratedClass().method(PRIVATE, getClasses().SUPPORT_V4_FRAGMENT, "findSupportFragmentById");
188-
JVar idParam = findSupportFragmentById.param(codeModel().INT, "id");
188+
JVar idParam = findSupportFragmentById.param(getCodeModel().INT, "id");
189189

190190
JBlock body = findSupportFragmentById.body();
191191

@@ -247,7 +247,7 @@ public TextWatcherHolder getTextWatcherHolder(JFieldRef idRef, TypeMirror viewPa
247247
}
248248

249249
private TextWatcherHolder createTextWatcherHolder(JFieldRef idRef, TypeMirror viewParameterType) {
250-
JDefinedClass onTextChangeListenerClass = codeModel().anonymousClass(getClasses().TEXT_WATCHER);
250+
JDefinedClass onTextChangeListenerClass = getCodeModel().anonymousClass(getClasses().TEXT_WATCHER);
251251
JClass viewClass = getClasses().TEXT_VIEW;
252252
if (viewParameterType != null) {
253253
viewClass = refClass(viewParameterType.toString());
@@ -272,7 +272,7 @@ public OnSeekBarChangeListenerHolder getOnSeekBarChangeListenerHolder(JFieldRef
272272
}
273273

274274
private OnSeekBarChangeListenerHolder createOnSeekBarChangeListenerHolder(JFieldRef idRef) {
275-
JDefinedClass onSeekbarChangeListenerClass = codeModel().anonymousClass(getClasses().ON_SEEKBAR_CHANGE_LISTENER);
275+
JDefinedClass onSeekbarChangeListenerClass = getCodeModel().anonymousClass(getClasses().ON_SEEKBAR_CHANGE_LISTENER);
276276
JClass viewClass = getClasses().SEEKBAR;
277277

278278
JBlock onViewChangedBody = getOnViewChangedBody().block();

0 commit comments

Comments
 (0)