Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
This repository was archived by the owner on Feb 26, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -569,10 +569,6 @@ public void addSuppressWarnings(IJAnnotatable generatedElement, String annotatio
generatedElement.annotate(SuppressWarnings.class).param("value", annotationValue);
}

public JBlock blockNoBraces(JBlock block) {
return block.block().bracesRequired(false).indentRequired(false);
}

public void addTrimmedDocComment(JMethod method, String docComment) {
if (docComment != null) {
method.javadoc().append(docComment.replaceAll("\r", "").trim());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ private void setOnStart() {
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onStart");
method.annotate(Override.class);
JBlock body = method.body();
onStartBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
onStartBeforeSuperBlock = body.blockSimple();
body.invoke(_super(), method);
onStartAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onStartAfterSuperBlock = body.blockSimple();
}

public JBlock getOnRestartAfterSuperBlock() {
Expand All @@ -173,27 +173,27 @@ private void setOnRestart() {
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onRestart");
method.annotate(Override.class);
JBlock body = method.body();
onRestartBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
onRestartBeforeSuperBlock = body.blockSimple();
body.invoke(_super(), method);
onRestartAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onRestartAfterSuperBlock = body.blockSimple();
}

private void setOnResume() {
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onResume");
method.annotate(Override.class);
JBlock body = method.body();
onResumeBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
onResumeBeforeSuperBlock = body.blockSimple();
body.invoke(_super(), method);
onResumeAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onResumeAfterSuperBlock = body.blockSimple();
}

private void setOnPause() {
JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onPause");
method.annotate(Override.class);
JBlock body = method.body();
onPauseBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
onPauseBeforeSuperBlock = body.blockSimple();
body.invoke(_super(), method);
onPauseAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onPauseAfterSuperBlock = body.blockSimple();
}

private void setOnNewIntent() {
Expand All @@ -203,7 +203,7 @@ private void setOnNewIntent() {
JBlock body = onNewIntentMethod.body();
body.invoke(_super(), onNewIntentMethod).arg(intent);
body.invoke(getSetIntent()).arg(intent);
onNewIntentAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onNewIntentAfterSuperBlock = body.blockSimple();
}

private void setSetIntent() {
Expand All @@ -225,7 +225,7 @@ private void setOnStop() {
onStopMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onStop");
onStopMethod.annotate(Override.class);
JBlock body = onStopMethod.body();
onStopBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
onStopBeforeSuperBlock = body.blockSimple();
body.invoke(_super(), onStopMethod);
}

Expand All @@ -240,9 +240,9 @@ private void setOnDestroy() {
onDestroyMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onDestroy");
onDestroyMethod.annotate(Override.class);
JBlock body = onDestroyMethod.body();
onDestroyBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
onDestroyBeforeSuperBlock = body.blockSimple();
body.invoke(_super(), onDestroyMethod);
onDestroyAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onDestroyAfterSuperBlock = body.blockSimple();
}

public JBlock getOnConfigurationChangedBeforeSuperBlock() {
Expand Down Expand Up @@ -272,9 +272,9 @@ private void setOnConfigurationChanged() {
AbstractJClass configurationClass = getClasses().CONFIGURATION;
onConfigurationChangedNewConfigParam = method.param(configurationClass, "newConfig");
JBlock body = method.body();
onConfigurationChangedBeforeSuperBlock = codeModelHelper.blockNoBraces(body);
onConfigurationChangedBeforeSuperBlock = body.blockSimple();
body.invoke(_super(), method).arg(onConfigurationChangedNewConfigParam);
onConfigurationChangedAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onConfigurationChangedAfterSuperBlock = body.blockSimple();
}

public JMethod getOnContentChanged() {
Expand All @@ -296,7 +296,7 @@ private void setOnContentChanged() {
onContentChanged.annotate(Override.class);
JBlock body = onContentChanged.body();
body.invoke(_super(), onContentChanged);
onContentChangedAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onContentChangedAfterSuperBlock = body.blockSimple();
}

private void setOnCreateOptionsMenu() {
Expand All @@ -305,7 +305,7 @@ private void setOnCreateOptionsMenu() {
JBlock methodBody = method.body();
onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
onCreateOptionsMenuMenuInflaterVar = methodBody.decl(getClasses().MENU_INFLATER, "menuInflater", invoke("getMenuInflater"));
onCreateOptionsMenuMethodBody = codeModelHelper.blockNoBraces(methodBody);
onCreateOptionsMenuMethodBody = methodBody.blockSimple();
methodBody._return(_super().invoke(method).arg(onCreateOptionsMenuMenuParam));
}

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

methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
}
Expand Down Expand Up @@ -621,7 +621,7 @@ private void setOnRetainNonConfigurationInstance() throws JClassAlreadyExistsExc
onRetainNonConfigurationInstance = methodBody.decl(ncHolderClass, "nonConfigurationInstanceState_", _new(ncHolderClass));
IJExpression superCall = _super().invoke(onRetainNonConfigurationInstanceMethod);
methodBody.assign(onRetainNonConfigurationInstance.ref(ncHolder.getSuperNonConfigurationInstanceField()), superCall);
onRetainNonConfigurationInstanceBindBlock = codeModelHelper.blockNoBraces(methodBody);
onRetainNonConfigurationInstanceBindBlock = methodBody.blockSimple();
methodBody._return(onRetainNonConfigurationInstance);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ protected void setOnViewChanged() {
onViewChanged = getGeneratedClass().method(PUBLIC, getCodeModel().VOID, "onViewChanged");
onViewChanged.annotate(Override.class);
onViewChangedBody = onViewChanged.body();
onViewChangedBodyBeforeFindViews = codeModelHelper.blockNoBraces(onViewChangedBody);
onViewChangedBodyBeforeFindViews = onViewChangedBody.blockSimple();
onViewChangedHasViewsParam = onViewChanged.param(HasViews.class, "hasViews");
AbstractJClass notifierClass = getJClass(OnViewChangedNotifier.class);
getInitBody().staticInvoke(notifierClass, "registerOnViewChangedListener").arg(_this());
Expand Down Expand Up @@ -147,7 +147,7 @@ public FoundViewHolder getFoundViewHolder(JFieldRef idRef, AbstractJClass viewCl

protected FoundViewHolder createFoundViewAndIfNotNullBlock(JFieldRef idRef, AbstractJClass viewClass) {
IJExpression findViewExpression = findViewById(idRef);
JBlock block = codeModelHelper.blockNoBraces(getOnViewChangedBody());
JBlock block = getOnViewChangedBody().blockSimple();

if (viewClass == null) {
viewClass = getClasses().VIEW;
Expand Down Expand Up @@ -256,7 +256,7 @@ private TextWatcherHolder createTextWatcherHolder(JFieldRef idRef, TypeMirror vi
viewClass = getJClass(viewParameterType.toString());
}

JBlock onViewChangedBody = codeModelHelper.blockNoBraces(getOnViewChangedBody());
JBlock onViewChangedBody = getOnViewChangedBody().blockSimple();
JVar viewVariable = onViewChangedBody.decl(FINAL, viewClass, "view", cast(viewClass, findViewById(idRef)));
onViewChangedBody._if(viewVariable.ne(JExpr._null()))._then() //
.invoke(viewVariable, "addTextChangedListener").arg(_new(onTextChangeListenerClass));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private void setOnCreate() {
setFindViewById();
onCreateBody.invoke(getInit()).arg(onCreateSavedInstanceState);
onCreateBody.invoke(_super(), onCreate).arg(onCreateSavedInstanceState);
onCreateAfterSuperBlock = codeModelHelper.blockNoBraces(onCreateBody);
onCreateAfterSuperBlock = onCreateBody.blockSimple();
viewNotifierHelper.resetPreviousNotifier(onCreateBody, previousNotifier);
}

Expand Down Expand Up @@ -163,7 +163,7 @@ private void setOnCreateOptionsMenu() {
JBlock methodBody = method.body();
onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
onCreateOptionsMenuMenuInflaterVar = method.param(getClasses().MENU_INFLATER, "inflater");
onCreateOptionsMenuMethodBody = codeModelHelper.blockNoBraces(methodBody);
onCreateOptionsMenuMethodBody = methodBody.blockSimple();
methodBody.invoke(_super(), method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar);

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

methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
}
Expand Down Expand Up @@ -225,7 +225,7 @@ private void setOnCreateView() {
body.assign(contentView, _super().invoke(onCreateView).arg(inflater).arg(container).arg(savedInstanceState));
}

setContentViewBlock = codeModelHelper.blockNoBraces(body);
setContentViewBlock = body.blockSimple();

body._return(contentView);
}
Expand All @@ -236,7 +236,7 @@ private void setOnDestroyView() {
JBlock body = onDestroyView.body();
body.invoke(_super(), onDestroyView);
body.assign(contentView, _null());
onDestroyViewAfterSuperBlock = codeModelHelper.blockNoBraces(body);
onDestroyViewAfterSuperBlock = body.blockSimple();
}

private JBlock getOnDestroyViewAfterSuperBlock() {
Expand All @@ -262,7 +262,7 @@ private void setOnStart() {
onStart.annotate(Override.class);
JBlock onStartBody = onStart.body();
onStartBody.invoke(_super(), onStart);
onStartAfterSuperBlock = codeModelHelper.blockNoBraces(onStartBody);
onStartAfterSuperBlock = onStartBody.blockSimple();
}

private void setOnAttach() {
Expand All @@ -271,46 +271,46 @@ private void setOnAttach() {
JVar activityParam = onAttach.param(getClasses().ACTIVITY, "activity");
JBlock onAttachBody = onAttach.body();
onAttachBody.invoke(_super(), onAttach).arg(activityParam);
onAttachAfterSuperBlock = codeModelHelper.blockNoBraces(onAttachBody);
onAttachAfterSuperBlock = onAttachBody.blockSimple();
}

private void setOnResume() {
JMethod onResume = generatedClass.method(PUBLIC, getCodeModel().VOID, "onResume");
onResume.annotate(Override.class);
JBlock onResumeBody = onResume.body();
onResumeBody.invoke(_super(), onResume);
onResumeAfterSuperBlock = codeModelHelper.blockNoBraces(onResumeBody);
onResumeAfterSuperBlock = onResumeBody.blockSimple();
}

private void setOnPause() {
JMethod onPause = generatedClass.method(PUBLIC, getCodeModel().VOID, "onPause");
onPause.annotate(Override.class);
JBlock onPauseBody = onPause.body();
onPauseBeforeSuperBlock = codeModelHelper.blockNoBraces(onPauseBody);
onPauseBeforeSuperBlock = onPauseBody.blockSimple();
onPauseBody.invoke(_super(), onPause);
}

private void setOnDetach() {
JMethod onDetach = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDetach");
onDetach.annotate(Override.class);
JBlock onDetachBody = onDetach.body();
onDetachBeforeSuperBlock = codeModelHelper.blockNoBraces(onDetachBody);
onDetachBeforeSuperBlock = onDetachBody.blockSimple();
onDetachBody.invoke(_super(), onDetach);
}

private void setOnStop() {
JMethod onStop = generatedClass.method(PUBLIC, getCodeModel().VOID, "onStop");
onStop.annotate(Override.class);
JBlock onStopBody = onStop.body();
onStopBeforeSuperBlock = codeModelHelper.blockNoBraces(onStopBody);
onStopBeforeSuperBlock = onStopBody.blockSimple();
onStopBody.invoke(_super(), onStop);
}

private void setOnDestroy() {
JMethod onDestroy = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDestroy");
onDestroy.annotate(Override.class);
JBlock onDestroyBody = onDestroy.body();
onDestroyBeforeSuperBlock = codeModelHelper.blockNoBraces(onDestroyBody);
onDestroyBeforeSuperBlock = onDestroyBody.blockSimple();
onDestroyBody.invoke(_super(), onDestroy);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private void setOnDestroy() {
JMethod onDestroy = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDestroy");
onDestroy.annotate(Override.class);
JBlock onDestroyBody = onDestroy.body();
onDestroyBeforeSuperBlock = codeModelHelper.blockNoBraces(onDestroyBody);
onDestroyBeforeSuperBlock = onDestroyBody.blockSimple();
onDestroyBody.invoke(JExpr._super(), onDestroy);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected void setOnFinishInflate() {
JBlock ifNotInflated = onFinishInflate.body()._if(getAlreadyInflated().not())._then();
ifNotInflated.assign(getAlreadyInflated(), JExpr.TRUE);

setContentViewBlock = codeModelHelper.blockNoBraces(ifNotInflated);
setContentViewBlock = ifNotInflated.blockSimple();

getInit();
viewNotifierHelper.invokeViewChanged(ifNotInflated);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import javax.lang.model.element.TypeElement;

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.internal.process.ProcessHolder.Classes;

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

protected T holder;

protected APTCodeModelHelper codeModelHelper;

public GeneratedClassHolderDelegate(T holder) {
this.holder = holder;
codeModelHelper = new APTCodeModelHelper(holder.getEnvironment());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public JBlock getCaseBlock(int requestCode) {

private JBlock createCaseBlock(int requestCode) {
JCase onActivityResultCase = getSwitch()._case(JExpr.lit(requestCode));
JBlock onActivityResultCaseBlock = codeModelHelper.blockNoBraces(onActivityResultCase.body());
JBlock onActivityResultCaseBlock = onActivityResultCase.body().blockSimple();
onActivityResultCase.body()._break();
return onActivityResultCaseBlock;
}
Expand Down Expand Up @@ -112,6 +112,6 @@ private void setOnActivityResult() {
dataParam = method.param(getClasses().INTENT, "data");
JBlock body = method.body();
body.invoke(_super(), method).arg(requestCodeParam).arg(resultCodeParam).arg(dataParam);
afterSuperBlock = codeModelHelper.blockNoBraces(body);
afterSuperBlock = body.blockSimple();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;

import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.helper.CanonicalNameConstants;

import com.helger.jcodemodel.AbstractJClass;
Expand All @@ -39,16 +38,13 @@

public class PreferencesDelegate extends GeneratedClassHolderDelegate<EComponentWithViewSupportHolder> implements HasPreferences {

private APTCodeModelHelper codeModelHelper;

protected JBlock addPreferencesFromResourceBlock;

private boolean usingSupportV7Preference = false;
private AbstractJClass basePreferenceClass;

public PreferencesDelegate(EComponentWithViewSupportHolder holder) {
super(holder);
codeModelHelper = new APTCodeModelHelper(holder.getEnvironment());
Elements elementUtils = holder.getEnvironment().getProcessingEnvironment().getElementUtils();
Types typeUtils = holder.getEnvironment().getProcessingEnvironment().getTypeUtils();

Expand Down Expand Up @@ -133,7 +129,7 @@ public AbstractJClass getBasePreferenceClass() {

private FoundPreferenceHolder createFoundPreferenceAndIfNotNullBlock(JFieldRef idRef, AbstractJClass preferenceClass) {
IJExpression findPreferenceExpression = findPreferenceByKey(idRef);
JBlock block = codeModelHelper.blockNoBraces(getAddPreferencesFromResourceBlock());
JBlock block = getAddPreferencesFromResourceBlock().blockSimple();

if (preferenceClass == null) {
preferenceClass = basePreferenceClass;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private void setConstructor() {
constructor = generatedClass.constructor(PUBLIC);
constructorContextParam = constructor.param(getClasses().CONTEXT, "context");
JBlock constructorBody = constructor.body();
constructorSuperBlock = codeModelHelper.blockNoBraces(constructorBody);
constructorSuperBlock = constructorBody.blockSimple();
}

public JFieldVar getContextField() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void process(Element element, HasOnActivityResult holder) throws Exceptio
List<? extends VariableElement> parameters = executableElement.getParameters();

int requestCode = executableElement.getAnnotation(OnActivityResult.class).value();
JBlock onResultBlock = codeModelHelper.blockNoBraces(holder.getOnActivityResultCaseBlock(requestCode));
JBlock onResultBlock = holder.getOnActivityResultCaseBlock(requestCode).blockSimple();

IJExpression activityRef = holder.getGeneratedClass().staticRef("this");
JInvocation onResultInvocation = JExpr.invoke(activityRef, methodName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
import org.androidannotations.helper.APTCodeModelHelper;

import com.helger.jcodemodel.AbstractJClass;
import com.helger.jcodemodel.IJExpression;
import com.helger.jcodemodel.JAnnotationArrayMember;
import com.helger.jcodemodel.JEnumConstantRef;
import com.helger.jcodemodel.JExpr;

public class AnnotationArrayParamExtractor extends SimpleAnnotationValueVisitor6<Void, JAnnotationArrayMember> {

Expand Down Expand Up @@ -98,8 +99,8 @@ public Void visitType(TypeMirror t, JAnnotationArrayMember p) {
@Override
public Void visitEnumConstant(VariableElement c, JAnnotationArrayMember p) {
AbstractJClass annotationClass = helper.typeMirrorToJClass(c.asType());
IJExpression expression = annotationClass.staticRef(c.getSimpleName().toString());
p.param(expression);
JEnumConstantRef ref = JExpr.enumConstantRef(annotationClass, c.getSimpleName().toString());
p.param(ref);
return null;
}

Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.