Author: ceki Date: Tue Nov 21 12:09:34 2006 New Revision: 974 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java Log: - Renamed InterpretationContext.addProperties as addSubstitutionProperties Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java Tue Nov 21 12:09:34 2006 @@ -24,7 +24,7 @@ public class SubstitutionPropertyAction extends PropertyAction { public void setProperties(InterpretationContext ec, Properties props) { - ec.addProperties(props); + ec.addSubstitutionProperties(props); // for(Object o: props.keySet()) { // String key = (String) o; // ec.getContext().setProperty(key, props.getProperty(key)); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java Tue Nov 21 12:09:34 2006 @@ -114,7 +114,7 @@ substitutionMap.put(key, value); } - public void addProperties(Properties props) { + public void addSubstitutionProperties(Properties props) { if (props == null) { return; }