You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by wo...@apache.org on 2018/01/06 04:34:06 UTC
incubator-freemarker git commit: FREEMARKER-55: move to
ArgumentArrayLayout#getPredefinedNamedArgumentsEndIndex()
Repository: incubator-freemarker
Updated Branches:
refs/heads/3 7887a9208 -> 9bb3da48c
FREEMARKER-55: move to ArgumentArrayLayout#getPredefinedNamedArgumentsEndIndex()
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/9bb3da48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9bb3da48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/9bb3da48
Branch: refs/heads/3
Commit: 9bb3da48c6779b38ddfd4a01e9f1942485511a7e
Parents: 7887a92
Author: Woonsan Ko <wo...@apache.org>
Authored: Fri Jan 5 23:33:59 2018 -0500
Committer: Woonsan Ko <wo...@apache.org>
Committed: Fri Jan 5 23:33:59 2018 -0500
----------------------------------------------------------------------
.../freemarker/core/model/ArgumentArrayLayout.java | 8 ++++++++
.../apache/freemarker/core/util/CallableUtils.java | 14 --------------
.../AbstractHtmlElementTemplateDirectiveModel.java | 4 ++--
...bstractHtmlInputElementTemplateDirectiveModel.java | 4 ++--
.../spring/model/form/FormTemplateDirectiveModel.java | 4 ++--
.../model/form/InputTemplateDirectiveModel.java | 4 ++--
6 files changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9bb3da48/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 e3d3497..c64e1a0 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
@@ -207,6 +207,14 @@ public final class ArgumentArrayLayout {
}
/**
+ * Return the exclusive end index of the predefined named arguments.
+ * @return the exclusive end index of the predefined named arguments
+ */
+ public int getPredefinedNamedArgumentsEndIndex() {
+ return predefinedPositionalArgumentCount + predefinedNamedArgumentsMap.size();
+ }
+
+ /**
* Returns the index of the varargs argument into which positional arguments that aren't predefined are collected,
* or -1 if there's no such varargs argument. The value of the positional varargs argument is a {@link
* TemplateSequenceModel} that collects all positional arguments whose index would be greater than or equal to
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9bb3da48/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java b/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java
index f200171..e0d371f 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java
@@ -1056,20 +1056,6 @@ public final class CallableUtils {
}
}
- /**
- * Returns the argument index of the last predefined named argument item in the {@code argsLayout}.
- * <P>
- * <EM>Note:</EM> It is strongly assumed that the predefined named arguments map contains only items with indexes,
- * starting from the predefined positional argument count and incrementing by one sequentially.
- * </P>
- * @param argsLayout arguments layout
- * @return the argument index of the last predefined named argument item in the {@code argsLayout}
- */
- public static int getLastPredefinedNamedArgumentIndex(ArgumentArrayLayout argsLayout) {
- return argsLayout.getPredefinedPositionalArgumentCount() + argsLayout.getPredefinedNamedArgumentsMap().size()
- - 1;
- }
-
private static Object[] getMessagePartExpectedNArgumentButHadM(int argCnt, int minCnt, int maxCnt) {
ArrayList<Object> desc = new ArrayList<>(20);
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9bb3da48/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java
index a29ca0f..0633fb8 100644
--- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java
+++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java
@@ -48,8 +48,8 @@ import org.springframework.web.servlet.support.RequestContext;
abstract class AbstractHtmlElementTemplateDirectiveModel
extends AbstractDataBoundFormElementTemplateDirectiveModel {
- private static final int NAMED_ARGS_OFFSET = CallableUtils
- .getLastPredefinedNamedArgumentIndex(AbstractDataBoundFormElementTemplateDirectiveModel.ARGS_LAYOUT) + 1;
+ private static final int NAMED_ARGS_OFFSET = AbstractDataBoundFormElementTemplateDirectiveModel.ARGS_LAYOUT
+ .getPredefinedNamedArgumentsEndIndex();
private static final int CSS_CLASS_PARAM_IDX = NAMED_ARGS_OFFSET;
private static final String CSS_CLASS_PARAM_NAME = "cssClass";
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9bb3da48/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlInputElementTemplateDirectiveModel.java
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlInputElementTemplateDirectiveModel.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlInputElementTemplateDirectiveModel.java
index 8de04b4..6399cbb 100644
--- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlInputElementTemplateDirectiveModel.java
+++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlInputElementTemplateDirectiveModel.java
@@ -37,8 +37,8 @@ import org.springframework.web.servlet.support.RequestContext;
abstract class AbstractHtmlInputElementTemplateDirectiveModel extends AbstractHtmlElementTemplateDirectiveModel {
- private static final int NAMED_ARGS_OFFSET = CallableUtils
- .getLastPredefinedNamedArgumentIndex(AbstractHtmlElementTemplateDirectiveModel.ARGS_LAYOUT) + 1;
+ private static final int NAMED_ARGS_OFFSET = AbstractHtmlElementTemplateDirectiveModel.ARGS_LAYOUT
+ .getPredefinedNamedArgumentsEndIndex();
private static final int ONFOCUS_PARAM_IDX = NAMED_ARGS_OFFSET;
private static final String ONFOCUS_PARAM_NAME = "onfocus";
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9bb3da48/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java
index ebfd4c6..9274603 100644
--- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java
+++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java
@@ -75,8 +75,8 @@ class FormTemplateDirectiveModel extends AbstractHtmlElementTemplateDirectiveMod
public static final String NAME = "form";
- private static final int NAMED_ARGS_OFFSET = CallableUtils
- .getLastPredefinedNamedArgumentIndex(AbstractHtmlElementTemplateDirectiveModel.ARGS_LAYOUT) + 1;
+ private static final int NAMED_ARGS_OFFSET = AbstractHtmlElementTemplateDirectiveModel.ARGS_LAYOUT
+ .getPredefinedNamedArgumentsEndIndex();
private static final int ACTION_PARAM_IDX = NAMED_ARGS_OFFSET;
private static final String ACTION_PARAM_NAME = "action";
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9bb3da48/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModel.java
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModel.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModel.java
index d2a3fff..d4c6da4 100644
--- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModel.java
+++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModel.java
@@ -69,8 +69,8 @@ class InputTemplateDirectiveModel extends AbstractHtmlInputElementTemplateDirect
public static final String NAME = "input";
- private static final int NAMED_ARGS_OFFSET = CallableUtils
- .getLastPredefinedNamedArgumentIndex(AbstractHtmlInputElementTemplateDirectiveModel.ARGS_LAYOUT) + 1;
+ private static final int NAMED_ARGS_OFFSET = AbstractHtmlInputElementTemplateDirectiveModel.ARGS_LAYOUT
+ .getPredefinedNamedArgumentsEndIndex();
private static final int SIZE_PARAM_IDX = NAMED_ARGS_OFFSET;
private static final String SIZE_PARAM_NAME = "size";