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 2015/09/16 10:43:33 UTC
[1/2] incubator-freemarker git commit: (Suppressed a FindBugs false
alarm.)
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 2bdd2615c -> 205bcda44
(Suppressed a FindBugs false alarm.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d21fe949
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d21fe949
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d21fe949
Branch: refs/heads/2.3-gae
Commit: d21fe9490778ecb80724c3e0b07f4d5a32f7c80f
Parents: 2bdd261
Author: ddekany <dd...@apache.org>
Authored: Wed Sep 16 10:38:35 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Wed Sep 16 10:38:35 2015 +0200
----------------------------------------------------------------------
src/test/java/freemarker/template/ConfigurationTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d21fe949/src/test/java/freemarker/template/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/ConfigurationTest.java b/src/test/java/freemarker/template/ConfigurationTest.java
index 3480de3..6d5964f 100644
--- a/src/test/java/freemarker/template/ConfigurationTest.java
+++ b/src/test/java/freemarker/template/ConfigurationTest.java
@@ -1305,6 +1305,7 @@ public class ConfigurationTest extends TestCase {
}
@Test
+ @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS ", justification = "Testing wrong args")
public void testSetCustomNumberFormat() throws Exception {
Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
[2/2] incubator-freemarker git commit: "rnd" instead of "ro",
as the abbreviation of "rounding"
Posted by dd...@apache.org.
"rnd" instead of "ro", as the abbreviation of "rounding"
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/205bcda4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/205bcda4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/205bcda4
Branch: refs/heads/2.3-gae
Commit: 205bcda44670bae2d705abc0f24ecb7fa92638de
Parents: d21fe94
Author: ddekany <dd...@apache.org>
Authored: Wed Sep 16 10:43:08 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Wed Sep 16 10:43:08 2015 +0200
----------------------------------------------------------------------
.../freemarker/core/ExtendedDecimalFormatParser.java | 2 +-
.../freemarker/core/ExtendedDecimalFormatTest.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/205bcda4/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java b/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java
index 95acbba..1a44ece 100644
--- a/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java
+++ b/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java
@@ -35,7 +35,7 @@ class ExtendedDecimalFormatParser {
static {
HashMap<String, ParameterHandler> m = new HashMap<String, ParameterHandler>();
- m.put("ro", new ParameterHandler() {
+ m.put("rnd", new ParameterHandler() {
public void handle(ExtendedDecimalFormatParser parser, String value)
throws InvalidParameterValueException {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/205bcda4/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java b/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java
index d460fd4..84ebf52 100644
--- a/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java
+++ b/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java
@@ -161,19 +161,19 @@ public class ExtendedDecimalFormatTest {
public void testExtendedParamsEffect() throws ParseException {
assertFormatted("0",
1.5, "2", 2.5, "2", 3.5, "4", 1.4, "1", 1.6, "2", -1.4, "-1", -1.5, "-2", -2.5, "-2", -1.6, "-2");
- assertFormatted("0;; ro=he",
+ assertFormatted("0;; rnd=he",
1.5, "2", 2.5, "2", 3.5, "4", 1.4, "1", 1.6, "2", -1.4, "-1", -1.5, "-2", -2.5, "-2", -1.6, "-2");
- assertFormatted("0;; ro=hu",
+ assertFormatted("0;; rnd=hu",
1.5, "2", 2.5, "3", 3.5, "4", 1.4, "1", 1.6, "2", -1.4, "-1", -1.5, "-2", -2.5, "-3", -1.6, "-2");
- assertFormatted("0;; ro=hd",
+ assertFormatted("0;; rnd=hd",
1.5, "1", 2.5, "2", 3.5, "3", 1.4, "1", 1.6, "2", -1.4, "-1", -1.5, "-1", -2.5, "-2", -1.6, "-2");
- assertFormatted("0;; ro=f",
+ assertFormatted("0;; rnd=f",
1.5, "1", 2.5, "2", 3.5, "3", 1.4, "1", 1.6, "1", -1.4, "-2", -1.5, "-2", -2.5, "-3", -1.6, "-2");
- assertFormatted("0;; ro=c",
+ assertFormatted("0;; rnd=c",
1.5, "2", 2.5, "3", 3.5, "4", 1.4, "2", 1.6, "2", -1.4, "-1", -1.5, "-1", -2.5, "-2", -1.6, "-1");
- assertFormatted("0;; ro=un", 2, "2");
+ assertFormatted("0;; rnd=un", 2, "2");
try {
- assertFormatted("0;; ro=un", 2.5, "2");
+ assertFormatted("0;; rnd=un", 2.5, "2");
fail();
} catch (ArithmeticException e) {
// Expected