Repository: incubator-freemarker Updated Branches: refs/heads/3 71860acdc -> 8a2cf2795
Removed the `.currentNode` (`.current_node`) special variable, which was a deprecated alias to `.node` Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/8a2cf279 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/8a2cf279 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/8a2cf279 Branch: refs/heads/3 Commit: 8a2cf2795111dc71c58738c7de836c12e0a2a88c Parents: 71860ac Author: ddekany <[email protected]> Authored: Mon Jul 17 11:55:52 2017 +0200 Committer: ddekany <[email protected]> Committed: Mon Jul 17 11:56:27 2017 +0200 ---------------------------------------------------------------------- FM3-CHANGE-LOG.txt | 2 ++ .../main/java/freemarker/core/FM2ASTToFM3SourceConverter.java | 4 +++- .../java/org/freemarker/converter/FM2ToFM3ConverterTest.java | 1 + .../java/org/apache/freemarker/core/ASTExpBuiltInVariable.java | 4 +--- .../src/main/java/org/apache/freemarker/core/Environment.java | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a2cf279/FM3-CHANGE-LOG.txt ---------------------------------------------------------------------- diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt index 3d32e15..5a51357 100644 --- a/FM3-CHANGE-LOG.txt +++ b/FM3-CHANGE-LOG.txt @@ -67,6 +67,8 @@ Node: Changes already mentioned above aren't repeated here! - #else and #elseIf tags must be ended without "/", for example, <#else/> is illegal now, <#else> is legal. - Renamed `?datetime` and `?datetimeIfUnknown` and the `datetimeFormat` setting to `?dateTime` and `?dateTimeIfUnknown` and `dateTimeFormat`. (In general, it's `dateTime`, not `datetime` everywhere.) + assertConverted("${.outputFormat}","${.output_format}"); +- Removed the `.currentNode` (`.current_node`) special variable, which was a deprecated alias to `.node` Java API changes http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a2cf279/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java ---------------------------------------------------------------------- diff --git a/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java b/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java index db61f98..b4b7f99 100644 --- a/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java +++ b/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java @@ -1515,7 +1515,9 @@ public class FM2ASTToFM3SourceConverter { private String convertBuiltInVariableName(String name) throws ConverterException { String converted = name.indexOf('_') == -1 ? name : _StringUtil.snakeCaseToCamelCase(name); - // Will replace removed names here + if (converted.equals("currentNode")) { + converted = "node"; + } return converted; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a2cf279/freemarker-converter/src/test/java/org/freemarker/converter/FM2ToFM3ConverterTest.java ---------------------------------------------------------------------- diff --git a/freemarker-converter/src/test/java/org/freemarker/converter/FM2ToFM3ConverterTest.java b/freemarker-converter/src/test/java/org/freemarker/converter/FM2ToFM3ConverterTest.java index aaa523c..9832d73 100644 --- a/freemarker-converter/src/test/java/org/freemarker/converter/FM2ToFM3ConverterTest.java +++ b/freemarker-converter/src/test/java/org/freemarker/converter/FM2ToFM3ConverterTest.java @@ -120,6 +120,7 @@ public class FM2ToFM3ConverterTest extends ConverterTest { assertConvertedSame("${.outputFormat}"); assertConvertedSame("${. <#-- C --> outputFormat}"); assertConverted("${.outputFormat}","${.output_format}"); + assertConverted("${.node}","${.current_node}"); assertConvertedSame("${a < b}${a <= b}${(a > b)}${(a >= b)}${a == b}${a != b}"); assertConvertedSame("${a<#--1--><<#--2-->b}${a<#--3--><=<#--4-->b}" http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a2cf279/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java index f9439de..343363a 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java @@ -48,7 +48,6 @@ final class ASTExpBuiltInVariable extends ASTExpression { static final String LANG = "lang"; static final String LOCALE = "locale"; static final String LOCALE_OBJECT = "localeObject"; - static final String CURRENT_NODE = "currentNode"; static final String NODE = "node"; static final String PASS = "pass"; static final String VARS = "vars"; @@ -64,7 +63,6 @@ final class ASTExpBuiltInVariable extends ASTExpression { static final Set<String> BUILT_IN_VARIABLE_NAMES = new _SortedArraySet<>( // Must be sorted alphabetically! AUTO_ESC, - CURRENT_NODE, CURRENT_TEMPLATE_NAME, DATA_MODEL, ERROR, @@ -167,7 +165,7 @@ final class ASTExpBuiltInVariable extends ASTExpression { if (name == LANG) { return new SimpleScalar(env.getLocale().getLanguage()); } - if (name == CURRENT_NODE || name == NODE) { + if (name == NODE) { return env.getCurrentVisitorNode(); } if (name == MAIN_TEMPLATE_NAME) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a2cf279/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java b/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java index 93bac28..28b85f4 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java @@ -2505,7 +2505,7 @@ public final class Environment extends MutableProcessingConfiguration<Environmen } /** - * sets TemplateNodeModel as the current visitor node. <tt>.current_node</tt> + * sets TemplateNodeModel as the current visitor node. <tt>.node</tt> */ public void setCurrentVisitorNode(TemplateNodeModel node) { currentVisitorNode = node;
