Author: germuska
Date: Mon May 2 06:13:22 2005
New Revision: 165624
URL: http://svn.apache.org/viewcvs?rev=165624&view=rev
Log:
Remove reference to 'resources' property; replace with 'messageResources' which
is the correct name in the interface.
Modified:
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java
Modified:
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java?rev=165624&r1=165623&r2=165624&view=diff
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
Mon May 2 06:13:22 2005
@@ -86,12 +86,12 @@
this.getRequestScope().put(Globals.MAPPING_KEY, actionConfig);
}
- public MessageResources getResources() {
+ public MessageResources getMessageResources() {
return ((MessageResources)
getRequest().getAttribute(Globals.MESSAGES_KEY));
}
- public MessageResources getResources(String key) {
+ public MessageResources getMessageResources(String key) {
// Identify the current module
ServletContext context = getActionServlet().getServletContext();
@@ -102,12 +102,12 @@
}
- public void setResources(MessageResources resources) {
- super.setResources(resources);
+ public void setMessageResources(MessageResources resources) {
+ super.setMessageResources(resources);
this.getRequest().setAttribute(Globals.MESSAGES_KEY, resources);
}
- public void setResources(String key, MessageResources resources) {
+ public void setMessageResources(String key, MessageResources resources) {
this.getRequest().setAttribute(key + getModuleConfig().getPrefix(),
resources);
}
Modified:
struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java?rev=165624&r1=165623&r2=165624&view=diff
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java
Mon May 2 06:13:22 2005
@@ -119,17 +119,6 @@
* instead of the ServletWebContext level. Consider whether that's how we
want to do it
* universally for other manipulations of the RequestScope or not...
*/
- public void setResources(MessageResources messageResources) {
- super.setMessageResources(messageResources);
- this.getRequestScope().put(Globals.MESSAGES_KEY, messageResources);
-
- }
-
- /*
- * @todo AbstractSelectModule set the precedent of doing this at the "web
context" level
- * instead of the ServletWebContext level. Consider whether that's how we
want to do it
- * universally for other manipulations of the RequestScope or not...
- */
public void setCancelled(Boolean cancelled) {
super.setCancelled(cancelled);
// historic semantics of "isCancelled" are to consider any non-null
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
