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 2022/12/26 23:28:42 UTC
[freemarker] branch 2.3 updated (cf2bf365 -> 17696bc3)
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 cf2bf365 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add f3d9d89e (Javadoc adjustments)
add 782daab2 ?c now works on strings, and it outputs a quoted string literal that's compatible with JSON, and JavaScript. Added ?cn to format missing/null values. Added cFormat setting to specify in what language should ?c output the values.
new 17696bc3 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:
.../freemarker/core/AbstractJSONLikeFormat.java | 76 ++
.../freemarker/core/AbstractLegacyCFormat.java | 105 +++
src/main/java/freemarker/core/BuiltIn.java | 3 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 139 +---
src/main/java/freemarker/core/CFormat.java | 80 ++
.../freemarker/core/CTemplateNumberFormat.java | 44 +-
.../freemarker/core/CommonMarkupOutputFormat.java | 10 +
src/main/java/freemarker/core/Configurable.java | 203 +++---
.../java/freemarker/core/Default230CFormat.java | 73 ++
.../java/freemarker/core/Default2321CFormat.java | 72 ++
src/main/java/freemarker/core/Environment.java | 212 ++++--
src/main/java/freemarker/core/EvalUtil.java | 2 +-
src/main/java/freemarker/core/JSONCFormat.java | 56 ++
src/main/java/freemarker/core/JavaCFormat.java | 87 +++
...backInstruction.java => JavaScriptCFormat.java} | 56 +-
.../freemarker/core/JavaTemplateNumberFormat.java | 2 +-
.../java/freemarker/core/MarkupOutputFormat.java | 8 +-
src/main/java/freemarker/core/PropertySetting.java | 32 +-
.../freemarker/core/TemplateConfiguration.java | 9 +-
.../freemarker/core/TemplateMarkupOutputModel.java | 4 +-
src/main/java/freemarker/core/XSCFormat.java | 91 +++
...{BugException.java => _StandardCLanguages.java} | 38 +-
.../java/freemarker/template/Configuration.java | 57 +-
.../java/freemarker/template/_TemplateAPI.java | 7 +-
.../freemarker/template/utility/StringUtil.java | 166 +++--
src/manual/en_US/book.xml | 812 ++++++++++++++++++---
...va => BooleanFormatEnvironmentCachingTest.java} | 42 +-
.../java/freemarker/core/CAndCnBuiltInTest.java | 142 ++++
.../java/freemarker/core/CFormatTemplateTest.java | 73 ++
.../freemarker/core/CTemplateNumberFormatTest.java | 11 +-
src/test/java/freemarker/core/CustomCFormat.java | 83 +++
.../java/freemarker/core/NumberFormatTest.java | 7 +-
.../freemarker/core/TemplateConfigurationTest.java | 1 +
.../freemarker/template/ConfigurationTest.java | 58 +-
.../template/utility/StringUtilTest.java | 2 +-
.../test/templatesuite/templates/number-format.ftl | 42 +-
36 files changed, 2328 insertions(+), 577 deletions(-)
create mode 100644 src/main/java/freemarker/core/AbstractJSONLikeFormat.java
create mode 100644 src/main/java/freemarker/core/AbstractLegacyCFormat.java
create mode 100644 src/main/java/freemarker/core/CFormat.java
create mode 100644 src/main/java/freemarker/core/Default230CFormat.java
create mode 100644 src/main/java/freemarker/core/Default2321CFormat.java
create mode 100644 src/main/java/freemarker/core/JSONCFormat.java
create mode 100644 src/main/java/freemarker/core/JavaCFormat.java
copy src/main/java/freemarker/core/{FallbackInstruction.java => JavaScriptCFormat.java} (50%)
create mode 100644 src/main/java/freemarker/core/XSCFormat.java
copy src/main/java/freemarker/core/{BugException.java => _StandardCLanguages.java} (50%)
copy src/test/java/freemarker/core/{NumberBiTest.java => BooleanFormatEnvironmentCachingTest.java} (55%)
create mode 100644 src/test/java/freemarker/core/CAndCnBuiltInTest.java
create mode 100644 src/test/java/freemarker/core/CFormatTemplateTest.java
create mode 100644 src/test/java/freemarker/core/CustomCFormat.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 17696bc3f906a1674c21cbd5fc9e27d657df9666
Merge: cf2bf365 782daab2
Author: ddekany <dd...@apache.org>
AuthorDate: Tue Dec 27 00:28:26 2022 +0100
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
.../freemarker/core/AbstractJSONLikeFormat.java | 76 ++
.../freemarker/core/AbstractLegacyCFormat.java | 105 +++
src/main/java/freemarker/core/BuiltIn.java | 3 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 139 +---
src/main/java/freemarker/core/CFormat.java | 80 ++
.../freemarker/core/CTemplateNumberFormat.java | 44 +-
.../freemarker/core/CommonMarkupOutputFormat.java | 10 +
src/main/java/freemarker/core/Configurable.java | 203 +++---
.../java/freemarker/core/Default230CFormat.java | 73 ++
.../java/freemarker/core/Default2321CFormat.java | 72 ++
src/main/java/freemarker/core/Environment.java | 212 ++++--
src/main/java/freemarker/core/EvalUtil.java | 2 +-
src/main/java/freemarker/core/JSONCFormat.java | 56 ++
src/main/java/freemarker/core/JavaCFormat.java | 87 +++
.../java/freemarker/core/JavaScriptCFormat.java | 51 ++
.../freemarker/core/JavaTemplateNumberFormat.java | 2 +-
.../java/freemarker/core/MarkupOutputFormat.java | 8 +-
src/main/java/freemarker/core/PropertySetting.java | 32 +-
.../freemarker/core/TemplateConfiguration.java | 9 +-
.../freemarker/core/TemplateMarkupOutputModel.java | 4 +-
src/main/java/freemarker/core/XSCFormat.java | 91 +++
.../java/freemarker/core/_StandardCLanguages.java | 40 +
.../java/freemarker/template/Configuration.java | 57 +-
.../java/freemarker/template/_TemplateAPI.java | 7 +-
.../freemarker/template/utility/StringUtil.java | 166 +++--
src/manual/en_US/book.xml | 812 ++++++++++++++++++---
.../core/BooleanFormatEnvironmentCachingTest.java | 57 ++
.../java/freemarker/core/CAndCnBuiltInTest.java | 142 ++++
.../java/freemarker/core/CFormatTemplateTest.java | 73 ++
.../freemarker/core/CTemplateNumberFormatTest.java | 11 +-
src/test/java/freemarker/core/CustomCFormat.java | 83 +++
.../java/freemarker/core/NumberFormatTest.java | 7 +-
.../freemarker/core/TemplateConfigurationTest.java | 1 +
.../freemarker/template/ConfigurationTest.java | 58 +-
.../template/utility/StringUtilTest.java | 2 +-
.../test/templatesuite/templates/number-format.ftl | 42 +-
36 files changed, 2425 insertions(+), 492 deletions(-)