From b65ddd58285586ddab62062cd09d7b6e83e3c943 Mon Sep 17 00:00:00 2001
From: kamhung <22250530@qq.com>
Date: Mon, 30 Nov 2015 15:22:54 +0800
Subject: [PATCH]

---
 src/com/wentch/redkale/watch/WatchFactory.java      | 13 +++++++------
 .../watch/{WatchBean.java => WatchNode.java}        |  2 +-
 src/com/wentch/redkale/watch/WatchNumber.java       |  2 +-
 src/com/wentch/redkale/watch/WatchSupplier.java     |  2 +-
 .../redkale/watch/{WatchOn.java => Watchable.java}  |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename src/com/wentch/redkale/watch/{WatchBean.java => WatchNode.java} (88%)
 rename src/com/wentch/redkale/watch/{WatchOn.java => Watchable.java} (93%)

diff --git a/src/com/wentch/redkale/watch/WatchFactory.java b/src/com/wentch/redkale/watch/WatchFactory.java
index ec402fa1b..db5f4a5a4 100644
--- a/src/com/wentch/redkale/watch/WatchFactory.java
+++ b/src/com/wentch/redkale/watch/WatchFactory.java
@@ -19,7 +19,7 @@ public final class WatchFactory {
 
     private static final WatchFactory instance = new WatchFactory(null);
 
-    private final List<WeakReference<WatchBean>> beans = new CopyOnWriteArrayList<>();
+    private final List<WeakReference<WatchNode>> beans = new CopyOnWriteArrayList<>();
 
     private final WatchFactory parent;
 
@@ -27,7 +27,7 @@ public final class WatchFactory {
         this.parent = parent;
     }
 
-    public void register(WatchBean bean) {
+    public void register(WatchNode bean) {
         if (bean != null) beans.add(new WeakReference<>(bean));
     }
 
@@ -35,9 +35,10 @@ public final class WatchFactory {
         return instance;
     }
 
-//    public WatchFactory createChild() {
-//        return new WatchFactory(this);
-//    }
+    public WatchFactory createChild() {
+        return new WatchFactory(this);
+    }
+
     public WatchNumber createWatchNumber(String name) {
         return createWatchNumber(name, "", false, 0);
     }
@@ -86,7 +87,7 @@ public final class WatchFactory {
                     if (Modifier.isFinal(field.getModifiers())) continue;
                     field.setAccessible(true);
                     final Class type = field.getType();
-                    WatchOn wo = field.getAnnotation(WatchOn.class);
+                    Watchable wo = field.getAnnotation(Watchable.class);
 
                 }
             } while ((clazz = clazz.getSuperclass()) != Object.class);
diff --git a/src/com/wentch/redkale/watch/WatchBean.java b/src/com/wentch/redkale/watch/WatchNode.java
similarity index 88%
rename from src/com/wentch/redkale/watch/WatchBean.java
rename to src/com/wentch/redkale/watch/WatchNode.java
index 60bbe9ae9..cabf81701 100644
--- a/src/com/wentch/redkale/watch/WatchBean.java
+++ b/src/com/wentch/redkale/watch/WatchNode.java
@@ -9,7 +9,7 @@ package com.wentch.redkale.watch;
  *
  * @author zhangjx
  */
-public interface WatchBean {
+public interface WatchNode {
 
     public String getName();
 
diff --git a/src/com/wentch/redkale/watch/WatchNumber.java b/src/com/wentch/redkale/watch/WatchNumber.java
index 45a558345..5ef8fff43 100644
--- a/src/com/wentch/redkale/watch/WatchNumber.java
+++ b/src/com/wentch/redkale/watch/WatchNumber.java
@@ -11,7 +11,7 @@ import java.util.concurrent.atomic.*;
  *
  * @author zhangjx
  */
-public final class WatchNumber extends AtomicLong implements WatchBean {
+public final class WatchNumber extends AtomicLong implements WatchNode {
 
     private final boolean interval;
 
diff --git a/src/com/wentch/redkale/watch/WatchSupplier.java b/src/com/wentch/redkale/watch/WatchSupplier.java
index a7c41c77e..8f1dd045f 100644
--- a/src/com/wentch/redkale/watch/WatchSupplier.java
+++ b/src/com/wentch/redkale/watch/WatchSupplier.java
@@ -11,7 +11,7 @@ import java.util.function.LongSupplier;
  *
  * @author zhangjx
  */
-public final class WatchSupplier implements WatchBean {
+public final class WatchSupplier implements WatchNode {
 
     private final String name;
 
diff --git a/src/com/wentch/redkale/watch/WatchOn.java b/src/com/wentch/redkale/watch/Watchable.java
similarity index 93%
rename from src/com/wentch/redkale/watch/WatchOn.java
rename to src/com/wentch/redkale/watch/Watchable.java
index 83d07c2cb..1d07fd2d0 100644
--- a/src/com/wentch/redkale/watch/WatchOn.java
+++ b/src/com/wentch/redkale/watch/Watchable.java
@@ -18,7 +18,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Documented
 @Target({FIELD})
 @Retention(RUNTIME)
-public @interface WatchOn {
+public @interface Watchable {
 
     String name();