Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5A936200BF7 for ; Mon, 9 Jan 2017 10:08:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 595A8160B4C; Mon, 9 Jan 2017 09:08:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AECBB160B3E for ; Mon, 9 Jan 2017 10:08:07 +0100 (CET) Received: (qmail 24891 invoked by uid 500); 9 Jan 2017 09:08:06 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 24817 invoked by uid 99); 9 Jan 2017 09:08:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jan 2017 09:08:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EB30DFB6E; Mon, 9 Jan 2017 09:08:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Mon, 09 Jan 2017 09:08:07 -0000 Message-Id: <72fd3a3554654a129fcd924d2ef7cdc0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] struts git commit: Extracts default loop count constant archived-at: Mon, 09 Jan 2017 09:08:08 -0000 Extracts default loop count constant Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b9c05a71 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b9c05a71 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b9c05a71 Branch: refs/heads/master Commit: b9c05a7181836d8484ccd455b8b0318ecfce61a5 Parents: 14d56fb Author: Lukasz Lenart Authored: Mon Jan 9 09:12:35 2017 +0100 Committer: Lukasz Lenart Committed: Mon Jan 9 09:12:35 2017 +0100 ---------------------------------------------------------------------- .../java/com/opensymphony/xwork2/util/TextParseUtil.java | 8 +++----- .../main/java/com/opensymphony/xwork2/util/TextParser.java | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b9c05a71/core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java index 4f48685..0e5c9a1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java @@ -31,8 +31,6 @@ import java.util.*; */ public class TextParseUtil { - private static final int MAX_RECURSION = 1; - /** * Converts all instances of ${...}, and %{...} in expression to the value returned * by a call to {@link ValueStack#findValue(java.lang.String)}. If an item cannot @@ -108,7 +106,7 @@ public class TextParseUtil { * @return Converted object from variable translation. */ public static Object translateVariables(char open, String expression, ValueStack stack, Class asType, ParsedValueEvaluator evaluator) { - return translateVariables(new char[]{open} , expression, stack, asType, evaluator, MAX_RECURSION); + return translateVariables(new char[]{open} , expression, stack, asType, evaluator, TextParser.DEFAULT_LOOP_COUNT); } /** @@ -122,7 +120,7 @@ public class TextParseUtil { * @return Converted object from variable translation. */ public static Object translateVariables(char[] openChars, String expression, ValueStack stack, Class asType, ParsedValueEvaluator evaluator) { - return translateVariables(openChars, expression, stack, asType, evaluator, MAX_RECURSION); + return translateVariables(openChars, expression, stack, asType, evaluator, TextParser.DEFAULT_LOOP_COUNT); } /** @@ -178,7 +176,7 @@ public class TextParseUtil { * @return converted objects */ public static Collection translateVariablesCollection(String expression, ValueStack stack, boolean excludeEmptyElements, ParsedValueEvaluator evaluator) { - return translateVariablesCollection(new char[]{'$', '%'}, expression, stack, excludeEmptyElements, evaluator, MAX_RECURSION); + return translateVariablesCollection(new char[]{'$', '%'}, expression, stack, excludeEmptyElements, evaluator, TextParser.DEFAULT_LOOP_COUNT); } /** http://git-wip-us.apache.org/repos/asf/struts/blob/b9c05a71/core/src/main/java/com/opensymphony/xwork2/util/TextParser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/util/TextParser.java b/core/src/main/java/com/opensymphony/xwork2/util/TextParser.java index 54b18ef..2f53bb0 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/TextParser.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/TextParser.java @@ -6,6 +6,8 @@ package com.opensymphony.xwork2.util; */ public interface TextParser { + int DEFAULT_LOOP_COUNT = 1; + Object evaluate(char[] openChars, String expression, TextParseUtil.ParsedValueEvaluator evaluator, int maxLoopCount); }