Repository: incubator-freemarker Updated Branches: refs/heads/3 421dc2a93 -> 06377e524
(JavaDoc typos) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/06377e52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/06377e52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/06377e52 Branch: refs/heads/3 Commit: 06377e524da6f59d3e2d625957e16f529cff889b Parents: 421dc2a Author: ddekany <ddek...@apache.org> Authored: Thu Jan 4 22:47:59 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Fri Jan 5 00:14:06 2018 +0100 ---------------------------------------------------------------------- .../apache/freemarker/core/model/ArgumentArrayLayout.java | 10 +++++----- .../freemarker/core/model/TemplateDirectiveModel.java | 4 ++-- .../org/apache/freemarker/core/util/StringToIndexMap.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/06377e52/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java index 3da8d6d..e3d3497 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java @@ -33,10 +33,10 @@ import org.apache.freemarker.core.util.StringToIndexMap; * values can always be accessed at these constant indexes; no runtime name lookup is needed inside the {@code * execute} method of the {@link TemplateCallableModel} implementation. The {@link ArgumentArrayLayout} object is * usually stored in a static final field of the {@link TemplateCallableModel} implementation class. Said constant - * indexes are alsi usually defined in the {@link TemplateCallableModel} implementation as static final constants - * (then feed into the {@link ArgumentArrayLayout}). Some {@link TemplateCallableModel} implementations, such those - * stand for macros and functions defined in the template, decide the layout on runtime instead. Note the less, once - * the {@link TemplateCallableModel} was crated, the layout is fixed. + * indexes are also usually defined in the {@link TemplateCallableModel} implementation as static final constants + * (then feed into the {@link ArgumentArrayLayout}). Some {@link TemplateCallableModel} implementations, such as those + * stand for macros and functions defined in the template, decide the layout on runtime instead. None the less, once + * the {@link TemplateCallableModel} was created, the layout is fixed. * <p> * The layout of the array is as follows: * <ol> @@ -47,7 +47,7 @@ import org.apache.freemarker.core.util.StringToIndexMap; * <li> * {@link #getPredefinedNamedArgumentsMap()}{@code .size()} elements for the predefined named arguments. These are * at the indexes returned by {@link #getPredefinedNamedArgumentsMap()}{@code .get(String name)}. Yet again, for - * omitted arguments the corresponding array element is {@code null}. Within this index range reserved for the + * omitted arguments the corresponding array element is {@code null}. Within the index range reserved for the * named arguments, the {@link TemplateCallableModel} object is free to chose what index belongs to which name (as * far as two names don't share the same index). * <li> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/06377e52/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java index c834f97..c30d737 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java @@ -38,13 +38,13 @@ public interface TemplateDirectiveModel extends TemplateCallableModel { * The array of argument values. Not {@code null}. If a parameter was omitted on the caller side, the * corresponding array element will be {@code null}. The length of the array and the indexes correspond to * the {@link ArgumentArrayLayout} returned by {@link #getDirectiveArgumentArrayLayout()}. {@link - * ArgumentArrayLayout} os not {@code null}m and the caller doesn't keep argument layout rules (such as the + * ArgumentArrayLayout} is not {@code null}, and the caller doesn't keep argument layout rules (such as the * array is shorter than {@link ArgumentArrayLayout#getTotalLength()}, or the type of the values at {@link * ArgumentArrayLayout#getPositionalVarargsArgumentIndex()} or at * {@link ArgumentArrayLayout#getNamedVarargsArgumentIndex()} * is improper), this method may throws {@link IndexOutOfBoundsException} or {@link ClassCastException}. * Thus, user Java code that wishes to call {@link TemplateCallableModel}-s is responsible to ensure that - * the argument array follows the layout described be {@link ArgumentArrayLayout}, as the {@code execute} + * the argument array follows the layout described by {@link ArgumentArrayLayout}, as the {@code execute} * method isn't meant to do validations on that level. * @param callPlace * The place (in a template, normally) where this directive was called from. Not {@code null}; in case the http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/06377e52/freemarker-core/src/main/java/org/apache/freemarker/core/util/StringToIndexMap.java ---------------------------------------------------------------------- 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 6f997eb..280bc1d 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 @@ -256,7 +256,7 @@ public final class StringToIndexMap { } /** - * Checks if all entries are in the {@code start} - {@code start}+{@code getCollectionSize()} (exclusive) index + * Checks if all entries are in the {@code start} - {@code start}+{@code size()} (exclusive) index * range. * * @throws IllegalArgumentException