Author: ggregory
Date: Sat Nov 3 12:53:15 2012
New Revision: 1405327
URL: http://svn.apache.org/viewvc?rev=1405327&view=rev
Log:
Rename interface Filtering to Filterable.
Added:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
- copied, changed from r1405133,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java
Removed:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java?rev=1405327&r1=1405326&r2=1405327&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
Sat Nov 3 12:53:15 2012
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AppenderRuntimeException;
import org.apache.logging.log4j.core.filter.AbstractFilterable;
-import org.apache.logging.log4j.core.filter.Filtering;
+import org.apache.logging.log4j.core.filter.Filterable;
/**
* Wraps an {@link Appender} with details an appender implementation shouldn't
need to know about.
@@ -90,7 +90,7 @@ public class AppenderControl extends Abs
}
}
- if (appender instanceof Filtering && ((Filtering)
appender).isFiltered(event)) {
+ if (appender instanceof Filterable && ((Filterable)
appender).isFiltered(event)) {
return;
}
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java?rev=1405327&r1=1405326&r2=1405327&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java
Sat Nov 3 12:53:15 2012
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.core.App
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.core.filter.Filtering;
+import org.apache.logging.log4j.core.filter.Filterable;
import org.apache.logging.log4j.core.lookup.StrSubstitutor;
import java.util.Map;
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* Interface that must be implemented to create a configuration.
*/
-public interface Configuration extends Filtering {
+public interface Configuration extends Filterable {
/**
* Returns the configuration name.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java?rev=1405327&r1=1405326&r2=1405327&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
Sat Nov 3 12:53:15 2012
@@ -25,7 +25,7 @@ import java.util.Iterator;
/**
* Enhances a Class by allowing it to contain Filters.
*/
-public abstract class AbstractFilterable implements Filtering {
+public abstract class AbstractFilterable implements Filterable {
private volatile Filter filter;
Copied:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
(from r1405133,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java&r1=1405133&r2=1405327&rev=1405327&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
Sat Nov 3 12:53:15 2012
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.Log
/**
* Interface implemented by Classes that allow filtering to occur.
*/
-public interface Filtering {
+public interface Filterable {
/**
* Adds a new Filter. If a Filter already exists it is converted to a
CompositeFilter.
