diff options
| author | Claude Brisson <cbrisson@apache.org> | 2015-08-31 21:06:34 +0000 |
|---|---|---|
| committer | Claude Brisson <cbrisson@apache.org> | 2015-08-31 21:06:34 +0000 |
| commit | 32273e3c5dc553708106a3617b2c40914a0aba7b (patch) | |
| tree | c5b19fbc523ece03626245521b347869ff8e4272 /velocity-engine-core/src/main/java/org/apache/velocity/exception | |
| parent | 36ea06e436c0ccb5180e2c82e0163a37d46cc7a4 (diff) | |
| download | apache-velocity-engine-32273e3c5dc553708106a3617b2c40914a0aba7b.tar.gz | |
[engine] switch to slf4j logging facade
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1700350 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/main/java/org/apache/velocity/exception')
2 files changed, 4 insertions, 4 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java b/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java index bffe8dfc..1fbc1ea6 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java @@ -1,6 +1,6 @@ package org.apache.velocity.exception; -import org.apache.velocity.runtime.log.Log; +import org.apache.velocity.util.StringUtils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -134,7 +134,7 @@ public class MethodInvocationException extends VelocityException implements Exte StringBuffer message = new StringBuffer(); message.append(super.getMessage()); message.append(" at "); - message.append(Log.formatFileString(templateName, lineNumber, columnNumber)); + message.append(StringUtils.formatFileString(templateName, lineNumber, columnNumber)); return message.toString(); } } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java b/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java index ddec5da4..5ceb1d78 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java @@ -22,9 +22,9 @@ package org.apache.velocity.exception; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.ParseException; import org.apache.velocity.util.introspection.Info; +import org.apache.velocity.util.StringUtils; /** * Application-level exception thrown when a resource of any type @@ -116,7 +116,7 @@ public class ParseErrorException extends VelocityException columnNumber = Integer.parseInt(match.group(2)); String restOfMsg = match.group(3); msg = "Lexical error, " + restOfMsg + " at " - + Log.formatFileString(templateName, lineNumber, columnNumber); + + StringUtils.formatFileString(templateName, lineNumber, columnNumber); } // ugly, ugly, ugly... |