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 01d10961 Forward ported from 2.3-gae: (Minor typos) (Missing list of
predefined values in output_format JavaDoc)
01d10961 is described below
commit 01d109618604da647e9b600a0ff3b93b7bf2700b
Author: ddekany <[email protected]>
AuthorDate: Wed Jan 4 23:22:24 2023 +0100
Forward ported from 2.3-gae: (Minor typos) (Missing list of predefined
values in output_format JavaDoc)
---
.../core/MutableProcessingConfiguration.java | 8 +++---
.../impl/ExtendedDecimalFormatParser.java | 14 ++++------
.../freemarker/servlet/jsp/JspTagModelBase.java | 31 +++++++++-------------
3 files changed, 23 insertions(+), 30 deletions(-)
diff --git
a/freemarker-core/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java
index 5067685f..c55519dc 100644
---
a/freemarker-core/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java
+++
b/freemarker-core/src/main/java/org/apache/freemarker/core/MutableProcessingConfiguration.java
@@ -1542,9 +1542,11 @@ public abstract class
MutableProcessingConfiguration<SelfT extends MutableProces
*
* <li><p>{@code "outputFormat"}:
* See {@link ParsingConfiguration#getOutputFormat()}.
- * <br>String value: {@code "default"} (case insensitive) for the
default, or an
- * <a href="#fm_obe">object builder expression</a> that gives an
{@link OutputFormat}, for example
- * {@code HTMLOutputFormat} or {@code XMLOutputFormat}.
+ * <br>String value: {@code "default"} (case insensitive) for the
default,
+ * one of {@code undefined}, {@code HTML}, {@code XHTML}, {@code
XML}, {@code RTF}, {@code plainText},
+ * {@code CSS}, {@code JavaScript}, {@code JSON},
+ * or an <a href="#fm_obe">object builder expression</a> that gives
an {@link OutputFormat}, for example
+ * {@code HTMLOutputFormat}, or {@code com.example.MyOutputFormat()}.
*
* <li><p>{@code "registeredCustomOutputFormats"}:
* See {@link
TopLevelConfiguration#getRegisteredCustomOutputFormats()}.
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 b66f8e88..405d6417 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
@@ -18,17 +18,13 @@
*/
package org.apache.freemarker.core.valueformat.impl;
+import org.apache.freemarker.core.util._StringUtils;
+
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.ParseException;
-import java.util.Arrays;
-import java.util.Currency;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Set;
-
-import org.apache.freemarker.core.util._StringUtils;
+import java.util.*;
/**
* Parses a {@link DecimalFormat} pattern string to a {@link DecimalFormat}
instance, with the pattern string extensions
@@ -266,7 +262,7 @@ class ExtendedDecimalFormatParser {
}
String currencySymbol = null; // Exceptional, as must be applied
after "currency code"
- fetchParamters: do {
+ fetchParameters: do {
int namePos = pos;
String name = fetchName();
if (name == null) {
@@ -310,7 +306,7 @@ class ExtendedDecimalFormatParser {
skipWS();
} else {
if (pos == ln) {
- break fetchParamters;
+ break fetchParameters;
}
if (pos == paramEndPos) {
throw newExpectedSgParseException("parameter separator
whitespace or comma");
diff --git
a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java
b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java
index 72057021..95ef654b 100644
---
a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java
+++
b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java
@@ -19,6 +19,18 @@
package org.apache.freemarker.servlet.jsp;
+import org.apache.freemarker.core.*;
+import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper;
+import org.apache.freemarker.core.model.TemplateHashModelEx;
+import org.apache.freemarker.core.model.TemplateModelWithOriginName;
+import org.apache.freemarker.core.model.TemplateStringModel;
+import org.apache.freemarker.core.model.impl.DefaultObjectWrapper;
+import org.apache.freemarker.core.util._StringUtils;
+import
org.apache.freemarker.servlet.jsp.SimpleTagDirectiveModel.TemplateExceptionWrapperJspException;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.DynamicAttributes;
+import javax.servlet.jsp.tagext.JspTag;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -29,23 +41,6 @@ import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.DynamicAttributes;
-import javax.servlet.jsp.tagext.JspTag;
-
-import org.apache.freemarker.core.Template;
-import org.apache.freemarker.core.TemplateException;
-import org.apache.freemarker.core._DelayedJQuote;
-import org.apache.freemarker.core._DelayedShortClassName;
-import org.apache.freemarker.core._ErrorDescriptionBuilder;
-import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper;
-import org.apache.freemarker.core.model.TemplateHashModelEx;
-import org.apache.freemarker.core.model.TemplateModelWithOriginName;
-import org.apache.freemarker.core.model.TemplateStringModel;
-import org.apache.freemarker.core.model.impl.DefaultObjectWrapper;
-import org.apache.freemarker.core.util._StringUtils;
-import
org.apache.freemarker.servlet.jsp.SimpleTagDirectiveModel.TemplateExceptionWrapperJspException;
-
abstract class JspTagModelBase implements TemplateModelWithOriginName {
protected final String tagName;
private final Class tagClass;
@@ -112,7 +107,7 @@ abstract class JspTagModelBase implements
TemplateModelWithOriginName {
"). See cause exception for the more specific
cause...");
if (e instanceof IllegalArgumentException &&
!(setterType.isAssignableFrom(String.class))
&& argArray[0] != null && argArray[0]
instanceof String) {
- desc.tip("This problem is often caused by
unnecessary parameter quotation. Paramters "
+ desc.tip("This problem is often caused by
unnecessary parameter quotation. Parameters "
+ "aren't quoted in FTL, similarly as they
aren't quoted in most languages. "
+ "For example, these parameter
assignments are wrong: ",
"<@my.tag p1=\"true\" p2=\"10\"
p3=\"${someVariable}\" p4=\"${x+1}\" />",
