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

Commit bcc4b5b

Browse files
yDelouisyDelouis
committed
Merge pull request #1566 from WonderCsabo/update_jcodemodel
Upgrade to JCodeModel 2.7.11
2 parents 88a557c + 074d41e commit bcc4b5b

17 files changed

Lines changed: 81 additions & 72 deletions

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,10 +586,6 @@ public void addSuppressWarnings(IJAnnotatable generatedElement, String annotatio
586586
generatedElement.annotate(SuppressWarnings.class).param("value", annotationValue);
587587
}
588588

589-
public JBlock blockNoBraces(JBlock block) {
590-
return block.block().bracesRequired(false).indentRequired(false);
591-
}
592-
593589
public void addTrimmedDocComment(JMethod method, String docComment) {
594590
if (docComment != null) {
595591
method.javadoc().append(docComment.replaceAll("\r", "").trim());

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ private void setOnStart() {
157157
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onStart");
158158
method.annotate(Override.class);
159159
JBlock body = method.body();
160-
onStartBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
160+
onStartBeforeSuperBlock = body.blockSimple();
161161
body.invoke(_super(), method);
162-
onStartAfterSuperBlock = codeModelHelper.blockNoBraces(body);
162+
onStartAfterSuperBlock = body.blockSimple();
163163
}
164164

165165
public JBlock getOnRestartAfterSuperBlock() {
@@ -173,27 +173,27 @@ private void setOnRestart() {
173173
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onRestart");
174174
method.annotate(Override.class);
175175
JBlock body = method.body();
176-
onRestartBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
176+
onRestartBeforeSuperBlock = body.blockSimple();
177177
body.invoke(_super(), method);
178-
onRestartAfterSuperBlock = codeModelHelper.blockNoBraces(body);
178+
onRestartAfterSuperBlock = body.blockSimple();
179179
}
180180

181181
private void setOnResume() {
182182
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onResume");
183183
method.annotate(Override.class);
184184
JBlock body = method.body();
185-
onResumeBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
185+
onResumeBeforeSuperBlock = body.blockSimple();
186186
body.invoke(_super(), method);
187-
onResumeAfterSuperBlock = codeModelHelper.blockNoBraces(body);
187+
onResumeAfterSuperBlock = body.blockSimple();
188188
}
189189

190190
private void setOnPause() {
191191
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onPause");
192192
method.annotate(Override.class);
193193
JBlock body = method.body();
194-
onPauseBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
194+
onPauseBeforeSuperBlock = body.blockSimple();
195195
body.invoke(_super(), method);
196-
onPauseAfterSuperBlock = codeModelHelper.blockNoBraces(body);
196+
onPauseAfterSuperBlock = body.blockSimple();
197197
}
198198

199199
private void setOnNewIntent() {
@@ -203,7 +203,7 @@ private void setOnNewIntent() {
203203
JBlock body = onNewIntentMethod.body();
204204
body.invoke(_super(), onNewIntentMethod).arg(intent);
205205
body.invoke(getSetIntent()).arg(intent);
206-
onNewIntentAfterSuperBlock = codeModelHelper.blockNoBraces(body);
206+
onNewIntentAfterSuperBlock = body.blockSimple();
207207
}
208208

209209
private void setSetIntent() {
@@ -225,7 +225,7 @@ private void setOnStop() {
225225
onStopMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onStop");
226226
onStopMethod.annotate(Override.class);
227227
JBlock body = onStopMethod.body();
228-
onStopBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
228+
onStopBeforeSuperBlock = body.blockSimple();
229229
body.invoke(_super(), onStopMethod);
230230
}
231231

@@ -240,9 +240,9 @@ private void setOnDestroy() {
240240
onDestroyMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onDestroy");
241241
onDestroyMethod.annotate(Override.class);
242242
JBlock body = onDestroyMethod.body();
243-
onDestroyBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
243+
onDestroyBeforeSuperBlock = body.blockSimple();
244244
body.invoke(_super(), onDestroyMethod);
245-
onDestroyAfterSuperBlock = codeModelHelper.blockNoBraces(body);
245+
onDestroyAfterSuperBlock = body.blockSimple();
246246
}
247247

248248
public JBlock getOnConfigurationChangedBeforeSuperBlock() {
@@ -272,9 +272,9 @@ private void setOnConfigurationChanged() {
272272
AbstractJClass configurationClass = getClasses().CONFIGURATION;
273273
onConfigurationChangedNewConfigParam = method.param(configurationClass, "newConfig");
274274
JBlock body = method.body();
275-
onConfigurationChangedBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
275+
onConfigurationChangedBeforeSuperBlock = body.blockSimple();
276276
body.invoke(_super(), method).arg(onConfigurationChangedNewConfigParam);
277-
onConfigurationChangedAfterSuperBlock = codeModelHelper.blockNoBraces(body);
277+
onConfigurationChangedAfterSuperBlock = body.blockSimple();
278278
}
279279

280280
public JMethod getOnContentChanged() {
@@ -296,7 +296,7 @@ private void setOnContentChanged() {
296296
onContentChanged.annotate(Override.class);
297297
JBlock body = onContentChanged.body();
298298
body.invoke(_super(), onContentChanged);
299-
onContentChangedAfterSuperBlock = codeModelHelper.blockNoBraces(body);
299+
onContentChangedAfterSuperBlock = body.blockSimple();
300300
}
301301

302302
private void setOnCreateOptionsMenu() {
@@ -305,7 +305,7 @@ private void setOnCreateOptionsMenu() {
305305
JBlock methodBody = method.body();
306306
onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
307307
onCreateOptionsMenuMenuInflaterVar = methodBody.decl(getClasses().MENU_INFLATER, "menuInflater", invoke("getMenuInflater"));
308-
onCreateOptionsMenuMethodBody = codeModelHelper.blockNoBraces(methodBody);
308+
onCreateOptionsMenuMethodBody = methodBody.blockSimple();
309309
methodBody._return(_super().invoke(method).arg(onCreateOptionsMenuMenuParam));
310310
}
311311

@@ -315,7 +315,7 @@ private void setOnOptionsItemSelected() {
315315
JBlock methodBody = method.body();
316316
onOptionsItemSelectedItem = method.param(getClasses().MENU_ITEM, "item");
317317
onOptionsItemSelectedItemId = methodBody.decl(getCodeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
318-
onOptionsItemSelectedMiddleBlock = codeModelHelper.blockNoBraces(methodBody);
318+
onOptionsItemSelectedMiddleBlock = methodBody.blockSimple();
319319

320320
methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
321321
}
@@ -621,7 +621,7 @@ private void setOnRetainNonConfigurationInstance() throws JClassAlreadyExistsExc
621621
onRetainNonConfigurationInstance = methodBody.decl(ncHolderClass, "nonConfigurationInstanceState_", _new(ncHolderClass));
622622
IJExpression superCall = _super().invoke(onRetainNonConfigurationInstanceMethod);
623623
methodBody.assign(onRetainNonConfigurationInstance.ref(ncHolder.getSuperNonConfigurationInstanceField()), superCall);
624-
onRetainNonConfigurationInstanceBindBlock = codeModelHelper.blockNoBraces(methodBody);
624+
onRetainNonConfigurationInstanceBindBlock = methodBody.blockSimple();
625625
methodBody._return(onRetainNonConfigurationInstance);
626626
}
627627

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected void setOnViewChanged() {
9595
onViewChanged = getGeneratedClass().method(PUBLIC, getCodeModel().VOID, "onViewChanged");
9696
onViewChanged.annotate(Override.class);
9797
onViewChangedBody = onViewChanged.body();
98-
onViewChangedBodyBeforeFindViews = codeModelHelper.blockNoBraces(onViewChangedBody);
98+
onViewChangedBodyBeforeFindViews = onViewChangedBody.blockSimple();
9999
onViewChangedHasViewsParam = onViewChanged.param(HasViews.class, "hasViews");
100100
AbstractJClass notifierClass = getJClass(OnViewChangedNotifier.class);
101101
getInitBody().staticInvoke(notifierClass, "registerOnViewChangedListener").arg(_this());
@@ -147,7 +147,7 @@ public FoundViewHolder getFoundViewHolder(JFieldRef idRef, AbstractJClass viewCl
147147

148148
protected FoundViewHolder createFoundViewAndIfNotNullBlock(JFieldRef idRef, AbstractJClass viewClass) {
149149
IJExpression findViewExpression = findViewById(idRef);
150-
JBlock block = codeModelHelper.blockNoBraces(getOnViewChangedBody());
150+
JBlock block = getOnViewChangedBody().blockSimple();
151151

152152
if (viewClass == null) {
153153
viewClass = getClasses().VIEW;
@@ -256,7 +256,7 @@ private TextWatcherHolder createTextWatcherHolder(JFieldRef idRef, TypeMirror vi
256256
viewClass = getJClass(viewParameterType.toString());
257257
}
258258

259-
JBlock onViewChangedBody = codeModelHelper.blockNoBraces(getOnViewChangedBody());
259+
JBlock onViewChangedBody = getOnViewChangedBody().blockSimple();
260260
JVar viewVariable = onViewChangedBody.decl(FINAL, viewClass, "view", cast(viewClass, findViewById(idRef)));
261261
onViewChangedBody._if(viewVariable.ne(JExpr._null()))._then() //
262262
.invoke(viewVariable, "addTextChangedListener").arg(_new(onTextChangeListenerClass));

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private void setOnCreate() {
9696
setFindViewById();
9797
onCreateBody.invoke(getInit()).arg(onCreateSavedInstanceState);
9898
onCreateBody.invoke(_super(), onCreate).arg(onCreateSavedInstanceState);
99-
onCreateAfterSuperBlock = codeModelHelper.blockNoBraces(onCreateBody);
99+
onCreateAfterSuperBlock = onCreateBody.blockSimple();
100100
viewNotifierHelper.resetPreviousNotifier(onCreateBody, previousNotifier);
101101
}
102102

@@ -163,7 +163,7 @@ private void setOnCreateOptionsMenu() {
163163
JBlock methodBody = method.body();
164164
onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
165165
onCreateOptionsMenuMenuInflaterVar = method.param(getClasses().MENU_INFLATER, "inflater");
166-
onCreateOptionsMenuMethodBody = codeModelHelper.blockNoBraces(methodBody);
166+
onCreateOptionsMenuMethodBody = methodBody.blockSimple();
167167
methodBody.invoke(_super(), method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar);
168168

169169
getInitBody().invoke("setHasOptionsMenu").arg(JExpr.TRUE);
@@ -175,7 +175,7 @@ private void setOnOptionsItemSelected() {
175175
JBlock methodBody = method.body();
176176
onOptionsItemSelectedItem = method.param(getClasses().MENU_ITEM, "item");
177177
onOptionsItemSelectedItemId = methodBody.decl(getCodeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
178-
onOptionsItemSelectedMiddleBlock = codeModelHelper.blockNoBraces(methodBody);
178+
onOptionsItemSelectedMiddleBlock = methodBody.blockSimple();
179179

180180
methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
181181
}
@@ -225,7 +225,7 @@ private void setOnCreateView() {
225225
body.assign(contentView, _super().invoke(onCreateView).arg(inflater).arg(container).arg(savedInstanceState));
226226
}
227227

228-
setContentViewBlock = codeModelHelper.blockNoBraces(body);
228+
setContentViewBlock = body.blockSimple();
229229

230230
body._return(contentView);
231231
}
@@ -236,7 +236,7 @@ private void setOnDestroyView() {
236236
JBlock body = onDestroyView.body();
237237
body.invoke(_super(), onDestroyView);
238238
body.assign(contentView, _null());
239-
onDestroyViewAfterSuperBlock = codeModelHelper.blockNoBraces(body);
239+
onDestroyViewAfterSuperBlock = body.blockSimple();
240240
}
241241

242242
private JBlock getOnDestroyViewAfterSuperBlock() {
@@ -262,7 +262,7 @@ private void setOnStart() {
262262
onStart.annotate(Override.class);
263263
JBlock onStartBody = onStart.body();
264264
onStartBody.invoke(_super(), onStart);
265-
onStartAfterSuperBlock = codeModelHelper.blockNoBraces(onStartBody);
265+
onStartAfterSuperBlock = onStartBody.blockSimple();
266266
}
267267

268268
private void setOnAttach() {
@@ -271,46 +271,46 @@ private void setOnAttach() {
271271
JVar activityParam = onAttach.param(getClasses().ACTIVITY, "activity");
272272
JBlock onAttachBody = onAttach.body();
273273
onAttachBody.invoke(_super(), onAttach).arg(activityParam);
274-
onAttachAfterSuperBlock = codeModelHelper.blockNoBraces(onAttachBody);
274+
onAttachAfterSuperBlock = onAttachBody.blockSimple();
275275
}
276276

277277
private void setOnResume() {
278278
JMethod onResume = generatedClass.method(PUBLIC, getCodeModel().VOID, "onResume");
279279
onResume.annotate(Override.class);
280280
JBlock onResumeBody = onResume.body();
281281
onResumeBody.invoke(_super(), onResume);
282-
onResumeAfterSuperBlock = codeModelHelper.blockNoBraces(onResumeBody);
282+
onResumeAfterSuperBlock = onResumeBody.blockSimple();
283283
}
284284

285285
private void setOnPause() {
286286
JMethod onPause = generatedClass.method(PUBLIC, getCodeModel().VOID, "onPause");
287287
onPause.annotate(Override.class);
288288
JBlock onPauseBody = onPause.body();
289-
onPauseBeforeSuperBlock = codeModelHelper.blockNoBraces(onPauseBody);
289+
onPauseBeforeSuperBlock = onPauseBody.blockSimple();
290290
onPauseBody.invoke(_super(), onPause);
291291
}
292292

293293
private void setOnDetach() {
294294
JMethod onDetach = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDetach");
295295
onDetach.annotate(Override.class);
296296
JBlock onDetachBody = onDetach.body();
297-
onDetachBeforeSuperBlock = codeModelHelper.blockNoBraces(onDetachBody);
297+
onDetachBeforeSuperBlock = onDetachBody.blockSimple();
298298
onDetachBody.invoke(_super(), onDetach);
299299
}
300300

301301
private void setOnStop() {
302302
JMethod onStop = generatedClass.method(PUBLIC, getCodeModel().VOID, "onStop");
303303
onStop.annotate(Override.class);
304304
JBlock onStopBody = onStop.body();
305-
onStopBeforeSuperBlock = codeModelHelper.blockNoBraces(onStopBody);
305+
onStopBeforeSuperBlock = onStopBody.blockSimple();
306306
onStopBody.invoke(_super(), onStop);
307307
}
308308

309309
private void setOnDestroy() {
310310
JMethod onDestroy = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDestroy");
311311
onDestroy.annotate(Override.class);
312312
JBlock onDestroyBody = onDestroy.body();
313-
onDestroyBeforeSuperBlock = codeModelHelper.blockNoBraces(onDestroyBody);
313+
onDestroyBeforeSuperBlock = onDestroyBody.blockSimple();
314314
onDestroyBody.invoke(_super(), onDestroy);
315315
}
316316

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private void setOnDestroy() {
7676
JMethod onDestroy = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDestroy");
7777
onDestroy.annotate(Override.class);
7878
JBlock onDestroyBody = onDestroy.body();
79-
onDestroyBeforeSuperBlock = codeModelHelper.blockNoBraces(onDestroyBody);
79+
onDestroyBeforeSuperBlock = onDestroyBody.blockSimple();
8080
onDestroyBody.invoke(JExpr._super(), onDestroy);
8181
}
8282

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected void setOnFinishInflate() {
4040
JBlock ifNotInflated = onFinishInflate.body()._if(getAlreadyInflated().not())._then();
4141
ifNotInflated.assign(getAlreadyInflated(), JExpr.TRUE);
4242

43-
setContentViewBlock = codeModelHelper.blockNoBraces(ifNotInflated);
43+
setContentViewBlock = ifNotInflated.blockSimple();
4444

4545
getInit();
4646
viewNotifierHelper.invokeViewChanged(ifNotInflated);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import javax.lang.model.element.TypeElement;
1919

2020
import org.androidannotations.AndroidAnnotationsEnvironment;
21-
import org.androidannotations.helper.APTCodeModelHelper;
2221
import org.androidannotations.internal.process.ProcessHolder.Classes;
2322

2423
import com.helger.jcodemodel.AbstractJClass;
@@ -29,11 +28,8 @@ public abstract class GeneratedClassHolderDelegate<T extends GeneratedClassHolde
2928

3029
protected T holder;
3130

32-
protected APTCodeModelHelper codeModelHelper;
33-
3431
public GeneratedClassHolderDelegate(T holder) {
3532
this.holder = holder;
36-
codeModelHelper = new APTCodeModelHelper(holder.getEnvironment());
3733
}
3834

3935
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public JBlock getCaseBlock(int requestCode) {
8181

8282
private JBlock createCaseBlock(int requestCode) {
8383
JCase onActivityResultCase = getSwitch()._case(JExpr.lit(requestCode));
84-
JBlock onActivityResultCaseBlock = codeModelHelper.blockNoBraces(onActivityResultCase.body());
84+
JBlock onActivityResultCaseBlock = onActivityResultCase.body().blockSimple();
8585
onActivityResultCase.body()._break();
8686
return onActivityResultCaseBlock;
8787
}
@@ -112,6 +112,6 @@ private void setOnActivityResult() {
112112
dataParam = method.param(getClasses().INTENT, "data");
113113
JBlock body = method.body();
114114
body.invoke(_super(), method).arg(requestCodeParam).arg(resultCodeParam).arg(dataParam);
115-
afterSuperBlock = codeModelHelper.blockNoBraces(body);
115+
afterSuperBlock = body.blockSimple();
116116
}
117117
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import javax.lang.model.util.Elements;
2626
import javax.lang.model.util.Types;
2727

28-
import org.androidannotations.helper.APTCodeModelHelper;
2928
import org.androidannotations.helper.CanonicalNameConstants;
3029

3130
import com.helger.jcodemodel.AbstractJClass;
@@ -39,16 +38,13 @@
3938

4039
public class PreferencesDelegate extends GeneratedClassHolderDelegate<EComponentWithViewSupportHolder> implements HasPreferences {
4140

42-
private APTCodeModelHelper codeModelHelper;
43-
4441
protected JBlock addPreferencesFromResourceBlock;
4542

4643
private boolean usingSupportV7Preference = false;
4744
private AbstractJClass basePreferenceClass;
4845

4946
public PreferencesDelegate(EComponentWithViewSupportHolder holder) {
5047
super(holder);
51-
codeModelHelper = new APTCodeModelHelper(holder.getEnvironment());
5248
Elements elementUtils = holder.getEnvironment().getProcessingEnvironment().getElementUtils();
5349
Types typeUtils = holder.getEnvironment().getProcessingEnvironment().getTypeUtils();
5450

@@ -133,7 +129,7 @@ public AbstractJClass getBasePreferenceClass() {
133129

134130
private FoundPreferenceHolder createFoundPreferenceAndIfNotNullBlock(JFieldRef idRef, AbstractJClass preferenceClass) {
135131
IJExpression findPreferenceExpression = findPreferenceByKey(idRef);
136-
JBlock block = codeModelHelper.blockNoBraces(getAddPreferencesFromResourceBlock());
132+
JBlock block = getAddPreferencesFromResourceBlock().blockSimple();
137133

138134
if (preferenceClass == null) {
139135
preferenceClass = basePreferenceClass;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private void setConstructor() {
161161
constructor = generatedClass.constructor(PUBLIC);
162162
constructorContextParam = constructor.param(getClasses().CONTEXT, "context");
163163
JBlock constructorBody = constructor.body();
164-
constructorSuperBlock = codeModelHelper.blockNoBraces(constructorBody);
164+
constructorSuperBlock = constructorBody.blockSimple();
165165
}
166166

167167
public JFieldVar getContextField() {

0 commit comments

Comments
 (0)