LayoutWrappingEncoder.java (logback-1.2.3) | : | LayoutWrappingEncoder.java (logback-v_1.2.7) | ||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
* as published by the Free Software Foundation. | * as published by the Free Software Foundation. | |||
*/ | */ | |||
package ch.qos.logback.core.encoder; | package ch.qos.logback.core.encoder; | |||
import java.nio.charset.Charset; | import java.nio.charset.Charset; | |||
import ch.qos.logback.core.Appender; | import ch.qos.logback.core.Appender; | |||
import ch.qos.logback.core.CoreConstants; | import ch.qos.logback.core.CoreConstants; | |||
import ch.qos.logback.core.Layout; | import ch.qos.logback.core.Layout; | |||
import ch.qos.logback.core.OutputStreamAppender; | import ch.qos.logback.core.OutputStreamAppender; | |||
import ch.qos.logback.core.spi.ContextAware; | ||||
public class LayoutWrappingEncoder<E> extends EncoderBase<E> { | public class LayoutWrappingEncoder<E> extends EncoderBase<E> { | |||
protected Layout<E> layout; | protected Layout<E> layout; | |||
/** | /** | |||
* The charset to use when converting a String into bytes. | * The charset to use when converting a String into bytes. | |||
* <p/> | * <p/> | |||
* By default this property has the value | * By default this property has the value | |||
* <code>null</null> which corresponds to | * <code>null</null> which corresponds to | |||
* the system's default charset. | * the system's default charset. | |||
*/ | */ | |||
private Charset charset; | private Charset charset; | |||
Appender<?> parent; | ContextAware parent; | |||
Boolean immediateFlush = null; | Boolean immediateFlush = null; | |||
public Layout<E> getLayout() { | public Layout<E> getLayout() { | |||
return layout; | return layout; | |||
} | } | |||
public void setLayout(Layout<E> layout) { | public void setLayout(Layout<E> layout) { | |||
this.layout = layout; | this.layout = layout; | |||
} | } | |||
skipping to change at line 151 | skipping to change at line 152 | |||
private void appendIfNotNull(StringBuilder sb, String s) { | private void appendIfNotNull(StringBuilder sb, String s) { | |||
if (s != null) { | if (s != null) { | |||
sb.append(s); | sb.append(s); | |||
} | } | |||
} | } | |||
/** | /** | |||
* This method allows RollingPolicy implementations to be aware of their | * This method allows RollingPolicy implementations to be aware of their | |||
* containing appender. | * containing appender. | |||
* | * | |||
* @param appender | * @param parent | |||
*/ | */ | |||
public void setParent(Appender<?> parent) { | public void setParent(ContextAware parent) { | |||
this.parent = parent; | this.parent = parent; | |||
} | } | |||
} | } | |||
End of changes. 4 change blocks. | ||||
3 lines changed or deleted | 4 lines changed or added |