This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 50825718699b40b1bd5963658d57f122ed3d56a8 Author: ddekany <[email protected]> AuthorDate: Fri Dec 16 12:36:12 2022 +0100 Typo/grammar fixes in messages and comments --- src/main/java/freemarker/core/ArithmeticEngine.java | 2 +- src/main/java/freemarker/core/TemplateNumberFormat.java | 5 ++--- src/main/java/freemarker/core/_ArrayEnumeration.java | 2 +- src/main/java/freemarker/core/_ArrayIterator.java | 2 +- src/main/java/freemarker/core/_DelayedAOrAn.java | 2 +- src/main/java/freemarker/core/_DelayedConversionToString.java | 2 +- src/main/java/freemarker/core/_DelayedFTLTypeDescription.java | 2 +- src/main/java/freemarker/core/_DelayedGetCanonicalForm.java | 2 +- src/main/java/freemarker/core/_DelayedGetMessage.java | 2 +- src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java | 2 +- src/main/java/freemarker/core/_DelayedJQuote.java | 2 +- src/main/java/freemarker/core/_DelayedJoinWithComma.java | 2 +- src/main/java/freemarker/core/_ErrorDescriptionBuilder.java | 2 +- src/main/java/freemarker/core/_Java8.java | 2 +- src/main/java/freemarker/core/_Java8Impl.java | 2 +- src/main/java/freemarker/core/_JavaVersions.java | 2 +- src/main/java/freemarker/core/_MessageUtil.java | 2 +- .../freemarker/core/_ObjectBuilderSettingEvaluationException.java | 2 +- src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java | 4 ++-- src/main/java/freemarker/core/_SettingEvaluationEnvironment.java | 2 +- src/main/java/freemarker/core/_SortedArraySet.java | 2 +- .../freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java | 2 +- src/main/java/freemarker/core/_UnmodifiableCompositeSet.java | 2 +- src/main/java/freemarker/core/_UnmodifiableSet.java | 2 +- src/main/java/freemarker/template/Configuration.java | 2 +- 25 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/main/java/freemarker/core/ArithmeticEngine.java b/src/main/java/freemarker/core/ArithmeticEngine.java index 5492b7ad..e6be82b0 100644 --- a/src/main/java/freemarker/core/ArithmeticEngine.java +++ b/src/main/java/freemarker/core/ArithmeticEngine.java @@ -126,7 +126,7 @@ public abstract class ArithmeticEngine { return 0; } else { // The most common case is comparing values of the same type. As BigDecimal can represent all of these - // with loseless round-trip (i.e., converting to BigDecimal and then back the original type gives the + // with lossless round-trip (i.e., converting to BigDecimal and then back the original type gives the // original value), we can avoid conversion to BigDecimal without changing the result. if (first.getClass() == second.getClass()) { // Bit of optimization for this is a very common case: diff --git a/src/main/java/freemarker/core/TemplateNumberFormat.java b/src/main/java/freemarker/core/TemplateNumberFormat.java index 23325755..10ca968c 100644 --- a/src/main/java/freemarker/core/TemplateNumberFormat.java +++ b/src/main/java/freemarker/core/TemplateNumberFormat.java @@ -83,8 +83,7 @@ public abstract class TemplateNumberFormat extends TemplateValueFormat { * will be support, it will be similar to {@link TemplateDateFormat#parse(String, int)}. */ public final Object parse(String s) throws TemplateValueFormatException { - throw new ParsingNotSupportedException("Number formats currenly don't support parsing"); + throw new ParsingNotSupportedException("Number formats currently don't support parsing"); } - - + } diff --git a/src/main/java/freemarker/core/_ArrayEnumeration.java b/src/main/java/freemarker/core/_ArrayEnumeration.java index 70d7983d..72212a91 100644 --- a/src/main/java/freemarker/core/_ArrayEnumeration.java +++ b/src/main/java/freemarker/core/_ArrayEnumeration.java @@ -22,7 +22,7 @@ package freemarker.core; import java.util.Enumeration; import java.util.NoSuchElementException; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _ArrayEnumeration implements Enumeration { private final Object[] array; diff --git a/src/main/java/freemarker/core/_ArrayIterator.java b/src/main/java/freemarker/core/_ArrayIterator.java index f7cca25b..465ab21a 100644 --- a/src/main/java/freemarker/core/_ArrayIterator.java +++ b/src/main/java/freemarker/core/_ArrayIterator.java @@ -22,7 +22,7 @@ package freemarker.core; import java.util.Iterator; import java.util.NoSuchElementException; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _ArrayIterator implements Iterator { private final Object[] array; diff --git a/src/main/java/freemarker/core/_DelayedAOrAn.java b/src/main/java/freemarker/core/_DelayedAOrAn.java index 8d7306ee..2ed03529 100644 --- a/src/main/java/freemarker/core/_DelayedAOrAn.java +++ b/src/main/java/freemarker/core/_DelayedAOrAn.java @@ -19,7 +19,7 @@ package freemarker.core; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _DelayedAOrAn extends _DelayedConversionToString { public _DelayedAOrAn(Object object) { diff --git a/src/main/java/freemarker/core/_DelayedConversionToString.java b/src/main/java/freemarker/core/_DelayedConversionToString.java index a705c010..65c9fae2 100644 --- a/src/main/java/freemarker/core/_DelayedConversionToString.java +++ b/src/main/java/freemarker/core/_DelayedConversionToString.java @@ -19,7 +19,7 @@ package freemarker.core; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public abstract class _DelayedConversionToString { private static final String NOT_SET = new String(); diff --git a/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java b/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java index 93d87137..90f2807c 100644 --- a/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java +++ b/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java @@ -22,7 +22,7 @@ package freemarker.core; import freemarker.template.TemplateModel; import freemarker.template.utility.ClassUtil; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _DelayedFTLTypeDescription extends _DelayedConversionToString { public _DelayedFTLTypeDescription(TemplateModel tm) { diff --git a/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java b/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java index 2f070f5f..2637766e 100644 --- a/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java +++ b/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java @@ -20,7 +20,7 @@ package freemarker.core; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _DelayedGetCanonicalForm extends _DelayedConversionToString { public _DelayedGetCanonicalForm(TemplateObject obj) { diff --git a/src/main/java/freemarker/core/_DelayedGetMessage.java b/src/main/java/freemarker/core/_DelayedGetMessage.java index ed2fe567..3254396b 100644 --- a/src/main/java/freemarker/core/_DelayedGetMessage.java +++ b/src/main/java/freemarker/core/_DelayedGetMessage.java @@ -19,7 +19,7 @@ package freemarker.core; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _DelayedGetMessage extends _DelayedConversionToString { public _DelayedGetMessage(Throwable exception) { diff --git a/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java b/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java index 56111d09..e3e415af 100644 --- a/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java +++ b/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java @@ -21,7 +21,7 @@ package freemarker.core; import freemarker.template.TemplateException; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _DelayedGetMessageWithoutStackTop extends _DelayedConversionToString { public _DelayedGetMessageWithoutStackTop(TemplateException exception) { diff --git a/src/main/java/freemarker/core/_DelayedJQuote.java b/src/main/java/freemarker/core/_DelayedJQuote.java index 7dfef58d..48bfaedc 100644 --- a/src/main/java/freemarker/core/_DelayedJQuote.java +++ b/src/main/java/freemarker/core/_DelayedJQuote.java @@ -21,7 +21,7 @@ package freemarker.core; import freemarker.template.utility.StringUtil; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _DelayedJQuote extends _DelayedConversionToString { public _DelayedJQuote(Object object) { diff --git a/src/main/java/freemarker/core/_DelayedJoinWithComma.java b/src/main/java/freemarker/core/_DelayedJoinWithComma.java index 68ce8b9b..17a64a2c 100644 --- a/src/main/java/freemarker/core/_DelayedJoinWithComma.java +++ b/src/main/java/freemarker/core/_DelayedJoinWithComma.java @@ -19,7 +19,7 @@ package freemarker.core; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _DelayedJoinWithComma extends _DelayedConversionToString { public _DelayedJoinWithComma(String[] items) { diff --git a/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java b/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java index 8c7563d0..2b570d84 100644 --- a/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java +++ b/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java @@ -31,7 +31,7 @@ import freemarker.template.utility.ClassUtil; import freemarker.template.utility.StringUtil; /** - * Used internally only, might changes without notice! + * Used internally only, might change without notice! * Packs a structured from of the error description from which the error message can be rendered on-demand. * Note that this class isn't serializable, thus the containing exception should render the message before it's * serialized. diff --git a/src/main/java/freemarker/core/_Java8.java b/src/main/java/freemarker/core/_Java8.java index 34979da8..e1a39543 100644 --- a/src/main/java/freemarker/core/_Java8.java +++ b/src/main/java/freemarker/core/_Java8.java @@ -21,7 +21,7 @@ package freemarker.core; import java.lang.reflect.Method; /** - * Used internally only, might changes without notice! + * Used internally only, might change without notice! * Used for accessing functionality that's only present in Java 8 or later. */ public interface _Java8 { diff --git a/src/main/java/freemarker/core/_Java8Impl.java b/src/main/java/freemarker/core/_Java8Impl.java index a25e0f31..e4d14c07 100644 --- a/src/main/java/freemarker/core/_Java8Impl.java +++ b/src/main/java/freemarker/core/_Java8Impl.java @@ -21,7 +21,7 @@ package freemarker.core; import java.lang.reflect.Method; /** - * Used internally only, might changes without notice! + * Used internally only, might change without notice! * Used for accessing functionality that's only present in Java 8 or later. */ // Compile this against Java 8 diff --git a/src/main/java/freemarker/core/_JavaVersions.java b/src/main/java/freemarker/core/_JavaVersions.java index 3f076732..5670c369 100644 --- a/src/main/java/freemarker/core/_JavaVersions.java +++ b/src/main/java/freemarker/core/_JavaVersions.java @@ -23,7 +23,7 @@ import freemarker.template.Version; import freemarker.template.utility.SecurityUtilities; /** - * Used internally only, might changes without notice! + * Used internally only, might change without notice! */ public final class _JavaVersions { diff --git a/src/main/java/freemarker/core/_MessageUtil.java b/src/main/java/freemarker/core/_MessageUtil.java index 081835cc..69ce60c6 100644 --- a/src/main/java/freemarker/core/_MessageUtil.java +++ b/src/main/java/freemarker/core/_MessageUtil.java @@ -30,7 +30,7 @@ import freemarker.template.TemplateModelException; import freemarker.template.utility.StringUtil; /** - * Used internally only, might changes without notice! + * Used internally only, might change without notice! * Utilities for creating error messages (and other messages). */ public class _MessageUtil { diff --git a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java index e262721b..cc62b0a0 100644 --- a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java +++ b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java @@ -22,7 +22,7 @@ package freemarker.core; import freemarker.template.utility.StringUtil; /** - * Don't use this; used internally by FreeMarker, might changes without notice. + * Don't use this; used internally by FreeMarker, might change without notice. * Thrown by {@link _ObjectBuilderSettingEvaluator}. */ public class _ObjectBuilderSettingEvaluationException extends Exception { diff --git a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java index 7e4e18b2..0e89e10f 100644 --- a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java +++ b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java @@ -59,7 +59,7 @@ import freemarker.template.utility.StringUtil; import freemarker.template.utility.WriteProtectable; /** - * Don't use this; used internally by FreeMarker, might changes without notice. + * Don't use this; used internally by FreeMarker, might change without notice. * * Evaluates object builder expressions used in configuration {@link Properties}. * It should be replaced with FTL later (when it was improved to be practical for this), so the syntax should be @@ -448,7 +448,7 @@ public class _ObjectBuilderSettingEvaluator { } } else { if (resultCoerced) { - // The FTL way (BigDecimal is loseless, and it will be coerced to the target type later): + // The FTL way (BigDecimal is lossless, and it will be coerced to the target type later): return new BigDecimal(numStr); } else { // The Java way (lossy but familiar): diff --git a/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java b/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java index 88a4abf3..f5700216 100644 --- a/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java +++ b/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java @@ -25,7 +25,7 @@ import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; /** - * Don't use this; used internally by FreeMarker, might changes without notice. + * Don't use this; used internally by FreeMarker, might change without notice. * The runtime environment used during the evaluation of configuration {@link Properties}. */ public class _SettingEvaluationEnvironment { diff --git a/src/main/java/freemarker/core/_SortedArraySet.java b/src/main/java/freemarker/core/_SortedArraySet.java index 4016eb8a..3cd2fe33 100644 --- a/src/main/java/freemarker/core/_SortedArraySet.java +++ b/src/main/java/freemarker/core/_SortedArraySet.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _SortedArraySet<E> extends _UnmodifiableSet<E> { private final E[] array; diff --git a/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java b/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java index 18e8f07d..b370a7b7 100644 --- a/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java +++ b/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java @@ -22,7 +22,7 @@ package freemarker.core; import freemarker.template.TemplateModel; /** - * Don't use this; used internally by FreeMarker, might changes without notice. + * Don't use this; used internally by FreeMarker, might change without notice. * * <p>Implemented by {@link TemplateModel}-s that can explain why they don't implement a certain type. * */ diff --git a/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java b/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java index e3b82abc..8d311294 100644 --- a/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java +++ b/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java @@ -22,7 +22,7 @@ package freemarker.core; import java.util.Iterator; import java.util.Set; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public class _UnmodifiableCompositeSet<E> extends _UnmodifiableSet<E> { private final Set<E> set1, set2; diff --git a/src/main/java/freemarker/core/_UnmodifiableSet.java b/src/main/java/freemarker/core/_UnmodifiableSet.java index 8c984828..2e5ce690 100644 --- a/src/main/java/freemarker/core/_UnmodifiableSet.java +++ b/src/main/java/freemarker/core/_UnmodifiableSet.java @@ -21,7 +21,7 @@ package freemarker.core; import java.util.AbstractSet; -/** Don't use this; used internally by FreeMarker, might changes without notice. */ +/** Don't use this; used internally by FreeMarker, might change without notice. */ public abstract class _UnmodifiableSet<E> extends AbstractSet<E> { @Override diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java index 64d3b542..11ac38bd 100644 --- a/src/main/java/freemarker/template/Configuration.java +++ b/src/main/java/freemarker/template/Configuration.java @@ -3536,7 +3536,7 @@ public class Configuration extends Configurable implements Cloneable, ParserConf @Override protected String getCorrectedNameForUnknownSetting(String name) { if ("encoding".equals(name) || "charset".equals(name) || "default_charset".equals(name)) { - // [2.4] Default might changes to camel-case + // [2.4] Default might change to camel-case return DEFAULT_ENCODING_KEY; } if ("defaultCharset".equals(name)) {
