freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [5/5] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Tue, 29 Sep 2015 00:06:01 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/4b1550e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/4b1550e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/4b1550e7

Branch: refs/heads/2.3
Commit: 4b1550e786f5ec51f1b95cc4ca4e7836c09351c2
Parents: 84927d9 c798862
Author: ddekany <ddekany@apache.org>
Authored: Tue Sep 29 02:02:48 2015 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Tue Sep 29 02:02:48 2015 +0200

----------------------------------------------------------------------
 .../freemarker/core/AddConcatExpression.java    |  21 ++--
 src/main/java/freemarker/core/Assignment.java   |   9 +-
 .../core/BuiltInForLegacyEscaping.java          |   4 +-
 .../BuiltInForMarkupOutputFormatRelated.java    |  46 -------
 .../core/BuiltInForOutputFormatRelated.java     |  46 -------
 .../java/freemarker/core/BuiltInForString.java  |   2 +-
 .../core/BuiltInsForMultipleTypes.java          |  14 +--
 .../core/BuiltInsForOutputFormatRelated.java    |   7 +-
 .../freemarker/core/BuiltInsForSequences.java   |   2 +-
 .../core/BuiltInsForStringsBasic.java           |   6 +-
 .../core/BuiltInsForStringsEncoding.java        |  26 +---
 .../freemarker/core/BuiltInsForStringsMisc.java |   2 +-
 .../java/freemarker/core/DollarVariable.java    |   6 +-
 .../java/freemarker/core/DynamicKeyName.java    |   4 +-
 src/main/java/freemarker/core/Environment.java  |  18 +--
 src/main/java/freemarker/core/EvalUtil.java     | 126 +++++++++++++++----
 src/main/java/freemarker/core/Expression.java   |  30 ++++-
 src/main/java/freemarker/core/HashLiteral.java  |   4 +-
 .../core/ISOLikeTemplateDateFormat.java         |   2 +-
 src/main/java/freemarker/core/Include.java      |   6 +-
 src/main/java/freemarker/core/Interpret.java    |   6 +-
 .../freemarker/core/JavaTemplateDateFormat.java |   2 +-
 .../core/JavaTemplateNumberFormat.java          |   2 +-
 src/main/java/freemarker/core/LibraryLoad.java  |   2 +-
 src/main/java/freemarker/core/ListLiteral.java  |   4 +-
 .../core/MarkupOutputFormatBoundBuiltIn.java    |  46 +++++++
 src/main/java/freemarker/core/NewBI.java        |   2 +-
 .../java/freemarker/core/NumberLiteral.java     |   4 +-
 .../core/OutputFormatBoundBuiltIn.java          |  46 +++++++
 .../java/freemarker/core/PropertySetting.java   |   2 +-
 .../java/freemarker/core/StopInstruction.java   |   2 +-
 .../java/freemarker/core/StringLiteral.java     |   4 +-
 .../freemarker/core/TemplateDateFormat.java     |  21 ++--
 .../freemarker/core/TemplateNumberFormat.java   |  19 ++-
 .../java/freemarker/ext/beans/BeanModel.java    |   8 +-
 src/main/javacc/FTL.jj                          |  14 +--
 src/manual/book.xml                             |  34 ++---
 .../core/AppMetaTemplateDateFormatFactory.java  |   2 +-
 .../core/BaseNTemplateNumberFormatFactory.java  |   4 +-
 .../freemarker/core/CorectionToTextualTest.java | 119 ++++++++++++++++++
 .../java/freemarker/core/DateFormatTest.java    |  34 ++---
 ...EpochMillisDivTemplateDateFormatFactory.java |   2 +-
 .../EpochMillisTemplateDateFormatFactory.java   |   2 +-
 .../core/HTMLISOTemplateDateFormatFactory.java  | 104 +++++++++++++++
 .../core/HexTemplateNumberFormatFactory.java    |   2 +-
 ...AndTZSensitiveTemplateDateFormatFactory.java |   2 +-
 ...aleSensitiveTemplateNumberFormatFactory.java |   2 +-
 .../java/freemarker/core/NumberFormatTest.java  |  30 +++--
 .../PrintfGTemplateNumberFormatFactory.java     |  11 +-
 49 files changed, 594 insertions(+), 319 deletions(-)
----------------------------------------------------------------------



Mime
View raw message