[waffle-scm] [381] trunk/core/src/main/java/org/codehaus/waffle/monitor: Implemented RegistrarMonitor methods in AbstractWritingMonitor.

Thu, 15 Nov 2007 10:10:19 -0800

Title: [waffle-scm] [381] trunk/core/src/main/java/org/codehaus/waffle/monitor: Implemented RegistrarMonitor methods in AbstractWritingMonitor.

Diff

Modified: trunk/core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java (380 => 381)

--- trunk/core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java	2007-11-15 16:13:04 UTC (rev 380)
+++ trunk/core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java	2007-11-15 16:20:53 UTC (rev 381)
@@ -64,6 +64,9 @@
         levels.put("responseIsCommitted", INFO);
         levels.put("viewDispatched", INFO);
         levels.put("servletServiceFailed", WARN);
+        levels.put("componentRegistered", DEBUG);
+        levels.put("instanceRegistered", DEBUG);
+        levels.put("nonCachingComponentRegistered", DEBUG);
         return levels;
     }
 
@@ -83,6 +86,9 @@
         templates.put("bindFailedForController", "Bind failed for controller ''{0}'': {1}");
         templates.put("responseIsCommitted", "Response is committed for response: {0}");
         templates.put("viewDispatched", "View dispatched: {0}");
+        templates.put("componentRegistered", "Registered component of type {1} with key {0} and parameters {2}");
+        templates.put("instanceRegistered", "Registered instance {1} with key {0}");
+        templates.put("nonCachingComponentRegistered", "Registered non-caching component of type {1} with key {0} and parameters {2}");
         templates.put("servletServiceFailed", "Servlet service failed: {0}");
         return templates;
     }
@@ -175,13 +181,16 @@
         write("viewDispatched", view);
     }
     
-    public void componentRegistered(Object key, Class<?> clazz, Object[] parameters) {
+    public void componentRegistered(Object key, Class<?> type, Object[] parameters) {
+        write("componentRegistered", key, type, asList(parameters));
     }
 
     public void instanceRegistered(Object key, Object instance) {
+        write("instanceRegistered", key, instance);
     }
 
-    public void nonCachingComponentRegistered(Object key, Class<?> clazz, Object[] parameters) {
+    public void nonCachingComponentRegistered(Object key, Class<?> type, Object[] parameters) {
+        write("nonCachingComponentRegistered", key, type, asList(parameters));
     }
 
     public void servletServiceFailed(Exception cause){

Modified: trunk/core/src/main/java/org/codehaus/waffle/monitor/RegistrarMonitor.java (380 => 381)

--- trunk/core/src/main/java/org/codehaus/waffle/monitor/RegistrarMonitor.java	2007-11-15 16:13:04 UTC (rev 380)
+++ trunk/core/src/main/java/org/codehaus/waffle/monitor/RegistrarMonitor.java	2007-11-15 16:20:53 UTC (rev 381)
@@ -17,9 +17,9 @@
  */
 public interface RegistrarMonitor extends Monitor {
 
-    void componentRegistered(Object key, Class<?> clazz, Object[] parameters);
+    void componentRegistered(Object key, Class<?> type, Object[] parameters);
 
-    void nonCachingComponentRegistered(Object key, Class<?> clazz, Object[] parameters);
+    void nonCachingComponentRegistered(Object key, Class<?> type, Object[] parameters);
 
     void instanceRegistered(Object key, Object instance);

Modified: trunk/core/src/main/java/org/codehaus/waffle/registrar/AbstractRegistrar.java (380 => 381)

--- trunk/core/src/main/java/org/codehaus/waffle/registrar/AbstractRegistrar.java	2007-11-15 16:13:04 UTC (rev 380)
+++ trunk/core/src/main/java/org/codehaus/waffle/registrar/AbstractRegistrar.java	2007-11-15 16:20:53 UTC (rev 381)
@@ -23,12 +23,12 @@
         this.delegate = delegate;
     }
 
-    public void register(Class clazz, Object... parameters) {
-        delegate.register(clazz, parameters);
+    public void register(Class<?> type, Object... parameters) {
+        delegate.register(type, parameters);
     }
 
-    public void register(Object key, Class clazz, Object... parameters) {
-        delegate.register(key, clazz, parameters);
+    public void register(Object key, Class<?> type, Object... parameters) {
+        delegate.register(key, type, parameters);
     }
 
     public void registerInstance(Object instance) {
@@ -39,12 +39,12 @@
         delegate.registerInstance(key, instance);
     }
 
-    public void registerNonCaching(Class clazz, Object... parameters) {
-        delegate.registerNonCaching(clazz, parameters);
+    public void registerNonCaching(Class<?> type, Object... parameters) {
+        delegate.registerNonCaching(type, parameters);
     }
 
-    public void registerNonCaching(Object key, Class clazz, Object... parameters) {
-        delegate.registerNonCaching(key, clazz, parameters);
+    public void registerNonCaching(Object key, Class<?> type, Object... parameters) {
+        delegate.registerNonCaching(key, type, parameters);
     }
 
     public void application() {

Modified: trunk/core/src/main/java/org/codehaus/waffle/registrar/RegistrarAssistant.java (380 => 381)

--- trunk/core/src/main/java/org/codehaus/waffle/registrar/RegistrarAssistant.java	2007-11-15 16:13:04 UTC (rev 380)
+++ trunk/core/src/main/java/org/codehaus/waffle/registrar/RegistrarAssistant.java	2007-11-15 16:20:53 UTC (rev 381)
@@ -22,10 +22,10 @@
  * @author Michael Ward
  */
 public class RegistrarAssistant {
-    private final Class registrarClass;
-    private final Constructor constructor;
+    private final Class<?> registrarClass;
+    private final Constructor<?> constructor;
 
-    public RegistrarAssistant(Class registrarClass) {
+    public RegistrarAssistant(Class<?> registrarClass) {
         try {
             this.registrarClass = registrarClass;
             this.constructor = registrarClass.getConstructor(Registrar.class);

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to