rwaldhoff 01/08/07 10:37:22 Modified: httpclient/src/java/org/apache/commons/httpclient/log Log.java Log4JCategoryLog.java NoOpLog.java SimpleLog.java Log: removing assert(), since that's a reserved keyword in JDK 1.4 we can add it back later once log4j settles on a new method name Revision Changes Path 1.3 +1 -2 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/Log.java Index: Log.java =================================================================== RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/Log.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Log.java 2001/08/02 22:14:41 1.2 +++ Log.java 2001/08/07 17:37:22 1.3 @@ -11,10 +11,9 @@ /** * A simple logging interface abstracting log4j. * @author Rod Waldhoff - * @version $Id: Log.java,v 1.2 2001/08/02 22:14:41 rwaldhoff Exp $ + * @version $Id: Log.java,v 1.3 2001/08/07 17:37:22 rwaldhoff Exp $ */ public interface Log { - public void assert(boolean assertion, String msg); public void debug(Object message); public void debug(Object message, Throwable t); public void info(Object message); 1.3 +1 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/Log4JCategoryLog.java Index: Log4JCategoryLog.java =================================================================== RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/Log4JCategoryLog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Log4JCategoryLog.java 2001/08/02 22:14:41 1.2 +++ Log4JCategoryLog.java 2001/08/07 17:37:22 1.3 @@ -13,17 +13,13 @@ /** * @author Rod Waldhoff - * @version $Id: Log4JCategoryLog.java,v 1.2 2001/08/02 22:14:41 rwaldhoff Exp $ + * @version $Id: Log4JCategoryLog.java,v 1.3 2001/08/07 17:37:22 rwaldhoff Exp $ */ public class Log4JCategoryLog implements Log { Category _category = null; public Log4JCategoryLog(String name) { _category = Category.getInstance(name); - } - - public final void assert(boolean assertion, String msg) { - _category.assert(assertion,msg); } public final void debug(Object message) { 1.3 +1 -2 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/NoOpLog.java Index: NoOpLog.java =================================================================== RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/NoOpLog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NoOpLog.java 2001/08/02 22:14:41 1.2 +++ NoOpLog.java 2001/08/07 17:37:22 1.3 @@ -10,12 +10,11 @@ /** * @author Rod Waldhoff - * @version $Id: NoOpLog.java,v 1.2 2001/08/02 22:14:41 rwaldhoff Exp $ + * @version $Id: NoOpLog.java,v 1.3 2001/08/07 17:37:22 rwaldhoff Exp $ */ public final class NoOpLog implements Log { public NoOpLog() { } public NoOpLog(String name) { } - public void assert(boolean assertion, String msg) { } public void debug(Object message) { } public void debug(Object message, Throwable t) { } public void info(Object message) { } 1.3 +1 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/SimpleLog.java Index: SimpleLog.java =================================================================== RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/SimpleLog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SimpleLog.java 2001/08/02 22:14:41 1.2 +++ SimpleLog.java 2001/08/07 17:37:22 1.3 @@ -17,7 +17,7 @@ /** * @author Rod Waldhoff - * @version $Id: SimpleLog.java,v 1.2 2001/08/02 22:14:41 rwaldhoff Exp $ + * @version $Id: SimpleLog.java,v 1.3 2001/08/07 17:37:22 rwaldhoff Exp $ */ public class SimpleLog implements Log { static protected final Properties _simplelogProps = new Properties(); @@ -118,10 +118,6 @@ } System.out.println(buf.toString()); } - } - - public final void assert(boolean assertion, String msg) { - if(!assertion) { error(msg); } } public final void debug(Object message) {