You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/08/25 23:39:45 UTC
[19/19] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b2578291
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b2578291
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b2578291
Branch: refs/heads/2.3
Commit: b2578291026b6347e891a6707caf90a956bf7dfd
Parents: a5fb351 a4a406a
Author: ddekany <dd...@apache.org>
Authored: Sat Aug 26 01:38:49 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sat Aug 26 01:38:49 2017 +0200
----------------------------------------------------------------------
README.md | 2 +-
.../core/BuiltInsForMultipleTypes.java | 4 +-
.../freemarker/core/BuiltInsForSequences.java | 6 +-
.../core/BuiltInsForStringsEncoding.java | 16 +++---
.../core/BuiltInsForStringsRegexp.java | 12 ++--
.../core/InvalidReferenceException.java | 2 +-
src/main/java/freemarker/core/Macro.java | 3 +-
.../java/freemarker/core/StringLiteral.java | 12 ++--
.../core/UnexpectedTypeException.java | 2 +-
.../java/freemarker/ext/beans/BeanModel.java | 18 ++++--
.../java/freemarker/ext/beans/BeansWrapper.java | 16 +++++-
.../ext/beans/ClassBasedModelFactory.java | 5 +-
.../freemarker/ext/beans/SimpleMethodModel.java | 21 ++++---
.../java/freemarker/template/Configuration.java | 12 ++++
.../template/GeneralPurposeNothing.java | 2 +-
.../freemarker/template/SimpleCollection.java | 23 +++++---
.../template/TemplateCollectionModel.java | 12 ++--
.../template/TemplateCollectionModelEx.java | 4 +-
.../template/TemplateModelException.java | 3 +-
.../template/TemplateScalarModel.java | 14 +++--
.../java/freemarker/template/_TemplateAPI.java | 1 +
.../freemarker/template/utility/Constants.java | 11 ++--
src/main/javacc/FTL.jj | 35 +++++++-----
src/manual/en_US/book.xml | 47 ++++++++++++++--
.../java/freemarker/core/ListErrorsTest.java | 5 ++
.../ext/beans/BeansWrapperMiscTest.java | 58 +++++++++++++++++++-
.../template/DefaultObjectWrapperTest.java | 2 +-
27 files changed, 252 insertions(+), 96 deletions(-)
----------------------------------------------------------------------