You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2021/01/23 17:06:42 UTC

[struts] branch WW-5113-5114-drop updated: WW-5113 WW-5114 Cleans up JavaDocs

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5113-5114-drop
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/WW-5113-5114-drop by this push:
     new a88c4c8  WW-5113 WW-5114 Cleans up JavaDocs
a88c4c8 is described below

commit a88c4c801a4159779aea3be96f16e66f8f7dad2a
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sat Jan 23 18:06:35 2021 +0100

    WW-5113 WW-5114 Cleans up JavaDocs
---
 core/src/main/java/com/opensymphony/xwork2/TextProvider.java |  2 +-
 .../apache/struts2/config/StrutsBeanSelectionProvider.java   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/TextProvider.java b/core/src/main/java/com/opensymphony/xwork2/TextProvider.java
index 32c343b..9ac7163 100644
--- a/core/src/main/java/com/opensymphony/xwork2/TextProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/TextProvider.java
@@ -42,7 +42,7 @@ import java.util.ResourceBundle;
  * When you want to use your own implementation for Struts 2 project you have to define following
  * bean and constant in struts.xml:
  * &lt;bean class=&quot;org.demo.MyTextProvider&quot; name=&quot;myTextProvider&quot; type=&quot;com.opensymphony.xwork2.TextProvider&quot; /&gt;
- * &lt;constant name=&quot;struts.xworkTextProvider&quot; value=&quot;myTextProvider&quot; /&gt;
+ * &lt;constant name=&quot;struts.textProvider&quot; value=&quot;myTextProvider&quot; /&gt;
  * </p>
  *
  * <p>
diff --git a/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java
index 20389a4..08f46fa 100644
--- a/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java
@@ -208,15 +208,15 @@ import org.apache.struts2.views.util.UrlHelper;
  *   </tr>
  *   <tr>
  *     <td>com.opensymphony.xwork2.TextProvider</td>
- *     <td>struts.xworkTextProvider</td>
+ *     <td>struts.textProvider</td>
  *     <td>default</td>
- *     <td>Allows provide custom TextProvider for whole application</td>
+ *     <td>Allows provide custom TextProvider for whole application, it's better to use struts.textProviderFactory</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.LocaleProvider</td>
- *     <td>struts.localeProvider</td>
- *     <td>singleton</td>
- *     <td>DEPRECATED! Allows provide custom TextProvider for whole application - instead this endpoint use <b>struts.localeProviderFactory</b></td>
+ *     <td>com.opensymphony.xwork2.TextProviderFactory</td>
+ *     <td>struts.textProviderFactory</td>
+ *     <td>default</td>
+ *     <td>Allows provide custom TextProviderFactory for whole application</td>
  *   </tr>
  *   <tr>
  *     <td>com.opensymphony.xwork2.LocaleProviderFactory</td>