Skip to content

Commit 6c8505d

Browse files
WonderCsaboWonderCsabo
committed
Update JCodeModel to 3.2.1
1 parent deadb04 commit 6c8505d

52 files changed

Lines changed: 158 additions & 125 deletions

File tree

Some content is hidden

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

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import com.helger.jcodemodel.AbstractJType;
6262
import com.helger.jcodemodel.IJAnnotatable;
6363
import com.helger.jcodemodel.IJExpression;
64+
import com.helger.jcodemodel.IJFormatter;
6465
import com.helger.jcodemodel.IJGenerifiable;
6566
import com.helger.jcodemodel.IJStatement;
6667
import com.helger.jcodemodel.JAnnotationArrayMember;
@@ -69,12 +70,14 @@
6970
import com.helger.jcodemodel.JCodeModel;
7071
import com.helger.jcodemodel.JDefinedClass;
7172
import com.helger.jcodemodel.JExpr;
72-
import com.helger.jcodemodel.JFormatter;
7373
import com.helger.jcodemodel.JInvocation;
7474
import com.helger.jcodemodel.JMethod;
7575
import com.helger.jcodemodel.JMod;
7676
import com.helger.jcodemodel.JTypeVar;
7777
import com.helger.jcodemodel.JVar;
78+
import com.helger.jcodemodel.SourcePrintWriter;
79+
import com.helger.jcodemodel.writer.JCMWriter;
80+
import com.helger.jcodemodel.writer.JFormatter;
7881

7982
public class APTCodeModelHelper {
8083

@@ -425,7 +428,7 @@ public void replaceSuperCall(JMethod method, JBlock replacement) {
425428

426429
for (Object content : oldBody.getContents()) {
427430
StringWriter writer = new StringWriter();
428-
JFormatter formatter = new JFormatter(writer);
431+
IJFormatter formatter = createFormatter(writer);
429432
IJStatement statement = (IJStatement) content;
430433
statement.state(formatter);
431434
String statementString = writer.getBuffer().toString();
@@ -437,6 +440,11 @@ public void replaceSuperCall(JMethod method, JBlock replacement) {
437440
}
438441
}
439442

443+
private static IJFormatter createFormatter(StringWriter writer) {
444+
SourcePrintWriter sourcePrintWriter = new SourcePrintWriter(writer, JCMWriter.getDefaultNewLine());
445+
return new JFormatter(sourcePrintWriter, JCMWriter.DEFAULT_INDENT_STRING);
446+
}
447+
440448
public JDefinedClass createDelegatingAnonymousRunnableClass(JBlock previousBody) {
441449
JCodeModel codeModel = environment.getCodeModel();
442450

@@ -590,7 +598,7 @@ public void addSuppressWarnings(IJAnnotatable generatedElement, String annotatio
590598
if (SuppressWarnings.class.getCanonicalName().equals(annotationUse.getAnnotationClass().fullName())) {
591599
AbstractJAnnotationValue value = annotationUse.getParam("value");
592600
StringWriter code = new StringWriter();
593-
JFormatter formatter = new JFormatter(code);
601+
IJFormatter formatter = createFormatter(code);
594602
formatter.generable(value);
595603
if (!code.toString().contains(annotationValue)) {
596604
if (value instanceof JAnnotationArrayMember) {

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ private void setOnCreate() {
149149
JVar onCreateSavedInstanceState = onCreate.param(bundleClass, "savedInstanceState");
150150
JBlock onCreateBody = onCreate.body();
151151
JVar previousNotifier = viewNotifierHelper.replacePreviousNotifier(onCreateBody);
152-
onCreateBody.invoke(getInit()).arg(onCreateSavedInstanceState);
153-
onCreateBody.invoke(_super(), onCreate).arg(onCreateSavedInstanceState);
152+
onCreateBody.add(JExpr.invoke(getInit()).arg(onCreateSavedInstanceState));
153+
onCreateBody.add(_super().invoke(onCreate).arg(onCreateSavedInstanceState));
154154
viewNotifierHelper.resetPreviousNotifier(onCreateBody, previousNotifier);
155155
}
156156

@@ -204,7 +204,7 @@ private void setOnNewIntent() {
204204
onNewIntentMethod.annotate(Override.class);
205205
JVar intent = onNewIntentMethod.param(getClasses().INTENT, "intent");
206206
JBlock body = onNewIntentMethod.body();
207-
body.invoke(_super(), onNewIntentMethod).arg(intent);
207+
body.add(_super().invoke(onNewIntentMethod).arg(intent));
208208
onNewIntentAfterSuperBlock = body.blockSimple();
209209
}
210210

@@ -213,7 +213,7 @@ private void setSetIntent() {
213213
setIntent.annotate(Override.class);
214214
JVar methodParam = setIntent.param(getClasses().INTENT, "newIntent");
215215
JBlock setIntentBody = setIntent.body();
216-
setIntentBody.invoke(_super(), setIntent).arg(methodParam);
216+
setIntentBody.add(_super().invoke(setIntent).arg(methodParam));
217217
}
218218

219219
public JMethod getOnStop() {
@@ -275,7 +275,7 @@ private void setOnConfigurationChanged() {
275275
onConfigurationChangedNewConfigParam = method.param(configurationClass, "newConfig");
276276
JBlock body = method.body();
277277
onConfigurationChangedBeforeSuperBlock = body.blockSimple();
278-
body.invoke(_super(), method).arg(onConfigurationChangedNewConfigParam);
278+
body.add(_super().invoke(method).arg(onConfigurationChangedNewConfigParam));
279279
onConfigurationChangedAfterSuperBlock = body.blockSimple();
280280
}
281281

@@ -396,7 +396,8 @@ private JMethod setContentViewMethod(AbstractJType[] paramTypes, String[] paramN
396396
params.add(param);
397397
}
398398
JBlock body = method.body();
399-
JInvocation superCall = body.invoke(JExpr._super(), method);
399+
JInvocation superCall = _super().invoke(method);
400+
body.add(superCall);
400401
for (JVar arg : params) {
401402
superCall.arg(arg);
402403
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
import com.helger.jcodemodel.AbstractJClass;
3434
import com.helger.jcodemodel.JBlock;
35+
import com.helger.jcodemodel.JExpr;
3536
import com.helger.jcodemodel.JFieldVar;
3637
import com.helger.jcodemodel.JMethod;
3738
import com.helger.jcodemodel.JVar;
@@ -55,7 +56,7 @@ private void setConstructor() {
5556
List<ExecutableElement> constructors = ElementFilter.constructorsIn(annotatedElement.getEnclosedElements());
5657
ExecutableElement superConstructor = constructors.get(0);
5758
if (superConstructor.getParameters().size() == 1) {
58-
constructorBody.invoke("super").arg(constructorContextParam);
59+
constructorBody.add(JExpr.invokeSuper().arg(constructorContextParam));
5960
}
6061
constructorBody.assign(getContextField(), constructorContextParam);
6162
}

‎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
@@ -137,7 +137,7 @@ protected void setOnViewChanged() {
137137
onViewChangedBodyAfterInjectionBlock = onViewChangedBody.blockVirtual();
138138
onViewChangedHasViewsParam = onViewChanged.param(HasViews.class, "hasViews");
139139
AbstractJClass notifierClass = getJClass(OnViewChangedNotifier.class);
140-
getInitBodyInjectionBlock().staticInvoke(notifierClass, "registerOnViewChangedListener").arg(_this());
140+
getInitBodyInjectionBlock().add(notifierClass.staticInvoke("registerOnViewChangedListener").arg(_this()));
141141
}
142142

143143
public JInvocation findViewById(JFieldRef idRef) {
@@ -300,7 +300,7 @@ private TextWatcherHolder createTextWatcherHolder(JFieldRef idRef, TypeMirror vi
300300
JBlock onViewChangedBody = getOnViewChangedBodyInjectionBlock().blockSimple();
301301
JVar viewVariable = onViewChangedBody.decl(FINAL, viewClass, "view", cast(viewClass, findViewById(idRef)));
302302
onViewChangedBody._if(viewVariable.ne(JExpr._null()))._then() //
303-
.invoke(viewVariable, "addTextChangedListener").arg(_new(onTextChangeListenerClass));
303+
.add(viewVariable.invoke("addTextChangedListener").arg(_new(onTextChangeListenerClass)));
304304

305305
return new TextWatcherHolder(this, viewVariable, onTextChangeListenerClass);
306306
}
@@ -320,7 +320,7 @@ private OnSeekBarChangeListenerHolder createOnSeekBarChangeListenerHolder(JField
320320
AbstractJClass viewClass = getClasses().SEEKBAR;
321321

322322
FoundViewHolder foundViewHolder = getFoundViewHolder(idRef, viewClass);
323-
foundViewHolder.getIfNotNullBlock().invoke(foundViewHolder.getRef(), "setOnSeekBarChangeListener").arg(_new(onSeekbarChangeListenerClass));
323+
foundViewHolder.getIfNotNullBlock().add(JExpr.invoke(foundViewHolder.getRef(), "setOnSeekBarChangeListener").arg(_new(onSeekbarChangeListenerClass)));
324324

325325
return new OnSeekBarChangeListenerHolder(this, onSeekbarChangeListenerClass);
326326
}
@@ -352,9 +352,9 @@ private PageChangeHolder createPageChangeHolder(JFieldRef idRef, TypeMirror view
352352
JVar viewVariable = onViewChangedBody.decl(FINAL, viewClass, "view", cast(viewClass, findViewById(idRef)));
353353
JBlock block = onViewChangedBody._if(viewVariable.ne(JExpr._null()))._then();
354354
if (hasAddOnPageChangeListenerMethod) {
355-
block.invoke(viewVariable, "addOnPageChangeListener").arg(_new(onPageChangeListenerClass));
355+
block.add(JExpr.invoke(viewVariable, "addOnPageChangeListener").arg(_new(onPageChangeListenerClass)));
356356
} else {
357-
block.invoke(viewVariable, "setOnPageChangeListener").arg(_new(onPageChangeListenerClass));
357+
block.add(JExpr.invoke(viewVariable, "setOnPageChangeListener").arg(_new(onPageChangeListenerClass)));
358358
}
359359
return new PageChangeHolder(this, viewVariable, onPageChangeListenerClass);
360360
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ private void setOnCreate() {
104104
JBlock onCreateBody = onCreate.body();
105105

106106
JVar previousNotifier = viewNotifierHelper.replacePreviousNotifier(onCreateBody);
107-
onCreateBody.invoke(getInit()).arg(onCreateSavedInstanceState);
108-
onCreateBody.invoke(_super(), onCreate).arg(onCreateSavedInstanceState);
107+
onCreateBody.add(JExpr.invoke(getInit()).arg(onCreateSavedInstanceState));
108+
onCreateBody.add(_super().invoke(onCreate).arg(onCreateSavedInstanceState));
109109
onCreateAfterSuperBlock = onCreateBody.blockSimple();
110110
viewNotifierHelper.resetPreviousNotifier(onCreateBody, previousNotifier);
111111
}
@@ -116,7 +116,7 @@ private void setOnViewCreated() {
116116
JVar view = onViewCreated.param(getClasses().VIEW, "view");
117117
JVar savedInstanceState = onViewCreated.param(getClasses().BUNDLE, "savedInstanceState");
118118
JBlock onViewCreatedBody = onViewCreated.body();
119-
onViewCreatedBody.invoke(_super(), onViewCreated).arg(view).arg(savedInstanceState);
119+
onViewCreatedBody.add(_super().invoke(onViewCreated).arg(view).arg(savedInstanceState));
120120
viewNotifierHelper.invokeViewChanged(onViewCreatedBody);
121121
}
122122

@@ -148,7 +148,7 @@ private void setFragmentBuilderBuild() {
148148

149149
AbstractJClass result = narrow(generatedClass);
150150
JVar fragment = body.decl(result, "fragment_", _new(result));
151-
body.invoke(fragment, "setArguments").arg(fragmentArgumentsBuilderField);
151+
body.add(fragment.invoke("setArguments").arg(fragmentArgumentsBuilderField));
152152
body._return(fragment);
153153
}
154154

@@ -166,9 +166,9 @@ private void setOnCreateOptionsMenu() {
166166
onCreateOptionsMenuMenuInflaterVar = method.param(getClasses().MENU_INFLATER, "inflater");
167167
onCreateOptionsMenuMethodInflateBody = methodBody.blockSimple();
168168
onCreateOptionsMenuMethodBody = methodBody.blockSimple();
169-
methodBody.invoke(_super(), method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar);
169+
methodBody.add(_super().invoke(method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar));
170170

171-
getInitBody().invoke("setHasOptionsMenu").arg(JExpr.TRUE);
171+
getInitBody().add(JExpr.invoke("setHasOptionsMenu").arg(JExpr.TRUE));
172172
}
173173

174174
private void setOnOptionsItemSelected() {
@@ -279,7 +279,7 @@ private void setOnAttach() {
279279
onAttach.annotate(Override.class);
280280
JVar activityParam = onAttach.param(getClasses().ACTIVITY, "activity");
281281
JBlock onAttachBody = onAttach.body();
282-
onAttachBody.invoke(_super(), onAttach).arg(activityParam);
282+
onAttachBody.add(_super().invoke(onAttach).arg(activityParam));
283283
onAttachAfterSuperBlock = onAttachBody.blockSimple();
284284
}
285285

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ private void createOnReceive() {
6464
onReceiveIntent = onReceiveMethod.param(getClasses().INTENT, "intent");
6565
onReceiveMethod.annotate(Override.class);
6666
onReceiveBody = onReceiveMethod.body();
67-
onReceiveBody.invoke(getInit()).arg(onReceiveContext);
68-
onReceiveBody.invoke(JExpr._super(), onReceiveMethod).arg(onReceiveContext).arg(onReceiveIntent);
67+
onReceiveBody.add(JExpr.invoke(getInit()).arg(onReceiveContext));
68+
onReceiveBody.add(JExpr._super().invoke(onReceiveMethod).arg(onReceiveContext).arg(onReceiveIntent));
6969
}
7070

7171
private void setOnReceiveIntentAction() {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ private void createConstructorAndBuilder() {
9797
codeModelHelper.generify(staticHelper, getAnnotatedElement());
9898

9999
JBlock body = copyConstructor.body();
100-
JInvocation superCall = body.invoke("super");
100+
JInvocation superCall = JExpr.invokeSuper();
101+
body.add(superCall);
101102
AbstractJClass narrowedGeneratedClass = narrow(generatedClass);
102103

103104
JInvocation newInvocation = JExpr._new(narrowedGeneratedClass);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private void setSaveStateMethod() {
6262

6363
saveStateMethodBody = method.body();
6464

65-
saveStateMethodBody.invoke(JExpr._super(), "onSaveInstanceState").arg(saveStateBundleParam);
65+
saveStateMethodBody.add(JExpr._super().invoke("onSaveInstanceState").arg(saveStateBundleParam));
6666
}
6767

6868
@Override
@@ -92,7 +92,7 @@ public JVar getRestoreStateBundleParam() {
9292
private void setRestoreStateMethod() {
9393
restoreStateMethod = getGeneratedClass().method(PRIVATE, codeModel().VOID, "restoreSavedInstanceState" + generationSuffix());
9494
restoreStateBundleParam = restoreStateMethod.param(getClasses().BUNDLE, "savedInstanceState");
95-
holder.getInitBodyInjectionBlock().invoke(restoreStateMethod).arg(restoreStateBundleParam);
95+
holder.getInitBodyInjectionBlock().add(JExpr.invoke(restoreStateMethod).arg(restoreStateBundleParam));
9696

9797
restoreStateMethodBody = restoreStateMethod.body();
9898
restoreStateMethodBody //

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private void setOnActivityResult() {
111111
resultCodeParam = method.param(codeModel().INT, "resultCode");
112112
dataParam = method.param(getClasses().INTENT, "data");
113113
JBlock body = method.body();
114-
body.invoke(_super(), method).arg(requestCodeParam).arg(resultCodeParam).arg(dataParam);
114+
body.add(_super().invoke(method).arg(requestCodeParam).arg(resultCodeParam).arg(dataParam));
115115
afterSuperBlock = body.blockSimple();
116116
}
117117
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void setAddPreferencesFromResourceBlock() {
9292
JMethod method = getGeneratedClass().method(PUBLIC, codeModel().VOID, "addPreferencesFromResource");
9393
method.annotate(Override.class);
9494
JVar preferencesResIdParam = method.param(int.class, "preferencesResId");
95-
method.body().invoke(JExpr._super(), "addPreferencesFromResource").arg(preferencesResIdParam);
95+
method.body().add(JExpr._super().invoke("addPreferencesFromResource").arg(preferencesResIdParam));
9696
addPreferencesFromResourceInjectionBlock = method.body().blockVirtual();
9797
addPreferencesFromResourceAfterInjectionBlock = method.body().blockVirtual();
9898
}

0 commit comments

Comments
 (0)