sdeboy 2003/10/23 21:05:23
Modified: src/java/org/apache/log4j/chainsaw/rule RuleFactory.java
Added: src/java/org/apache/log4j/chainsaw/rule OrRule.java
Removed: src/java/org/apache/log4j/chainsaw/rule OrOperator.java
Log:
Renamed OR rule to match naming convention.
Revision Changes Path
1.2 +1 -1
jakarta-log4j/src/java/org/apache/log4j/chainsaw/rule/RuleFactory.java
Index: RuleFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/rule/RuleFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RuleFactory.java 23 Oct 2003 09:18:12 -0000 1.1
+++ RuleFactory.java 24 Oct 2003 04:05:23 -0000 1.2
@@ -89,7 +89,7 @@
}
if (OR_RULE.equals(symbol)) {
- return OrOperator.getRule(stack);
+ return OrRule.getRule(stack);
}
if (NOT_RULE.equals(symbol)) {
1.1
jakarta-log4j/src/java/org/apache/log4j/chainsaw/rule/OrRule.java
Index: OrRule.java
===================================================================
/*
* ============================================================================
* The Apache Software License, Version 1.1
* ============================================================================
*
* Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear.
*
* 4. The names "log4j" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior
* written permission. For written permission, please contact
* [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache", nor may
* "Apache" appear in their name, without prior written permission of the
* Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
* DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation. For more information on the
* Apache Software Foundation, please see <http://www.apache.org/>.
*
*/
package org.apache.log4j.chainsaw.rule;
import org.apache.log4j.spi.LoggingEvent;
import java.util.Stack;
/**
* A Rule class implementing logical or.
*
* @author Scott Deboy <[EMAIL PROTECTED]>
*/
class OrRule extends AbstractRule {
Rule firstParam;
Rule secondParam;
private OrRule(Rule firstParam, Rule secondParam) {
this.firstParam = firstParam;
this.secondParam = secondParam;
}
static Rule getRule(Stack stack) {
Rule p1 = (Rule) stack.pop();
Rule p2 = (Rule) stack.pop();
System.out.println("get or op " + p1 + ".." + p2);
return new OrRule(p1, p2);
}
public boolean evaluate(LoggingEvent event) {
System.out.println("or op " + firstParam + ".." + secondParam);
boolean result =
(firstParam.evaluate(event) || secondParam.evaluate(event));
System.out.println("result is " + result);
return result;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
