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

[noreply.ceki at qos.ch]

Author: ceki
Date: Tue Nov 28 20:30:16 2006
New Revision: 1022

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/NestedSimplePropertyIA.java
   logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java

Log:
more precise log messages

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 Nov 28 20:30:16 2006
@@ -66,7 +66,7 @@
       // we only push action data if NestComponentIA is applicable
     case AS_COMPONENT_COLLECTION:
     case AS_SINGLE_COMPONENT:
-      addInfo("was deemed applicable for " + pattern);
+      //addInfo("was deemed applicable for " + pattern);
       ImplicitActionData ad = new ImplicitActionData(parentBean,
           containmentType);
       actionDataStack.push(ad);
@@ -91,7 +91,7 @@
 
     if (OptionHelper.isEmpty(className)) {
       actionData.inError = true;
-      String errMsg = "No class name attribute in <" + localName + ">";
+      String errMsg = "No class name attribute in [" + localName + "]";
       addError(errMsg);
 
       return;
@@ -110,12 +110,12 @@
         ((ContextAware) actionData.nestedComponent).setContext(this.context);
       }
       // getLogger().debug(
-      addInfo("Pushing component <" + localName
-          + "> on top of the object stack.");
+      addInfo("Pushing component [" + localName
+          + "] on top of the object stack.");
       ec.pushObject(actionData.nestedComponent);
     } catch (Exception oops) {
       actionData.inError = true;
-      String msg = "Could not create component <" + localName + "> of type ["
+      String msg = "Could not create component [" + localName + "] of type ["
           + className + "]";
       addError(msg, oops);
     }

Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java
==============================================================================
--- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java	(original)
+++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java	Tue Nov 28 20:30:16 2006
@@ -68,7 +68,7 @@
       ImplicitActionData ad = new ImplicitActionData(parentBean, containmentType);
       ad.propertyName = nestedElementTagName;
       actionDataStack.push(ad);
-      //addInfo("NestedSimplePropertyIA deemed applicable <" + pattern + ">");
+      //addInfo("NestedSimplePropertyIA deemed applicable [" + pattern + "]");
       return true;
     default:
       addError("PropertySetter.canContainComponent returned " + containmentType);

Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java
==============================================================================
--- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java	(original)
+++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java	Tue Nov 28 20:30:16 2006
@@ -117,16 +117,16 @@
     pattern.push(tagName);
 
     List applicableActionList = getApplicableActionList(pattern, atts);
-
+ 
     if (applicableActionList != null) {
       actionListStack.add(applicableActionList);
       callBeginAction(applicableActionList, tagName, atts);
     } else {
       actionListStack.add(EMPTY_LIST);
 
-      String errMsg = "no applicable action for <" + tagName
-          + ">, current pattern is [" + pattern + "]";
-      ec.addError(errMsg);
+      String errMsg = "no applicable action for [" + tagName
+          + "], current pattern is [" + pattern + "]";
+      cai.addError(errMsg);
     }
   }