Repository: freemarker Updated Branches: refs/heads/2.3-gae b1f09561f -> 390fe65c6
Fixed a typo in an old Configuration method name Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/5442e2dc Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/5442e2dc Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/5442e2dc Branch: refs/heads/2.3-gae Commit: 5442e2dc88ea9a578f0e368222b680cd53b1a4ed Parents: b1f0956 Author: ddekany <ddek...@apache.org> Authored: Wed Sep 12 08:47:59 2018 +0200 Committer: ddekany <ddek...@apache.org> Committed: Wed Sep 12 08:47:59 2018 +0200 ---------------------------------------------------------------------- src/main/java/freemarker/template/Configuration.java | 12 ++++++++++-- .../freemarker/template/utility/TemplateModelUtils.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/freemarker/blob/5442e2dc/src/main/java/freemarker/template/Configuration.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java index 814eed8..650ee80 100644 --- a/src/main/java/freemarker/template/Configuration.java +++ b/src/main/java/freemarker/template/Configuration.java @@ -3009,14 +3009,22 @@ public class Configuration extends Configurable implements Cloneable, ParserConf * * @throws TemplateModelException If some of the variables couldn't be wrapped via {@link #getObjectWrapper()}. * - * @since 2.3.21 + * @since 2.3.29 */ - public void setSharedVaribles(Map/*<String, Object>*/ map) throws TemplateModelException { + public void setSharedVariables(Map<String, ?> map) throws TemplateModelException { rewrappableSharedVariables = new HashMap(map); sharedVariables.clear(); setSharedVariablesFromRewrappableSharedVariables(); } + /** + * Same as {@link #setSharedVariables(Map)}, but with typo in the name. + * @since 2.3.21 + * @deprecated Use {@link #setSharedVariables(Map)} instead. + */ + public void setSharedVaribles(Map/*<String, Object>*/ map) throws TemplateModelException { + } + private void setSharedVariablesFromRewrappableSharedVariables() throws TemplateModelException { if (rewrappableSharedVariables == null) return; for (Iterator it = rewrappableSharedVariables.entrySet().iterator(); it.hasNext(); ) { http://git-wip-us.apache.org/repos/asf/freemarker/blob/5442e2dc/src/main/java/freemarker/template/utility/TemplateModelUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/utility/TemplateModelUtils.java b/src/main/java/freemarker/template/utility/TemplateModelUtils.java index 38851f6..c721a11 100644 --- a/src/main/java/freemarker/template/utility/TemplateModelUtils.java +++ b/src/main/java/freemarker/template/utility/TemplateModelUtils.java @@ -122,7 +122,7 @@ public final class TemplateModelUtils { * This method is typical used when you want to compose a data-model from multiple objects in a way so that their * entries ({@link Map} key-value pairs, bean properties, etc.) appear together on the top level of the data-model. * In such case, use the return value of this method as the combined data-model. Note that this functionality - * somewhat overlaps with {@link Configuration#setSharedVaribles(Map)}; check if that fits your use case better. + * somewhat overlaps with {@link Configuration#setSharedVariables(Map)}; check if that fits your use case better. * * @param objectWrapper * {@link ObjectWrapper} used to wrap the elements of {@code hashLikeObjects}, except those that are
