Drops unavailable dependency
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ee6c927d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ee6c927d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ee6c927d Branch: refs/heads/master Commit: ee6c927db6663741c3d0179e16687704359ea40c Parents: 944b1a2 Author: Lukasz Lenart <[email protected]> Authored: Fri Mar 17 08:02:24 2017 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Fri Mar 17 08:02:24 2017 +0100 ---------------------------------------------------------------------- .../xwork2/StrutsTextProviderFactory.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/ee6c927d/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java index 7c703b7..9743b65 100644 --- a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java +++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java @@ -27,16 +27,10 @@ import java.util.ResourceBundle; */ public class StrutsTextProviderFactory implements TextProviderFactory { - private TextProvider textProvider; private LocaleProviderFactory localeProviderFactory; private LocalizedTextProvider localizedTextProvider; @Inject - public void setTextProvider(TextProvider textProvider) { - this.textProvider = textProvider; - } - - @Inject public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) { this.localeProviderFactory = localeProviderFactory; } @@ -67,18 +61,11 @@ public class StrutsTextProviderFactory implements TextProviderFactory { } protected TextProvider getTextProvider(Class clazz) { - if (this.textProvider == null) { - return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider); - } else { - return textProvider; - } + return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider); } private TextProvider getTextProvider(ResourceBundle bundle) { - if (this.textProvider == null) { - return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider); - } - return textProvider; + return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider); } }
