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 2019/08/01 21:07:11 UTC
[freemarker] branch 2.3 updated (e664754 -> bb4e76c)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from e664754 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add f195cfd fix very small grammar issue
add f00d8c2 Merge pull request #59 from vocatan/2.3-gae
add a1fd6ff Some more tests for the fallbackOnNullLoopVariable setting.
add 926f33e (Javadoc improvements, related to LocalContext and fallbackOnNullLoopVariable)
add 8660d28 Target value never will be a TemplateModelIterator; removed the handling of it from IntermediateStreamOperationLikeBuiltIn.
add 4c41a64 Fixed target type isSequence logic in IntermediateStreamOperationLikeBuiltIn.
add 2e98593 (Fixed import code style inconsistencies.)
add 44e30e0 (Moved IntermediateStreamOperationLikeBuiltIn out of BuiltInsForSequences, as it should be usable for FTL hash targets as well.)
add 1053eef Added ?take_while(predicate) and ?drop_while(predicate).
add 522747b Added missing change log entry for the new fallback_on_null_loop_variable configuration setting.
add ece9abc ?min and ?max will now immediately stop with error when applied on a right unbounded numerical range (like 1..), as that would run forever anyway.
add 32afaf1 (Adjusted import code style again, to fit the traditional settings)
new bb4e76c Merge remote-tracking branch 'origin/2.3-gae' into 2.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../IntelliJ-IDEA/Java-code-style-FreeMarker.xml | 3 +
src/main/java/freemarker/core/BuiltIn.java | 6 +-
.../java/freemarker/core/BuiltInsForSequences.java | 400 ++++++++++-----------
src/main/java/freemarker/core/Environment.java | 1 -
.../IntermediateStreamOperationLikeBuiltIn.java | 221 ++++++++++++
src/main/java/freemarker/core/LocalContext.java | 27 +-
src/main/java/freemarker/core/Macro.java | 4 -
src/main/java/freemarker/core/_MessageUtil.java | 6 +
.../ext/jsp/_FreeMarkerPageContext2.java | 15 +-
.../java/freemarker/template/Configuration.java | 12 +-
.../template/TemplateExceptionHandler.java | 14 +-
src/manual/en_US/book.xml | 36 +-
src/test/java/freemarker/core/FilterBiTest.java | 31 ++
src/test/java/freemarker/core/MinMaxBITest.java | 10 +
.../java/freemarker/core/NullTransparencyTest.java | 11 +-
.../java/freemarker/core/SequenceBuiltInTest.java | 3 +-
.../core/TakeWhileAndDropWhileBiTest.java | 148 ++++++++
.../freemarker/template/ConfigurationTest.java | 15 +
.../template/SimpleObjectWrapperTest.java | 4 +-
19 files changed, 710 insertions(+), 257 deletions(-)
create mode 100644 src/main/java/freemarker/core/IntermediateStreamOperationLikeBuiltIn.java
create mode 100644 src/test/java/freemarker/core/TakeWhileAndDropWhileBiTest.java
[freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae'
into 2.3
Posted by dd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit bb4e76cef7e31f80baf542b30619b1e1633dbacb
Merge: e664754 32afaf1
Author: ddekany <dd...@apache.org>
AuthorDate: Thu Aug 1 23:02:13 2019 +0200
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
.../IntelliJ-IDEA/Java-code-style-FreeMarker.xml | 3 +
src/main/java/freemarker/core/BuiltIn.java | 6 +-
.../java/freemarker/core/BuiltInsForSequences.java | 400 ++++++++++-----------
src/main/java/freemarker/core/Environment.java | 1 -
.../IntermediateStreamOperationLikeBuiltIn.java | 221 ++++++++++++
src/main/java/freemarker/core/LocalContext.java | 27 +-
src/main/java/freemarker/core/Macro.java | 4 -
src/main/java/freemarker/core/_MessageUtil.java | 6 +
.../ext/jsp/_FreeMarkerPageContext2.java | 15 +-
.../java/freemarker/template/Configuration.java | 12 +-
.../template/TemplateExceptionHandler.java | 14 +-
src/manual/en_US/book.xml | 36 +-
src/test/java/freemarker/core/FilterBiTest.java | 31 ++
src/test/java/freemarker/core/MinMaxBITest.java | 10 +
.../java/freemarker/core/NullTransparencyTest.java | 11 +-
.../java/freemarker/core/SequenceBuiltInTest.java | 3 +-
.../core/TakeWhileAndDropWhileBiTest.java | 148 ++++++++
.../freemarker/template/ConfigurationTest.java | 15 +
.../template/SimpleObjectWrapperTest.java | 4 +-
19 files changed, 710 insertions(+), 257 deletions(-)