freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [6/6] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Wed, 28 Feb 2018 19:51:09 GMT
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/49ab712c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/49ab712c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/49ab712c

Branch: refs/heads/2.3
Commit: 49ab712c9f6e8b3ed47d84e10fa299354c246d19
Parents: 0aab5d3 51c2476
Author: ddekany <ddekany@apache.org>
Authored: Wed Feb 28 20:50:51 2018 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Wed Feb 28 20:50:51 2018 +0100

----------------------------------------------------------------------
 src/main/java/freemarker/core/BuiltIn.java      |  12 +-
 .../java/freemarker/core/BuiltInsForDates.java  |   4 +-
 .../core/BuiltInsForExistenceHandling.java      |   2 +-
 .../core/BuiltInsForMultipleTypes.java          |   4 +-
 .../freemarker/core/BuiltInsForSequences.java   |   6 +-
 .../core/BuiltInsForStringsBasic.java           |   6 +-
 .../freemarker/core/BuiltInsForStringsMisc.java |   8 +-
 .../java/freemarker/core/BuiltinVariable.java   |  11 +-
 src/main/java/freemarker/core/Environment.java  |  23 +-
 src/main/java/freemarker/core/EvalUtil.java     |   8 +-
 .../core/GetOptionalTemplateMethod.java         | 202 ++++++++++
 src/main/java/freemarker/core/Interpret.java    |   8 +-
 .../java/freemarker/core/IteratorBlock.java     |  13 +-
 src/main/java/freemarker/core/Macro.java        |   2 +-
 src/main/java/freemarker/core/MessageUtil.java  | 354 ------------------
 .../java/freemarker/core/ParseException.java    |   2 +-
 .../freemarker/core/TemplateClassResolver.java  |   4 +-
 .../java/freemarker/core/TemplateObject.java    |   4 +-
 .../java/freemarker/core/TransformBlock.java    |   2 +-
 src/main/java/freemarker/core/UnifiedCall.java  |   4 +-
 ...nDateTypeFormattingUnsupportedException.java |   2 +-
 ...nownDateTypeParsingUnsupportedException.java |   2 +-
 .../java/freemarker/core/_DelayedAOrAn.java     |   2 +-
 src/main/java/freemarker/core/_MessageUtil.java | 371 +++++++++++++++++++
 .../template/utility/TemplateModelUtils.java    |  90 +++++
 src/main/javacc/FTL.jj                          |   2 +-
 src/manual/en_US/book.xml                       | 158 +++++++-
 .../core/GetOptionalTemplateTest.java           | 179 +++++++++
 .../template/utility/TemplateModelUtilTest.java | 160 ++++++++
 29 files changed, 1225 insertions(+), 420 deletions(-)
----------------------------------------------------------------------



Mime
View raw message