Repository: incubator-freemarker Updated Branches: refs/heads/3 52d114257 -> fd23c6444
(It's important that the input of the list merger methods must be immutable themselves, so I have named this methods back.) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/fd23c644 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/fd23c644 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/fd23c644 Branch: refs/heads/3 Commit: fd23c6444836a1b4f151ab87a7e656ab7d126249 Parents: 52d1142 Author: ddekany <ddek...@apache.org> Authored: Thu Jul 6 10:33:02 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Thu Jul 6 10:33:02 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/freemarker/core/Configuration.java | 2 +- .../apache/freemarker/core/TemplateConfiguration.java | 2 +- .../apache/freemarker/core/util/_CollectionUtil.java | 12 ++++++------ .../apache/freemarker/servlet/FreemarkerServlet.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fd23c644/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 01ba1b2..9f31556 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 @@ -434,7 +434,7 @@ public final class Configuration implements TopLevelConfiguration, CustomStateSc builder.getImpliedCustomNumberFormats(), builder.getCustomNumberFormats(), false); autoImports = _CollectionUtil.mergeImmutableMaps( builder.getImpliedAutoImports(), builder.getAutoImports(), true); - autoIncludes = _CollectionUtil.mergeTwoListsToImmutableList( + autoIncludes = _CollectionUtil.mergeImmutableLists( builder.getImpliedAutoIncludes(), builder.getAutoIncludes(), true); lazyImports = builder.getLazyImports(); lazyAutoImports = builder.getLazyAutoImports(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fd23c644/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java b/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java index 019c3f6..17583e5 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java @@ -876,7 +876,7 @@ public final class TemplateConfiguration implements ParsingAndProcessingConfigur true); } if (tc.isAutoIncludesSet()) { - setAutoIncludes(_CollectionUtil.mergeTwoListsToImmutableList( + setAutoIncludes(_CollectionUtil.mergeImmutableLists( isAutoIncludesSet() ? getAutoIncludes() : null, tc.isAutoIncludesSet() ? tc.getAutoIncludes() : null, true), http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fd23c644/freemarker-core/src/main/java/org/apache/freemarker/core/util/_CollectionUtil.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/util/_CollectionUtil.java b/freemarker-core/src/main/java/org/apache/freemarker/core/util/_CollectionUtil.java index 7cafed3..af98987 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/util/_CollectionUtil.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/util/_CollectionUtil.java @@ -174,20 +174,20 @@ public class _CollectionUtil { * Adds multiple {@link List}-s; assuming the inputs are already unmodifiable and unchanging, it returns an * unmodifiable and unchanging {@link List} itself. */ - public static <T> List<T> mergeListsToImmutableList(boolean skipDuplicatesInList1, List<T> ... lists) { + public static <T> List<T> mergeImmutableLists(boolean skipDuplicatesInList1, List<T> ... lists) { if (lists == null || lists.length == 0) { return null; } if (lists.length == 1) { - return mergeTwoListsToImmutableList(lists[0], null, skipDuplicatesInList1); + return mergeImmutableLists(lists[0], null, skipDuplicatesInList1); } else if (lists.length == 2) { - return mergeTwoListsToImmutableList(lists[0], lists[1], skipDuplicatesInList1); + return mergeImmutableLists(lists[0], lists[1], skipDuplicatesInList1); } else { List<T> [] reducedLists = new List[lists.length - 1]; - reducedLists[0] = mergeTwoListsToImmutableList(lists[0], lists[1], skipDuplicatesInList1); + reducedLists[0] = mergeImmutableLists(lists[0], lists[1], skipDuplicatesInList1); System.arraycopy(lists, 2, reducedLists, 1, lists.length - 2); - return mergeListsToImmutableList(skipDuplicatesInList1, reducedLists); + return mergeImmutableLists(skipDuplicatesInList1, reducedLists); } } @@ -195,7 +195,7 @@ public class _CollectionUtil { * Adds two {@link List}-s; assuming the inputs are already unmodifiable and unchanging, it returns an * unmodifiable and unchanging {@link List} itself. */ - public static <T> List<T> mergeTwoListsToImmutableList(List<T> list1, List<T> list2, + public static <T> List<T> mergeImmutableLists(List<T> list1, List<T> list2, boolean skipDuplicatesInList1) { if (list1 == null) return list2; if (list2 == null) return list1; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fd23c644/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java index bd3ffc9..b92f2bd 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java @@ -1035,10 +1035,10 @@ public class FreemarkerServlet extends HttpServlet { } return new TaglibFactory.Builder(servletContext, objectWrapper) - .metaInfTldSources(_CollectionUtil.mergeListsToImmutableList(true, metaInfTldSources, + .metaInfTldSources(_CollectionUtil.mergeImmutableLists(true, metaInfTldSources, metaInfTldSourcesFromSysProp, jettyMetaInfTldSources)) .classpathTlds( - _CollectionUtil.mergeTwoListsToImmutableList(classpathTlds, classpathTldsFromSysProp, true)) + _CollectionUtil.mergeImmutableLists(classpathTlds, classpathTldsFromSysProp, true)) .build(); }
