Skip to content

Commit 775d5dd

Browse files
dodgexdodgex
committed
update Trace- and SupposeThreadHandler to decide if they are enabled or not
1 parent 4e0fe83 commit 775d5dd

3 files changed

Lines changed: 21 additions & 11 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/CorePlugin.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
import org.androidannotations.internal.core.handler.ServiceActionHandler;
9595
import org.androidannotations.internal.core.handler.SharedPrefHandler;
9696
import org.androidannotations.internal.core.handler.SupposeBackgroundHandler;
97+
import org.androidannotations.internal.core.handler.SupposeThreadHandler;
9798
import org.androidannotations.internal.core.handler.SupposeUiThreadHandler;
9899
import org.androidannotations.internal.core.handler.SystemServiceHandler;
99100
import org.androidannotations.internal.core.handler.TextChangeHandler;
@@ -112,17 +113,14 @@ public class CorePlugin extends AndroidAnnotationsPlugin {
112113

113114
private static final String NAME = "AndroidAnnotations";
114115

115-
private static final Option OPTION_TRACE = new Option("trace", "false");
116-
private static final Option OPTION_THREAD_CONTROL = new Option("threadControl", "true");
117-
118116
@Override
119117
public String getName() {
120118
return NAME;
121119
}
122120

123121
@Override
124122
public List<Option> getSupportedOptions() {
125-
return Arrays.asList(OPTION_TRACE, OPTION_THREAD_CONTROL);
123+
return Arrays.asList(TraceHandler.OPTION_TRACE, SupposeThreadHandler.OPTION_THREAD_CONTROL);
126124
}
127125

128126
@Override
@@ -219,9 +217,7 @@ public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment andr
219217
annotationHandlers.add(new PreferenceClickHandler(androidAnnotationEnv));
220218
annotationHandlers.add(new AfterPreferencesHandler(androidAnnotationEnv));
221219

222-
if (androidAnnotationEnv.getOptionBooleanValue(OPTION_TRACE)) {
223-
annotationHandlers.add(new TraceHandler(androidAnnotationEnv));
224-
}
220+
annotationHandlers.add(new TraceHandler(androidAnnotationEnv));
225221

226222
/*
227223
* WakeLockHandler must be after TraceHandler but before UiThreadHandler
@@ -240,10 +236,8 @@ public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment andr
240236
* SupposeUiThreadHandler and SupposeBackgroundHandler must be after all
241237
* handlers that modifies generated method body
242238
*/
243-
if (androidAnnotationEnv.getOptionBooleanValue(OPTION_THREAD_CONTROL)) {
244-
annotationHandlers.add(new SupposeUiThreadHandler(androidAnnotationEnv));
245-
annotationHandlers.add(new SupposeBackgroundHandler(androidAnnotationEnv));
246-
}
239+
annotationHandlers.add(new SupposeUiThreadHandler(androidAnnotationEnv));
240+
annotationHandlers.add(new SupposeBackgroundHandler(androidAnnotationEnv));
247241

248242
return annotationHandlers;
249243
}

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeThreadHandler.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,23 @@
1919

2020
import org.androidannotations.AndroidAnnotationsEnvironment;
2121
import org.androidannotations.ElementValidation;
22+
import org.androidannotations.Option;
2223
import org.androidannotations.handler.BaseAnnotationHandler;
2324
import org.androidannotations.holder.EComponentHolder;
2425

2526
public abstract class SupposeThreadHandler extends BaseAnnotationHandler<EComponentHolder> {
2627

28+
public static final Option OPTION_THREAD_CONTROL = new Option("threadControl", "true");
29+
2730
public SupposeThreadHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
2831
super(targetClass, environment);
2932
}
3033

34+
@Override
35+
public boolean isEnabled() {
36+
return getEnvironment().getOptionBooleanValue(OPTION_THREAD_CONTROL);
37+
}
38+
3139
@Override
3240
protected void validate(Element element, ElementValidation valid) {
3341
validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, valid);

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TraceHandler.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import org.androidannotations.AndroidAnnotationsEnvironment;
3232
import org.androidannotations.ElementValidation;
33+
import org.androidannotations.Option;
3334
import org.androidannotations.annotations.Trace;
3435
import org.androidannotations.handler.BaseAnnotationHandler;
3536
import org.androidannotations.holder.EComponentHolder;
@@ -48,10 +49,17 @@
4849

4950
public class TraceHandler extends BaseAnnotationHandler<EComponentHolder> {
5051

52+
public static final Option OPTION_TRACE = new Option("trace", "false");
53+
5154
public TraceHandler(AndroidAnnotationsEnvironment environment) {
5255
super(Trace.class, environment);
5356
}
5457

58+
@Override
59+
public boolean isEnabled() {
60+
return getEnvironment().getOptionBooleanValue(OPTION_TRACE);
61+
}
62+
5563
@Override
5664
public void validate(Element element, ElementValidation validation) {
5765
validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);

0 commit comments

Comments
 (0)