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

1750 fix disabling annotations #1782

Merged
WonderCsabo merged 4 commits into from
May 31, 2016
Merged

1750 fix disabling annotations #1782

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7039509
add isEnabled() to AnnotationHandler
dodgex May 30, 2016
f26c1cf
add implementation of isEnabled() in BaseAnnotationHandler that defau…
dodgex May 30, 2016
4e0fe83
only call annotation handlers validate() and process() methods if the…
dodgex May 30, 2016
775d5dd
update Trace- and SupposeThreadHandler to decide if they are enabled …
dodgex May 30, 2016
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
Prev Previous commit
update Trace- and SupposeThreadHandler to decide if they are enabled … 
…or not
  • Loading branch information
@dodgex
dodgex committed May 30, 2016
commit 775d5dd8b3bc0d1eebe41474a777fc58e614c8b2
16 changes: 5 additions & 11 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 @@ -94,6 +94,7 @@
import org.androidannotations.internal.core.handler.ServiceActionHandler;
import org.androidannotations.internal.core.handler.SharedPrefHandler;
import org.androidannotations.internal.core.handler.SupposeBackgroundHandler;
import org.androidannotations.internal.core.handler.SupposeThreadHandler;
import org.androidannotations.internal.core.handler.SupposeUiThreadHandler;
import org.androidannotations.internal.core.handler.SystemServiceHandler;
import org.androidannotations.internal.core.handler.TextChangeHandler;
Expand All @@ -112,17 +113,14 @@ public class CorePlugin extends AndroidAnnotationsPlugin {

private static final String NAME = "AndroidAnnotations";

private static final Option OPTION_TRACE = new Option("trace", "false");
private static final Option OPTION_THREAD_CONTROL = new Option("threadControl", "true");

@Override
public String getName() {
return NAME;
}

@Override
public List<Option> getSupportedOptions() {
return Arrays.asList(OPTION_TRACE, OPTION_THREAD_CONTROL);
return Arrays.asList(TraceHandler.OPTION_TRACE, SupposeThreadHandler.OPTION_THREAD_CONTROL);
}

@Override
Expand Down Expand Up @@ -219,9 +217,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));

/*
* WakeLockHandler must be after TraceHandler but before UiThreadHandler
Expand All @@ -240,10 +236,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));
annotationHandlers.add(new SupposeBackgroundHandler(androidAnnotationEnv));

return annotationHandlers;
}
Expand Down
8 changes: 8 additions & 0 deletions ...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 @@ -19,15 +19,23 @@

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.ElementValidation;
import org.androidannotations.Option;
import org.androidannotations.handler.BaseAnnotationHandler;
import org.androidannotations.holder.EComponentHolder;

public abstract class SupposeThreadHandler extends BaseAnnotationHandler<EComponentHolder> {

public static final Option OPTION_THREAD_CONTROL = new Option("threadControl", "true");

public SupposeThreadHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
super(targetClass, environment);
}

@Override
public boolean isEnabled() {
return getEnvironment().getOptionBooleanValue(OPTION_THREAD_CONTROL);
}

@Override
protected void validate(Element element, ElementValidation valid) {
validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, valid);
Expand Down
8 changes: 8 additions & 0 deletions ...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 @@ -30,6 +30,7 @@

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.ElementValidation;
import org.androidannotations.Option;
import org.androidannotations.annotations.Trace;
import org.androidannotations.handler.BaseAnnotationHandler;
import org.androidannotations.holder.EComponentHolder;
Expand All @@ -48,10 +49,17 @@

public class TraceHandler extends BaseAnnotationHandler<EComponentHolder> {

public static final Option OPTION_TRACE = new Option("trace", "false");

public TraceHandler(AndroidAnnotationsEnvironment environment) {
super(Trace.class, environment);
}

@Override
public boolean isEnabled() {
return getEnvironment().getOptionBooleanValue(OPTION_TRACE);
}

@Override
public void validate(Element element, ElementValidation validation) {
validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
Expand Down