jon 01/03/18 22:15:55
Modified: src/java/org/apache/velocity/runtime Runtime.java
src/java/org/apache/velocity/runtime/log
AvalonLogSystem.java LogManager.java LogSystem.java
Log:
minor formatting and cleanup
i also added a check for null in the LogManager
Revision Changes Path
1.99 +17 -20
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
Index: Runtime.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Runtime.java 2001/03/19 05:30:49 1.98
+++ Runtime.java 2001/03/19 06:15:54 1.99
@@ -139,7 +139,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magusson Jr.</a>
- * @version $Id: Runtime.java,v 1.98 2001/03/19 05:30:49 geirm Exp $
+ * @version $Id: Runtime.java,v 1.99 2001/03/19 06:15:54 jon Exp $
*/
public class Runtime implements RuntimeConstants
{
@@ -627,31 +627,29 @@
/*
* Start with the appropriate prefix
*/
-
switch( level )
{
- case LogSystem.DEBUG_ID :
- out = DEBUG_PREFIX;
- break;
- case LogSystem.INFO_ID :
- out = WARN_PREFIX;
- break;
- case LogSystem.WARN_ID :
- out = WARN_PREFIX;
- break;
- case LogSystem.ERROR_ID :
- out = ERROR_PREFIX;
- break;
- default :
- out = "[unknown]";
- break;
+ case LogSystem.DEBUG_ID :
+ out = DEBUG_PREFIX;
+ break;
+ case LogSystem.INFO_ID :
+ out = WARN_PREFIX;
+ break;
+ case LogSystem.WARN_ID :
+ out = WARN_PREFIX;
+ break;
+ case LogSystem.ERROR_ID :
+ out = ERROR_PREFIX;
+ break;
+ default :
+ out = "[unknown]";
+ break;
}
/*
* now, see if the logging stacktrace is on
* and modify the message to suit
*/
-
if ( showStackTrace() &&
(message instanceof Throwable || message instanceof Exception) )
{
@@ -666,10 +664,9 @@
* now, if we have a log system, log it
* otherwise, queue it up for later
*/
-
if (logSystem != null)
{
- logSystem.logVelocityMessage( level, out);
+ logSystem.logVelocityMessage( level, out);
}
else
{
1.3 +23 -24
jakarta-velocity/src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
Index: AvalonLogSystem.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AvalonLogSystem.java 2001/03/19 05:16:47 1.2
+++ AvalonLogSystem.java 2001/03/19 06:15:54 1.3
@@ -75,7 +75,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: AvalonLogSystem.java,v 1.2 2001/03/19 05:16:47 geirm Exp $
+ * @version $Id: AvalonLogSystem.java,v 1.3 2001/03/19 06:15:54 jon Exp $
*/
public class AvalonLogSystem implements LogSystem
{
@@ -92,7 +92,6 @@
* since this is a Velocity-provided logger, we will
* use the Runtime configuration
*/
-
String logfile = (String) Runtime.getProperty( Runtime.RUNTIME_LOG );
/*
@@ -102,13 +101,14 @@
{
init( logfile );
- logVelocityMessage( 0, "AvalonLogSystem initialized using logfile " +
logPath );
+ logVelocityMessage( 0,
+ "AvalonLogSystem initialized using logfile " + logPath );
}
catch( Exception e )
{
- System.out.println("PANIC : error configuring AvalonLogSystem : " + e );
+ System.out.println(
+ "PANIC : error configuring AvalonLogSystem : " + e );
}
-
}
/**
@@ -149,31 +149,30 @@
}
/**
- * logs error messages
+ * logs messages
*
* @param level severity level
* @param message complete error message
*/
public void logVelocityMessage(int level, String message)
{
- switch (level)
+ switch (level)
{
- case LogSystem.WARN_ID:
- logger.warn( message );
- break;
- case LogSystem.INFO_ID:
- logger.info(message);
- break;
- case LogSystem.DEBUG_ID:
- logger.debug(message);
- break;
- case LogSystem.ERROR_ID:
- logger.error(message);
- break;
- default:
- logger.info(message);
- break;
- }
+ case LogSystem.WARN_ID:
+ logger.warn( message );
+ break;
+ case LogSystem.INFO_ID:
+ logger.info(message);
+ break;
+ case LogSystem.DEBUG_ID:
+ logger.debug(message);
+ break;
+ case LogSystem.ERROR_ID:
+ logger.error(message);
+ break;
+ default:
+ logger.info(message);
+ break;
+ }
}
-
}
1.5 +6 -11
jakarta-velocity/src/java/org/apache/velocity/runtime/log/LogManager.java
Index: LogManager.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/LogManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogManager.java 2001/03/19 05:18:29 1.4
+++ LogManager.java 2001/03/19 06:15:54 1.5
@@ -65,7 +65,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: LogManager.java,v 1.4 2001/03/19 05:18:29 geirm Exp $
+ * @version $Id: LogManager.java,v 1.5 2001/03/19 06:15:54 jon Exp $
*/
public class LogManager
{
@@ -81,10 +81,8 @@
/*
* if a logSystem was set as a configuation value, use that
*/
-
Object o = Runtime.getProperty( Runtime.RUNTIME_LOG_LOGSYSTEM );
-
- if ( o instanceof LogSystem)
+ if (o != null && o instanceof LogSystem)
{
return (LogSystem) o;
}
@@ -92,20 +90,20 @@
/*
* otherwise, see if a class was specified
*/
-
- String claz = (String) Runtime.getProperty(
Runtime.RUNTIME_LOG_LOGSYSTEM_CLASS );
+ String claz = (String) Runtime.getProperty(
+ Runtime.RUNTIME_LOG_LOGSYSTEM_CLASS );
if (claz != null || claz.length() > 0 )
{
o = Class.forName( claz ).newInstance();
-
if (o instanceof LogSystem)
{
return (LogSystem) o;
}
else
{
- Runtime.error("The specifid logger class " + claz + " isn't a valid
LogSystem\n");
+ Runtime.error("The specifid logger class " + claz +
+ " isn't a valid LogSystem\n");
}
}
@@ -113,11 +111,8 @@
* if the above failed, then
* make an Avalon log system
*/
-
AvalonLogSystem als = new AvalonLogSystem();
-
return als;
-
}
}
1.3 +6 -5
jakarta-velocity/src/java/org/apache/velocity/runtime/log/LogSystem.java
Index: LogSystem.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/LogSystem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogSystem.java 2001/03/19 05:19:48 1.2
+++ LogSystem.java 2001/03/19 06:15:55 1.3
@@ -59,7 +59,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: LogSystem.java,v 1.2 2001/03/19 05:19:48 geirm Exp $
+ * @version $Id: LogSystem.java,v 1.3 2001/03/19 06:15:55 jon Exp $
*/
public interface LogSystem
{
@@ -84,8 +84,9 @@
* Prefix for error messages.
*/
public final static int ERROR_ID = 3;
-
- public void logVelocityMessage( int level, String messsage);
-
-}
+ /**
+ * Send a log message to Velocity.
+ */
+ public void logVelocityMessage(int level, String messsage);
+}
