freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: Removed long deprecated `?webSafe` (replaced by `?html`)
Date Mon, 17 Jul 2017 10:44:23 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 704a83a7d -> c622e112b


Removed long deprecated `?webSafe` (replaced by `?html`)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c622e112
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c622e112
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c622e112

Branch: refs/heads/3
Commit: c622e112b0a233b1f1d4b05347a56f7de5a50aba
Parents: 704a83a
Author: ddekany <ddekany@apache.org>
Authored: Mon Jul 17 12:44:18 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Mon Jul 17 12:44:18 2017 +0200

----------------------------------------------------------------------
 FM3-CHANGE-LOG.txt                                                | 2 ++
 .../src/main/java/org/apache/freemarker/core/ASTExpBuiltIn.java   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c622e112/FM3-CHANGE-LOG.txt
----------------------------------------------------------------------
diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt
index 1dfe8be..51caf23 100644
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@ -59,6 +59,8 @@ Node: Changes already mentioned above aren't repeated here!
 - Removed long deprecated `#{}` interpolations. They are treated as plain static text now.
   Converter note: The template converter tool translates these to `${}` interpolations. For
example `#{x}` is simply
   translated to `${b}`, while `#{x; m1M3}` is translated to `${x?string('0.0##')}`). The
output should remain the same.
+- Removed some long deprecated built-ins:
+  - `webSafe` (converted to `html`)
 - #include has no "encoding" parameter anymore (as now only the Configuration is responsible
ofr deciding the encoding)
 - You can't close #attempt/#recover with `</#recover>` anymore, only with `<#attempt>`.
This was the
   standard form in FM2 as well, and is consistent with how #if/#else works. (The template
converter

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c622e112/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltIn.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltIn.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltIn.java
index 58b0127..c658ba8 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltIn.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltIn.java
@@ -77,7 +77,7 @@ abstract class ASTExpBuiltIn extends ASTExpression implements Cloneable
{
     protected ASTExpression target;
     protected String key;
 
-    static final int NUMBER_OF_BIS = 263;
+    static final int NUMBER_OF_BIS = 262;
     static final HashMap<String, ASTExpBuiltIn> BUILT_INS_BY_NAME = new HashMap(NUMBER_OF_BIS
* 3 / 2 + 1, 1f);
 
     static {
@@ -275,7 +275,6 @@ abstract class ASTExpBuiltIn extends ASTExpression implements Cloneable
{
         putBI("url", new BuiltInsForStringsEncoding.urlBI());
         putBI("urlPath", new BuiltInsForStringsEncoding.urlPathBI());
         putBI("values", new BuiltInsForHashes.valuesBI());
-        putBI("webSafe", BUILT_INS_BY_NAME.get("html"));  // deprecated; use ?html instead
         putBI("wordList", new BuiltInsForStringsBasic.word_listBI());
         putBI("xhtml", new BuiltInsForStringsEncoding.xhtmlBI());
         putBI("xml", new BuiltInsForStringsEncoding.xmlBI());


Mime
View raw message