aboutsummaryrefslogtreecommitdiff
path: root/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java
diff options
context:
space:
mode:
Diffstat (limited to 'velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java')
-rw-r--r--velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java
index c5673f0f..44d3f08c 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java
@@ -220,7 +220,7 @@ public class Macro extends Directive
// trim off the leading $ for the args after the macro name.
// saves everyone else from having to do it
- if (i > 0 && macroArg.name.startsWith(String.valueOf(rsvc.dollar())))
+ if (i > 0 && macroArg.name.startsWith(String.valueOf(rsvc.getParserConfiguration().getDollarChar())))
{
macroArg.name = macroArg.name.substring(1);
}
@@ -273,10 +273,10 @@ public class Macro extends Directive
{
StringBuilder ret = (buf == null) ? new StringBuilder() : buf;
- ret.append(rsvc.hash()).append(macroArgs.get(0).name).append("( ");
+ ret.append(rsvc.getParserConfiguration().getHashChar()).append(macroArgs.get(0).name).append("( ");
for (MacroArg marg : macroArgs)
{
- ret.append(rsvc.dollar()).append(marg.name);
+ ret.append(rsvc.getParserConfiguration().getDollarChar()).append(marg.name);
if (marg.defaultVal != null)
{
ret.append("=").append(marg.defaultVal);