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 some legacy setting name aliases, using them only for setting name error hints.)
Date Mon, 12 Jun 2017 16:57:29 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 1efaf3364 -> 34c767555


(Removed some legacy setting name aliases, using them only for setting name error hints.)


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

Branch: refs/heads/3
Commit: 34c76755518db9ed88bb438afd746548f2f12c83
Parents: 1efaf33
Author: ddekany <ddekany@apache.org>
Authored: Mon Jun 12 18:57:22 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Mon Jun 12 18:57:22 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/freemarker/core/Configuration.java  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/34c76755/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java b/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java
index a0bc182..7009bfa 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java
@@ -1761,13 +1761,6 @@ public final class Configuration implements TopLevelConfiguration,
CustomStateSc
         public void setSetting(String name, String value) throws ConfigurationException {
             boolean nameUnhandled = false;
             try {
-                // TODO [FM3] Do we still need this?
-                if ("TemplateUpdateInterval".equalsIgnoreCase(name)) {
-                    name = TEMPLATE_UPDATE_DELAY_KEY;
-                } else if ("DefaultEncoding".equalsIgnoreCase(name)) {
-                    name = SOURCE_ENCODING_KEY;
-                }
-
                 if (LOCALIZED_TEMPLATE_LOOKUP_KEY_SNAKE_CASE.equals(name)
                         || LOCALIZED_TEMPLATE_LOOKUP_KEY_CAMEL_CASE.equals(name)) {
                     setLocalizedTemplateLookup(_StringUtil.getYesNo(value));
@@ -1959,7 +1952,7 @@ public final class Configuration implements TopLevelConfiguration, CustomStateSc
                 // [2.4] Default might changes to camel-case
                 return SOURCE_ENCODING_KEY;
             }
-            if ("defaultEncoding".equals(name) || "defaultCharset".equals(name)) {
+            if ("defaultEncoding".equalsIgnoreCase(name) || "defaultCharset".equals(name))
{
                 return SOURCE_ENCODING_KEY_CAMEL_CASE;
             }
             if (name.equals("incompatible_enhancements")) {
@@ -1980,6 +1973,9 @@ public final class Configuration implements TopLevelConfiguration, CustomStateSc
             if (name.equals("localized_lookup")) {
                 return LOCALIZED_TEMPLATE_LOOKUP_KEY_SNAKE_CASE;
             }
+            if ("TemplateUpdateInterval".equalsIgnoreCase(name)) {
+                return TEMPLATE_UPDATE_DELAY_KEY;
+            }
 
             return super.getCorrectedNameForUnknownSetting(name);
         }


Mime
View raw message