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 2017/08/08 12:25:34 UTC
[1/2] incubator-freemarker git commit: (JavaDoc improvement from
2.3-gae)
Repository: incubator-freemarker
Updated Branches:
refs/heads/3 1b6f894ee -> 836de2657
(JavaDoc improvement from 2.3-gae)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ddb9c8ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ddb9c8ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ddb9c8ae
Branch: refs/heads/3
Commit: ddb9c8ae3307c375c825deadb0dc68b4e6329d31
Parents: 1b6f894
Author: ddekany <dd...@apache.org>
Authored: Tue Aug 8 14:22:49 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Aug 8 14:22:49 2017 +0200
----------------------------------------------------------------------
.../org/apache/freemarker/core/arithmetic/ArithmeticEngine.java | 5 +++--
.../core/arithmetic/impl/BigDecimalArithmeticEngine.java | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ddb9c8ae/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/ArithmeticEngine.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/ArithmeticEngine.java b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/ArithmeticEngine.java
index afe22be..74f4434 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/ArithmeticEngine.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/ArithmeticEngine.java
@@ -25,8 +25,9 @@ import org.apache.freemarker.core.Configuration;
import org.apache.freemarker.core.TemplateException;
/**
- * Implements the arithmetic operations executed by the template language; see
- * {@link Configuration#getArithmeticEngine()}.
+ * Used for implementing the arithmetic operations and number comparisons in the template language. The concrete
+ * implementation is plugged into the configuration with the {@code arithmeticalEngine} setting ({@link
+ * Configuration#getArithmeticEngine()}).
*/
public abstract class ArithmeticEngine {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ddb9c8ae/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/BigDecimalArithmeticEngine.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/BigDecimalArithmeticEngine.java b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/BigDecimalArithmeticEngine.java
index b022f74..0d22656 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/BigDecimalArithmeticEngine.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/BigDecimalArithmeticEngine.java
@@ -24,8 +24,8 @@ import org.apache.freemarker.core.arithmetic.ArithmeticEngine;
import org.apache.freemarker.core.util._NumberUtil;
/**
- * Arithmetic engine that converts all numbers to {@link BigDecimal} and
- * then operates on them. This is FreeMarker's default arithmetic engine.
+ * Arithmetic engine that converts all numbers to {@link BigDecimal} and then operates on them, and also keeps the
+ * result as a {@link BigDecimal}. This is FreeMarker's default arithmetic engine.
*/
public class BigDecimalArithmeticEngine extends ArithmeticEngine {
[2/2] incubator-freemarker git commit: GeneralPurposeNothing
implements TemplateHashModelEx2 (ported from 2.3-gae)
Posted by dd...@apache.org.
GeneralPurposeNothing implements TemplateHashModelEx2 (ported from 2.3-gae)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/836de265
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/836de265
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/836de265
Branch: refs/heads/3
Commit: 836de2657cee8b12509af24e79d9bdf7ed1c4fd7
Parents: ddb9c8a
Author: ddekany <dd...@apache.org>
Authored: Tue Aug 8 14:25:12 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Aug 8 14:25:12 2017 +0200
----------------------------------------------------------------------
.../apache/freemarker/core/model/GeneralPurposeNothing.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/836de265/freemarker-core/src/main/java/org/apache/freemarker/core/model/GeneralPurposeNothing.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/GeneralPurposeNothing.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/GeneralPurposeNothing.java
index b19b912..ffc2ad2 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/GeneralPurposeNothing.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/GeneralPurposeNothing.java
@@ -30,7 +30,7 @@ import org.apache.freemarker.core.TemplateException;
*/
final class GeneralPurposeNothing
-implements TemplateBooleanModel, TemplateScalarModel, TemplateSequenceModel, TemplateHashModelEx,
+implements TemplateBooleanModel, TemplateScalarModel, TemplateSequenceModel, TemplateHashModelEx2,
TemplateFunctionModel {
public static final TemplateModel INSTANCE = new GeneralPurposeNothing();
@@ -90,4 +90,9 @@ implements TemplateBooleanModel, TemplateScalarModel, TemplateSequenceModel, Tem
return Constants.EMPTY_COLLECTION;
}
+ @Override
+ public KeyValuePairIterator keyValuePairIterator() throws TemplateModelException {
+ return Constants.EMPTY_KEY_VALUE_PAIR_ITERATOR;
+ }
+
}