This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from b80b632 Merge remote-tracking branch 'origin/2.3-gae' into
FREEMARKER-35
new 6edc0d2 FREEMARKER-35: Minor cleanup. Also prepared the code for the
case if in a later Java version the directly supported Temporal subclasses will
not be final. Also improved some JavaDoc commends in old code.
new 7f6e528 FREEMARKER-35: Reworked things so that it will allow format
caching and custom formatters later. Basically TemporalUtils was sliced up to
TemplateTemporalFormat-s and their factories, and to some Environment code.
Fixed many rough edges along the way, and discovered even more (added TODO
comments for them).
The 2 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:
...seJavaTemplateTemporalFormatTemplateFormat.java | 64 ++++++
.../freemarker/core/BuiltInsForMultipleTypes.java | 11 +-
src/main/java/freemarker/core/Configurable.java | 40 +++-
src/main/java/freemarker/core/Environment.java | 252 ++++++++++++++++-----
src/main/java/freemarker/core/EvalUtil.java | 12 +-
...del.java => ISOLikeTemplateTemporalFormat.java} | 29 ++-
.../core/ISOTemplateTemporalFormatFactory.java | 118 ++++++++++
.../core/JavaTemplateTemporalFormat.java | 129 +++++++++++
...java => JavaTemplateTemporalFormatFactory.java} | 23 +-
.../java/freemarker/core/TemplateDateFormat.java | 6 +-
.../freemarker/core/TemplateDateFormatFactory.java | 4 +-
.../core/TemplateNumberFormatFactory.java | 4 +-
.../freemarker/core/TemplateTemporalFormat.java | 46 ++--
...ory.java => TemplateTemporalFormatFactory.java} | 43 ++--
.../java/freemarker/core/TemplateValueFormat.java | 3 +-
...at.java => ToStringTemplateTemporalFormat.java} | 46 ++--
... => ToStringTemplateTemporalFormatFactory.java} | 25 +-
...ava => UnformattableTemporalTypeException.java} | 17 +-
.../core/XSTemplateTemporalFormatFactory.java | 124 ++++++++++
.../java/freemarker/core/_CoreTemporalUtils.java | 131 +++++++++++
src/main/java/freemarker/core/_MessageUtil.java | 4 +-
.../freemarker/template/utility/TemporalUtil.java | 191 ----------------
.../java/freemarker/core/CoreTemporalUtilTest.java | 77 +++++++
.../freemarker/core/TemporalErrorMessagesTest.java | 55 +++++
.../test/templatesuite/TemplateTestCase.java | 2 +
.../test/templatesuite/templates/temporal.ftl | 4 +
26 files changed, 1066 insertions(+), 394 deletions(-)
create mode 100644
src/main/java/freemarker/core/BaseJavaTemplateTemporalFormatTemplateFormat.java
copy src/main/java/freemarker/core/{RightUnboundedRangeModel.java =>
ISOLikeTemplateTemporalFormat.java} (61%)
create mode 100644
src/main/java/freemarker/core/ISOTemplateTemporalFormatFactory.java
create mode 100644
src/main/java/freemarker/core/JavaTemplateTemporalFormat.java
copy src/main/java/freemarker/core/{XSTemplateDateFormatFactory.java =>
JavaTemplateTemporalFormatFactory.java} (55%)
copy src/main/java/freemarker/core/{TemplateDateFormatFactory.java =>
TemplateTemporalFormatFactory.java} (56%)
copy src/main/java/freemarker/core/{TemplateTemporalFormat.java =>
ToStringTemplateTemporalFormat.java} (58%)
copy src/main/java/freemarker/core/{XSTemplateDateFormatFactory.java =>
ToStringTemplateTemporalFormatFactory.java} (55%)
copy
src/main/java/freemarker/core/{UnknownDateTypeFormattingUnsupportedException.java
=> UnformattableTemporalTypeException.java} (63%)
create mode 100644
src/main/java/freemarker/core/XSTemplateTemporalFormatFactory.java
create mode 100644 src/main/java/freemarker/core/_CoreTemporalUtils.java
delete mode 100644 src/main/java/freemarker/template/utility/TemporalUtil.java
create mode 100644 src/test/java/freemarker/core/CoreTemporalUtilTest.java
create mode 100644 src/test/java/freemarker/core/TemporalErrorMessagesTest.java
