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

Fix enabling/disabling annotations #1755

Closed
WonderCsabo wants to merge 1 commit into from
Closed

Fix enabling/disabling annotations #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions ...ore/androidannotations/src/main/java/org/androidannotations/internal/core/CorePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,7 @@ public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment andr
annotationHandlers.add(new PreferenceClickHandler(androidAnnotationEnv));
annotationHandlers.add(new AfterPreferencesHandler(androidAnnotationEnv));

if (androidAnnotationEnv.getOptionBooleanValue(OPTION_TRACE)) {
annotationHandlers.add(new TraceHandler(androidAnnotationEnv));
}
annotationHandlers.add(new TraceHandler(androidAnnotationEnv, androidAnnotationEnv.getOptionBooleanValue(OPTION_TRACE)));

/*
* WakeLockHandler must be after TraceHandler but before UiThreadHandler
Expand All @@ -240,10 +238,8 @@ public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment andr
* SupposeUiThreadHandler and SupposeBackgroundHandler must be after all
* handlers that modifies generated method body
*/
if (androidAnnotationEnv.getOptionBooleanValue(OPTION_THREAD_CONTROL)) {
annotationHandlers.add(new SupposeUiThreadHandler(androidAnnotationEnv));
annotationHandlers.add(new SupposeBackgroundHandler(androidAnnotationEnv));
}
annotationHandlers.add(new SupposeUiThreadHandler(androidAnnotationEnv, androidAnnotationEnv.getOptionBooleanValue(OPTION_THREAD_CONTROL)));
annotationHandlers.add(new SupposeBackgroundHandler(androidAnnotationEnv, androidAnnotationEnv.getOptionBooleanValue(OPTION_THREAD_CONTROL)));

return annotationHandlers;
}
Expand Down
8 changes: 6 additions & 2 deletions .../src/main/java/org/androidannotations/internal/core/handler/SupposeBackgroundHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,16 @@ public class SupposeBackgroundHandler extends SupposeThreadHandler {

private static final String METHOD_CHECK_BG_THREAD = "checkBgThread";

public SupposeBackgroundHandler(AndroidAnnotationsEnvironment environment) {
super(SupposeBackground.class, environment);
public SupposeBackgroundHandler(AndroidAnnotationsEnvironment environment, boolean enabled) {
super(SupposeBackground.class, environment, enabled);
}

@Override
public void process(Element element, EComponentHolder holder) throws Exception {
if (!enabled) {
return;
}

ExecutableElement executableElement = (ExecutableElement) element;

JMethod delegatingMethod = codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
Expand Down
9 changes: 8 additions & 1 deletion ...ions/src/main/java/org/androidannotations/internal/core/handler/SupposeThreadHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,19 @@

public abstract class SupposeThreadHandler extends BaseAnnotationHandler<EComponentHolder> {

public SupposeThreadHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
boolean enabled;

public SupposeThreadHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment, boolean enabled) {
super(targetClass, environment);
this.enabled = enabled;
}

@Override
protected void validate(Element element, ElementValidation valid) {
if (!enabled) {
return;
}

validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, valid);
validatorHelper.isNotPrivate(element, valid);
validatorHelper.isNotFinal(element, valid);
Expand Down
8 changes: 6 additions & 2 deletions ...ns/src/main/java/org/androidannotations/internal/core/handler/SupposeUiThreadHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,16 @@ public class SupposeUiThreadHandler extends SupposeThreadHandler {

private static final String METHOD_CHECK_UI_THREAD = "checkUiThread";

public SupposeUiThreadHandler(AndroidAnnotationsEnvironment environment) {
super(SupposeUiThread.class, environment);
public SupposeUiThreadHandler(AndroidAnnotationsEnvironment environment, boolean enabled) {
super(SupposeUiThread.class, environment, enabled);
}

@Override
public void process(Element element, EComponentHolder holder) throws Exception {
if (!enabled) {
return;
}

ExecutableElement executableElement = (ExecutableElement) element;

JMethod delegatingMethod = codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
Expand Down
14 changes: 13 additions & 1 deletion ...dannotations/src/main/java/org/androidannotations/internal/core/handler/TraceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,20 @@

public class TraceHandler extends BaseAnnotationHandler<EComponentHolder> {

public TraceHandler(AndroidAnnotationsEnvironment environment) {
private boolean enabled;

public TraceHandler(AndroidAnnotationsEnvironment environment, boolean enabled) {
super(Trace.class, environment);
this.enabled = enabled;
}

@Override
public void validate(Element element, ElementValidation validation) {
if (!enabled) {
return;
}


validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);

validatorHelper.isNotPrivate(element, validation);
Expand All @@ -63,6 +71,10 @@ public void validate(Element element, ElementValidation validation) {

@Override
public void process(Element element, EComponentHolder holder) throws Exception {
if (!enabled) {
return;
}

ExecutableElement executableElement = (ExecutableElement) element;

String tag = extractTag(executableElement);
Expand Down