Repository: incubator-freemarker Updated Branches: refs/heads/3 27a62ce01 -> 88baea20c
(Added TemplateLanguage to auto-import for object builder expressions. Some JavaDoc cleanup.) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/23f66ebc Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/23f66ebc Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/23f66ebc Branch: refs/heads/3 Commit: 23f66ebcab168cb37513107f67ec00236dfe9517 Parents: 27a62ce Author: ddekany <[email protected]> Authored: Wed Mar 29 11:02:18 2017 +0200 Committer: ddekany <[email protected]> Committed: Wed Mar 29 11:02:18 2017 +0200 ---------------------------------------------------------------------- .../freemarker/core/MutableProcessingConfiguration.java | 9 ++++----- .../freemarker/core/_ObjectBuilderSettingEvaluator.java | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/23f66ebc/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java b/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java index d9200b0..a1e756a 100644 --- a/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java +++ b/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java @@ -356,11 +356,10 @@ public abstract class MutableProcessingConfiguration<SelfT extends MutableProces private boolean lazyAutoImportsSet; /** - * Intended to be called from inside FreeMarker only. - * Creates a top-level configurable, one that doesn't inherit from a parent, and thus stores the default values. - * Called by the {@link Configuration} constructor. + * Called by the {@link Configuration} constructor, initializes the fields to their {@link Configuration}-level + * default without marking them as set. */ - protected MutableProcessingConfiguration(Version incompatibleImprovements) { + MutableProcessingConfiguration(Version incompatibleImprovements) { _CoreAPI.checkVersionNotNullAndSupported(incompatibleImprovements); parent = null; locale = Configuration.getDefaultLocale(); @@ -2263,7 +2262,7 @@ public abstract class MutableProcessingConfiguration<SelfT extends MutableProces * {@link AndMatcher}, {@link OrMatcher}, {@link NotMatcher}, {@link ConditionalTemplateConfigurationFactory}, * {@link MergingTemplateConfigurationFactory}, {@link FirstMatchTemplateConfigurationFactory}, * {@link HTMLOutputFormat}, {@link XMLOutputFormat}, {@link RTFOutputFormat}, {@link PlainTextOutputFormat}, - * {@link UndefinedOutputFormat}, {@link Configuration}. + * {@link UndefinedOutputFormat}, {@link Configuration}, {@link TemplateLanguage}. * </li> * <li> * <p>{@link TimeZone} objects can be created like {@code TimeZone("UTC")}, despite that there's no a such http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/23f66ebc/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java b/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java index c817517..cc96d81 100644 --- a/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java +++ b/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java @@ -679,7 +679,9 @@ public class _ObjectBuilderSettingEvaluator { addWithSimpleName(SHORTHANDS, RTFOutputFormat.class); addWithSimpleName(SHORTHANDS, PlainTextOutputFormat.class); addWithSimpleName(SHORTHANDS, UndefinedOutputFormat.class); - + + addWithSimpleName(SHORTHANDS, TemplateLanguage.class); + addWithSimpleName(SHORTHANDS, Locale.class); {
