Repository: struts Updated Branches: refs/heads/master 350c77aba -> 7627b8355
Moves documentation to wiki Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7627b835 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7627b835 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7627b835 Branch: refs/heads/master Commit: 7627b835556b0ecbd945a3ae1f27693eec41969f Parents: 350c77a Author: Lukasz Lenart <[email protected]> Authored: Fri Mar 24 10:34:39 2017 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Fri Mar 24 10:34:39 2017 +0100 ---------------------------------------------------------------------- .../util/DefaultLocalizedTextProvider.java | 46 +------------------- 1 file changed, 2 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/7627b835/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java b/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java index c515219..b7d5314 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java @@ -44,50 +44,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; - /** - * Provides support for localization in XWork. - * - * <!-- START SNIPPET: searchorder --> - * <p>Resource bundles are searched in the following order:</p> - * - * <ol> - * <li>ActionClass.properties</li> - * <li>Interface.properties (every interface and sub-interface)</li> - * <li>BaseClass.properties (all the way to Object.properties)</li> - * <li>ModelDriven's model (if implements ModelDriven), for the model object repeat from 1</li> - * <li>package.properties (of the directory where class is located and every parent directory all the way to the root directory)</li> - * <li>search up the i18n message key hierarchy itself</li> - * <li>global resource properties</li> - * </ol> - * - * <!-- END SNIPPET: searchorder --> - * - * <!-- START SNIPPET: packagenote --> - * <p>To clarify #5, while traversing the package hierarchy, Struts 2 will look for a file package.properties:</p> - * com/<br> - * acme/<br> - * package.properties<br> - * actions/<br> - * package.properties<br> - * FooAction.java<br> - * FooAction.properties<br> - * <p> - * If FooAction.properties does not exist, com/acme/action/package.properties will be searched for, if - * not found com/acme/package.properties, if not found com/package.properties, etc. - * </p> - * <!-- END SNIPPET: packagenote --> - * - * <!-- START SNIPPET: globalresource --> - * <p> - * A global resource bundle could be specified programmatically, as well as the locale. - * </p> - * <!-- END SNIPPET: globalresource --> - * - * @author Jason Carreira - * @author Mark Woon - * @author Rainer Hermanns - * @author tm_jee + * Provides support for localization in the framework, it can be used to read only default bundles, + * or it can search the class hierarchy to find proper bundles. */ public class DefaultLocalizedTextProvider implements LocalizedTextProvider { @@ -110,7 +69,6 @@ public class DefaultLocalizedTextProvider implements LocalizedTextProvider { private final String RELOADED = "com.opensymphony.xwork2.util.LocalizedTextUtil.reloaded"; - /** * Clears the internal list of resource bundles. *
