From 1da9612ed10d6261c5d63b2c6faf3460e8f38975 Mon Sep 17 00:00:00 2001 From: Sebastian Peters Date: Tue, 27 Nov 2018 21:17:47 +0100 Subject: [PATCH 1/3] Fix warning: "container" hides the field declared at line 46 --- .../main/java/com/opensymphony/xwork2/ActionSupport.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java index a1ef00e47..dc84d5f49 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java +++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java @@ -284,8 +284,7 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex */ protected TextProvider getTextProvider() { if (textProvider == null) { - Container container = getContainer(); - TextProviderFactory tpf = container.getInstance(TextProviderFactory.class); + final TextProviderFactory tpf = getContainer().getInstance(TextProviderFactory.class); textProvider = tpf.createInstance(getClass()); } return textProvider; @@ -293,8 +292,7 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex protected LocaleProvider getLocaleProvider() { if (localeProvider == null) { - Container container = getContainer(); - LocaleProviderFactory localeProviderFactory = container.getInstance(LocaleProviderFactory.class); + final LocaleProviderFactory localeProviderFactory = getContainer().getInstance(LocaleProviderFactory.class); localeProvider = localeProviderFactory.createLocaleProvider(); } return localeProvider; From b853a994936efc0fd523dffc07b03e0f88553eb2 Mon Sep 17 00:00:00 2001 From: Sebastian Peters Date: Tue, 27 Nov 2018 21:19:40 +0100 Subject: [PATCH 2/3] Fix warning: Add the "@Override" annotation above this method signature --- .../opensymphony/xwork2/ActionSupport.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java index dc84d5f49..f9f5040a9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java +++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java @@ -45,26 +45,32 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex protected Container container; + @Override public void setActionErrors(Collection errorMessages) { validationAware.setActionErrors(errorMessages); } + @Override public Collection getActionErrors() { return validationAware.getActionErrors(); } + @Override public void setActionMessages(Collection messages) { validationAware.setActionMessages(messages); } + @Override public Collection getActionMessages() { return validationAware.getActionMessages(); } + @Override public void setFieldErrors(Map> errorMap) { validationAware.setFieldErrors(errorMap); } + @Override public Map> getFieldErrors() { return validationAware.getFieldErrors(); } @@ -84,42 +90,52 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex return getLocaleProvider().isValidLocale(locale); } + @Override public boolean hasKey(String key) { return getTextProvider().hasKey(key); } + @Override public String getText(String aTextName) { return getTextProvider().getText(aTextName); } + @Override public String getText(String aTextName, String defaultValue) { return getTextProvider().getText(aTextName, defaultValue); } + @Override public String getText(String aTextName, String defaultValue, String obj) { return getTextProvider().getText(aTextName, defaultValue, obj); } + @Override public String getText(String aTextName, List args) { return getTextProvider().getText(aTextName, args); } + @Override public String getText(String key, String[] args) { return getTextProvider().getText(key, args); } + @Override public String getText(String aTextName, String defaultValue, List args) { return getTextProvider().getText(aTextName, defaultValue, args); } + @Override public String getText(String key, String defaultValue, String[] args) { return getTextProvider().getText(key, defaultValue, args); } + @Override public String getText(String key, String defaultValue, List args, ValueStack stack) { return getTextProvider().getText(key, defaultValue, args, stack); } + @Override public String getText(String key, String defaultValue, String[] args, ValueStack stack) { return getTextProvider().getText(key, defaultValue, args, stack); } @@ -143,22 +159,27 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex } } + @Override public ResourceBundle getTexts() { return getTextProvider().getTexts(); } + @Override public ResourceBundle getTexts(String aBundleName) { return getTextProvider().getTexts(aBundleName); } + @Override public void addActionError(String anErrorMessage) { validationAware.addActionError(anErrorMessage); } + @Override public void addActionMessage(String aMessage) { validationAware.addActionMessage(aMessage); } + @Override public void addFieldError(String fieldName, String errorMessage) { validationAware.addFieldError(fieldName, errorMessage); } @@ -181,22 +202,27 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex * @return returns {@link #SUCCESS} * @throws Exception can be thrown by subclasses. */ + @Override public String execute() throws Exception { return SUCCESS; } + @Override public boolean hasActionErrors() { return validationAware.hasActionErrors(); } + @Override public boolean hasActionMessages() { return validationAware.hasActionMessages(); } + @Override public boolean hasErrors() { return validationAware.hasErrors(); } + @Override public boolean hasFieldErrors() { return validationAware.hasFieldErrors(); } @@ -245,6 +271,7 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex * A default implementation that validates nothing. * Subclasses should override this method to provide validations. */ + @Override public void validate() { } From 67d0e71f3e9a1033c0614fcf2256aa9638e98c1f Mon Sep 17 00:00:00 2001 From: Sebastian Peters Date: Tue, 27 Nov 2018 21:28:47 +0100 Subject: [PATCH 3/3] Fix warning: Add a nested comment explaining why this method is empty --- core/src/main/java/com/opensymphony/xwork2/ActionSupport.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java index f9f5040a9..8c7e15e60 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java +++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java @@ -273,6 +273,7 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex */ @Override public void validate() { + // A default implementation that validates nothing } @Override