struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] branch WW-4742-no-key updated: WW-4742 Drops deprecated code
Date Sun, 03 Jan 2021 09:01:18 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-4742-no-key
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/WW-4742-no-key by this push:
     new 7281588  WW-4742 Drops deprecated code
7281588 is described below

commit 7281588f6c511636166f5c60560491d6b9373a85
Author: Lukasz Lenart <lukaszlenart@apache.org>
AuthorDate: Sun Jan 3 10:01:12 2021 +0100

    WW-4742 Drops deprecated code
---
 .../org/apache/struts2/util/TextProviderHelper.java | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
index 148a5c4..1fa4110 100644
--- a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
@@ -46,27 +46,6 @@ public class TextProviderHelper {
      * @return the message if found, otherwise the defaultMessage
      */
     public static String getText(String key, String defaultMessage, List<Object> args,
ValueStack stack) {
-        return getText(key, defaultMessage, args, stack, false);
-    }
-
-    /**
-     * <p>Get a message from the first TextProvider encountered in the stack.
-     * If the first TextProvider doesn't provide the message the default message is returned.</p>
-     * <p>The search for a TextProvider is iterative from the root of the stack.</p>
-     * <p>This method was refactored from  {@link org.apache.struts2.components.Text}
to use a
-     * consistent implementation across UIBean components.</p>
-     * @param key             the message key in the resource bundle
-     * @param defaultMessage  the message to return if not found (evaluated for OGNL)
-     * @param args            an array args to be used in a {@link java.text.MessageFormat}
message
-     * @param stack           the value stack to use for finding the text
-     * @param searchStack     search stack for the key
-     *
-     * @return the message if found, otherwise the defaultMessage
-     *
-     * @deprecated The stack should never be searched for the key. Use the version without
the searchStack boolean instead.
-     */
-    @Deprecated
-    public static String getText(String key, String defaultMessage, List<Object> args,
ValueStack stack, boolean searchStack) {
         String msg = null;
         TextProvider tp = null;
 


Mime
View raw message