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/01/25 21:05:00 UTC
[freemarker] branch 3 updated: "multiplier" was written as
"multipier" at several places.
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
The following commit(s) were added to refs/heads/3 by this push:
new f82fa9a "multiplier" was written as "multipier" at several places.
f82fa9a is described below
commit f82fa9a5df089d5b18f25068c6d5b74bb8045d3f
Author: ddekany <dd...@apache.org>
AuthorDate: Fri Jan 25 22:04:01 2019 +0100
"multiplier" was written as "multipier" at several places.
---
FM3-CHANGE-LOG.txt | 2 ++
.../core/valueformat/impl/ExtendedDecimalFormatTest.java | 8 ++++----
.../java/org/apache/freemarker/core/Configuration.java | 16 ++++++++--------
.../apache/freemarker/core/util/StringToIndexMap.java | 2 +-
.../valueformat/impl/ExtendedDecimalFormatParser.java | 12 ++++++------
.../src/main/misc/overloadedNumberRules/README.txt | 2 +-
6 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt
index 14eb2e8..258b739 100644
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@ -618,6 +618,8 @@ Core / Miscellaneous
- Renamed `Environment.getDataModel()` to `getDataModelWithSharedVariableFallback()`
Renamed `Environment.getGlobalVariables()` to `getGloballyVisibleVariables()()`
- Removed `Template.createPlainTextTemplate`, as this convenience methods was hardly ever used.
+- The extended BigDecimal format parser doesn't accept the "multipier" parameter name anymore. It has to be written with
+ correct spelling, as "multiplier".
Build / development process changes
-----------------------------------
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatTest.java
index 68ab147..f0ae7db 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatTest.java
@@ -188,11 +188,11 @@ public class ExtendedDecimalFormatTest extends TemplateTest {
containsStringIgnoringCase("\"decimalSeparator\""), containsString("exactly 1 char")));
}
try {
- ExtendedDecimalFormatParser.parse("0.0;;multipier=ten", LOC);
+ ExtendedDecimalFormatParser.parse("0.0;;multiplier=ten", LOC);
fail();
} catch (java.text.ParseException e) {
assertThat(e.getMessage(), allOf(
- containsString("\"multipier\""), containsString("\"ten\""), containsString("integer")));
+ containsString("\"multiplier\""), containsString("\"ten\""), containsString("integer")));
}
}
@@ -223,8 +223,8 @@ public class ExtendedDecimalFormatTest extends TemplateTest {
// Expected
}
- assertFormatted("0.##;; multipier=100", 12.345, "1234.5");
- assertFormatted("0.##;; multipier=1000", 12.345, "12345");
+ assertFormatted("0.##;; multiplier=100", 12.345, "1234.5");
+ assertFormatted("0.##;; multiplier=1000", 12.345, "12345");
assertFormatted(",##0.##;; groupingSeparator=_ decimalSeparator=D", 12345.1, "12_345D1", 1, "1");
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java b/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java
index 2a909b0..cf77d8a 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java
@@ -1735,29 +1735,29 @@ public final class Configuration implements TopLevelConfiguration, CustomStateSc
valueWithoutUnit = value.substring(0, numberEnd).trim();
unit = value.substring(numberEnd).trim();
- final long multipier;
+ final long multiplier;
if (unit.equals("ms")) {
- multipier = 1;
+ multiplier = 1;
} else if (unit.equals("s")) {
- multipier = 1000;
+ multiplier = 1000;
} else if (unit.equals("m")) {
- multipier = 1000 * 60;
+ multiplier = 1000 * 60;
} else if (unit.equals("h")) {
- multipier = 1000 * 60 * 60;
+ multiplier = 1000 * 60 * 60;
} else if (!unit.isEmpty()) {
throw new InvalidSettingValueException(name, value,
"Unrecognized time unit " + _StringUtils.jQuote(unit) + ". Valid units are: ms, s, m, h");
} else {
- multipier = 0;
+ multiplier = 0;
}
int parsedValue = Integer.parseInt(valueWithoutUnit);
- if (multipier == 0 && parsedValue != 0) {
+ if (multiplier == 0 && parsedValue != 0) {
throw new InvalidSettingValueException(name, value,
"Time unit must be specified for a non-0 value (examples: 500 ms, 3 s, 2 m, 1 h).");
}
- setTemplateUpdateDelayMilliseconds(parsedValue * multipier);
+ setTemplateUpdateDelayMilliseconds(parsedValue * multiplier);
} else if (SHARED_VARIABLES_KEY.equals(name)) {
Map<?, ?> sharedVariables = (Map<?, ?>) _ObjectBuilderSettingEvaluator.eval(
value, Map.class, false, _SettingEvaluationEnvironment.getCurrent());
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/util/StringToIndexMap.java b/freemarker-core/src/main/java/org/apache/freemarker/core/util/StringToIndexMap.java
index aa1df40..48a1cf1 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/util/StringToIndexMap.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/util/StringToIndexMap.java
@@ -218,7 +218,7 @@ public final class StringToIndexMap {
}
private static BucketsSetup getBucketsSetup(Entry[] entries, int entriesLength, int variation) {
- // The 2.5 multipier was chosen experimentally.
+ // The 2.5 multiplier was chosen experimentally.
int bucketCnt = getPowerOf2GreaterThanOrEqualTo(entriesLength * 2 + entriesLength / 2);
Entry[] buckets = new Entry[bucketCnt];
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatParser.java b/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatParser.java
index a53dbe4..b66f8e8 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatParser.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatParser.java
@@ -38,7 +38,7 @@ import org.apache.freemarker.core.util._StringUtils;
class ExtendedDecimalFormatParser {
private static final String PARAM_ROUNDING_MODE = "roundingMode";
- private static final String PARAM_MULTIPIER = "multipier";
+ private static final String PARAM_MULTIPLIER = "multiplier";
private static final String PARAM_DECIMAL_SEPARATOR = "decimalSeparator";
private static final String PARAM_MONETARY_DECIMAL_SEPARATOR = "monetaryDecimalSeparator";
private static final String PARAM_GROUP_SEPARATOR = "groupingSeparator";
@@ -95,12 +95,12 @@ class ExtendedDecimalFormatParser {
parser.roundingMode = parsedValue;
}
});
- m.put(PARAM_MULTIPIER, new ParameterHandler() {
+ m.put(PARAM_MULTIPLIER, new ParameterHandler() {
@Override
public void handle(ExtendedDecimalFormatParser parser, String value)
throws InvalidParameterValueException {
try {
- parser.multipier = Integer.valueOf(value);
+ parser.multiplier = Integer.valueOf(value);
} catch (NumberFormatException e) {
throw new InvalidParameterValueException("Malformed integer.");
}
@@ -221,7 +221,7 @@ class ExtendedDecimalFormatParser {
private final DecimalFormatSymbols symbols;
private RoundingMode roundingMode;
- private Integer multipier;
+ private Integer multiplier;
static DecimalFormat parse(String formatString, Locale locale) throws ParseException {
return new ExtendedDecimalFormatParser(formatString, locale).parse();
@@ -251,8 +251,8 @@ class ExtendedDecimalFormatParser {
decimalFormat.setRoundingMode(roundingMode);
}
- if (multipier != null) {
- decimalFormat.setMultiplier(multipier.intValue());
+ if (multiplier != null) {
+ decimalFormat.setMultiplier(multiplier.intValue());
}
return decimalFormat;
diff --git a/freemarker-core/src/main/misc/overloadedNumberRules/README.txt b/freemarker-core/src/main/misc/overloadedNumberRules/README.txt
index ec6eebe..45654c1 100644
--- a/freemarker-core/src/main/misc/overloadedNumberRules/README.txt
+++ b/freemarker-core/src/main/misc/overloadedNumberRules/README.txt
@@ -31,4 +31,4 @@ Usage:
6. Copy-pase its content into `OverloadedNumberUtil.java`.
7. Ensure that the value of OverloadedNumberUtil.BIG_MANTISSA_LOSS_PRICE
still matches the value coming from the ODS and the cellValue
- multipier coming from generator.ftl.
\ No newline at end of file
+ multiplier coming from generator.ftl.
\ No newline at end of file