[logback-dev] svn commit: r834 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter

[noreply.ceki at qos.ch]

Author: ceki
Date: Tue Oct 31 22:41:53 2006
New Revision: 834

Modified:
   logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java
   logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java

Log:
minor changes

Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java
==============================================================================
--- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java	(original)
+++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java	Tue Oct 31 22:41:53 2006
@@ -5,7 +5,7 @@
  * This abstract class is meant to be a base for specific evaluator filters.
  * </p>
  * <p>
- * The value of the {@link #on_match} and {@link #onMismatch} attributes is set to 
+ * The value of the {@link #onMatch} and {@link #onMismatch} attributes is set to 
  * {@link Filter.NEUTRAL}, so that a badly configured evaluator filter doesn't 
  * disturb the functionning of the chain.
  * </p>
@@ -21,16 +21,16 @@
 
 public abstract class AbstractEvalutatorFilter extends Filter {
 
-  protected int on_match = NEUTRAL;
+  protected int onMatch = NEUTRAL;
   protected int onMismatch = NEUTRAL;
 
   final public void setOnMatch(String action) {
     if ("NEUTRAL".equals(action)) {
-      on_match = NEUTRAL;
+      onMatch = NEUTRAL;
     } else if ("ACCEPT".equals(action)) {
-      on_match = ACCEPT;
+      onMatch = ACCEPT;
     } else if ("DENY".equals(action)) {
-      on_match = DENY;
+      onMatch = DENY;
     }
   }
 

Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java
==============================================================================
--- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java	(original)
+++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java	Tue Oct 31 22:41:53 2006
@@ -7,6 +7,7 @@
 
   EventEvaluator evaluator;
   
+  @Override
   public void start() {
     if(evaluator != null) {
       super.start();
@@ -32,7 +33,7 @@
     }
     try {
       if (evaluator.evaluate(event)) {
-        return on_match;
+        return onMatch;
       } else {
         return onMismatch;
       }
@@ -40,7 +41,6 @@
       addError("Evaluator "+evaluator.getName()+" threw an exception", e);
       return NEUTRAL;
     }
-
   }
 
 }