add delay function on OnUi annotation.

KoMinkyu · Jan 3, 2016 · 2e642c1 · 2e642c1
1 parent c66da99
commit 2e642c1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/teaspoon-processor/src/main/java/teaspoon/TeaSpoon.java b/teaspoon-processor/src/main/java/teaspoon/TeaSpoon.java
@@ -16,7 +16,7 @@ public static void initialize() {
     }
 
     public static void onUi(Runnable runnable) {
-        threadManager.runOnUiThread(runnable);
+        onUi(runnable, 0);
     }
 
     public static void onUi(Runnable runnable, int delay) {

diff --git a/teaspoon-processor/src/main/java/teaspoon/ThreadManager.java b/teaspoon-processor/src/main/java/teaspoon/ThreadManager.java
@@ -29,10 +29,6 @@ public static teaspoon.ThreadManager getInstance() {
         uiExecutor = new Handler(Looper.getMainLooper());
     }
 
-    public void runOnUiThread(Runnable runnable) {
-        runOnUiThread(runnable, 0);
-    }
-
     public void runOnUiThread(Runnable runnable, int delay) {
         uiExecutor.postDelayed(runnable, delay);
     }

diff --git a/teaspoon-processor/src/main/java/teaspoon/processor/TeaSpoonProcessor.java b/teaspoon-processor/src/main/java/teaspoon/processor/TeaSpoonProcessor.java
@@ -1,13 +1,13 @@
 package teaspoon.processor;
 
-import android.util.Log;
-
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
 
 import teaspoon.TeaSpoon;
+import teaspoon.annotations.OnUi;
 
 @Aspect
 public class TeaSpoonProcessor {
@@ -20,32 +20,33 @@ public void methodWithOnBackgroundAnnotation() { }
     public void methodWithOnUiAnnotation() { }
 
     @Around("methodWithOnBackgroundAnnotation()")
-    public void executeOnBackground(final ProceedingJoinPoint joinPoint) throws Throwable {
-        Log.i(TAG, joinPoint.getSignature().getName() + "execute on background thread.");
+    public void executeOnBackground(final ProceedingJoinPoint joinPoint) throws Exception{
         TeaSpoon.onBackground(new Runnable() {
-            @Override
-            public void run() {
+            @Override public void run() {
                 try {
                     joinPoint.proceed();
                 } catch (Throwable throwable) {
-                    throwable.printStackTrace();
+                    throw new IllegalStateException(throwable);
                 }
             }
         });
     }
 
     @Around("methodWithOnUiAnnotation()")
     public void methodWithOnUiAnnotation(final ProceedingJoinPoint joinPoint) throws Throwable {
-        Log.i(TAG, joinPoint.getSignature().getName() + "execute on ui thread.");
-        TeaSpoon.onUi(new Runnable() {
-            @Override
-            public void run() {
+        Runnable runnableJoinPoint = new Runnable() {
+            @Override public void run() {
                 try {
                     joinPoint.proceed();
                 } catch (Throwable throwable) {
-                    throwable.printStackTrace();
+                    throw new IllegalStateException(throwable);
                 }
             }
-        });
+        };
+
+        MethodSignature targetMethodSignature = (MethodSignature) joinPoint.getSignature();
+        OnUi annotation = targetMethodSignature.getMethod().getAnnotation(OnUi.class);
+
+        TeaSpoon.onUi(runnableJoinPoint, annotation.delay());
     }
 }