[logback-dev] svn commit: r753 - in logback/trunk/logback-core/src/main/java/ch/qos/logback/core: joran/action util

[noreply.seb at qos.ch]

Author: seb
Date: Tue Oct 24 14:08:05 2006
New Revision: 753

Modified:
   logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java
   logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/PropertySetter.java

Log:
- added getObj() to PropertySetter

Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java
==============================================================================
--- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java	(original)
+++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java	Tue Oct 24 14:08:05 2006
@@ -122,14 +122,22 @@
       return;
     }
 
+//    PropertySetter nestedBean = new PropertySetter(actionData.nestedComponent);
+    
+//    FIXME
+//    nestedBean.setComponent(
+//        "parent", actionData.parentBean.getObj());
+    
     if (actionData.nestedComponent instanceof LifeCycle) {
       ((LifeCycle) actionData.nestedComponent).start();
     }
+    
+    
 
     Object o = ec.peekObject();
 
     if (o != actionData.nestedComponent) {
-      addWarn(
+      addError(
         "The object on the top the of the stack is not the component pushed earlier.");
     } else {
       //getLogger().debug("Removing component from the object stack");

Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/PropertySetter.java
==============================================================================
--- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/PropertySetter.java	(original)
+++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/PropertySetter.java	Tue Oct 24 14:08:05 2006
@@ -395,4 +395,8 @@
 
     return null;
   }
+
+  public Object getObj() {
+    return obj;
+  }
 }