Author: mrdon
Date: Tue Oct 10 14:35:35 2006
New Revision: 462586
URL: http://svn.apache.org/viewvc?view=rev&rev=462586
Log:
Reverted setters to not return self, ognl won't recognize them
WW-1463
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java?view=diff&rev=462586&r1=462585&r2=462586
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
Tue Oct 10 14:35:35 2006
@@ -105,9 +105,8 @@
* @param parse <tt>true</tt> if HTTP header values should be evaluated
agains the ValueStack, <tt>false</tt>
* otherwise.
*/
- public HttpHeaderResult setParse(boolean parse) {
+ public void setParse(boolean parse) {
this.parse = parse;
- return this;
}
/**
@@ -116,9 +115,8 @@
* @param status the Http status code
* @see javax.servlet.http.HttpServletResponse#setStatus(int)
*/
- public HttpHeaderResult setStatus(int status) {
+ public void setStatus(int status) {
this.status = status;
- return this;
}
/**
@@ -126,9 +124,8 @@
* @param name
* @param value
*/
- public HttpHeaderResult addHeader(String name, String value) {
+ public void addHeader(String name, String value) {
headers.put(name, value);
- return this;
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java?view=diff&rev=462586&r1=462585&r2=462586
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
Tue Oct 10 14:35:35 2006
@@ -101,9 +101,8 @@
*
* @param charSet The character set
*/
- public PlainTextResult setCharSet(String charSet) {
+ public void setCharSet(String charSet) {
this.charSet = charSet;
- return this;
}
/* (non-Javadoc)
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?view=diff&rev=462586&r1=462585&r2=462586
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
Tue Oct 10 14:35:35 2006
@@ -204,9 +204,8 @@
*
* @param actionName The name
*/
- public ServletActionRedirectResult setActionName(String actionName) {
+ public void setActionName(String actionName) {
this.actionName = actionName;
- return this;
}
/**
@@ -214,9 +213,8 @@
*
* @param namespace The namespace
*/
- public ServletActionRedirectResult setNamespace(String namespace) {
+ public void setNamespace(String namespace) {
this.namespace = namespace;
- return this;
}
/**
@@ -224,9 +222,8 @@
*
* @param method The method
*/
- public ServletActionRedirectResult setMethod(String method) {
+ public void setMethod(String method) {
this.method = method;
- return this;
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java?view=diff&rev=462586&r1=462585&r2=462586
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
Tue Oct 10 14:35:35 2006
@@ -94,9 +94,8 @@
* @param prependServletContext <tt>true</tt> to prepend the location with
the servlet context path,
* <tt>false</tt> otherwise.
*/
- public ServletRedirectResult setPrependServletContext(boolean
prependServletContext) {
+ public void setPrependServletContext(boolean prependServletContext) {
this.prependServletContext = prependServletContext;
- return this;
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java?view=diff&rev=462586&r1=462585&r2=462586
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
Tue Oct 10 14:35:35 2006
@@ -104,9 +104,8 @@
/**
* @param bufferSize The bufferSize to set.
*/
- public StreamResult setBufferSize(int bufferSize) {
+ public void setBufferSize(int bufferSize) {
this.bufferSize = bufferSize;
- return this;
}
/**
@@ -119,9 +118,8 @@
/**
* @param contentType The contentType to set.
*/
- public StreamResult setContentType(String contentType) {
+ public void setContentType(String contentType) {
this.contentType = contentType;
- return this;
}
/**
@@ -134,9 +132,8 @@
/**
* @param contentLength The contentLength to set.
*/
- public StreamResult setContentLength(String contentLength) {
+ public void setContentLength(String contentLength) {
this.contentLength = contentLength;
- return this;
}
/**
@@ -149,9 +146,8 @@
/**
* @param contentDisposition the Content-disposition header value to use.
*/
- public StreamResult setContentDisposition(String contentDisposition) {
+ public void setContentDisposition(String contentDisposition) {
this.contentDisposition = contentDisposition;
- return this;
}
/**
@@ -164,9 +160,8 @@
/**
* @param inputName The inputName to set.
*/
- public StreamResult setInputName(String inputName) {
+ public void setInputName(String inputName) {
this.inputName = inputName;
- return this;
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java?view=diff&rev=462586&r1=462585&r2=462586
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
Tue Oct 10 14:35:35 2006
@@ -113,9 +113,8 @@
super(location);
}
- public FreemarkerResult setContentType(String aContentType) {
+ public void setContentType(String aContentType) {
pContentType = aContentType;
- return this;
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java?view=diff&rev=462586&r1=462585&r2=462586
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
Tue Oct 10 14:35:35 2006
@@ -73,9 +73,8 @@
super(location);
}
- public PortletFreemarkerResult setContentType(String aContentType) {
+ public void setContentType(String aContentType) {
pContentType = aContentType;
- return this;
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?view=diff&rev=462586&r1=462585&r2=462586
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Tue Oct 10 14:35:35 2006
@@ -214,11 +214,10 @@
setStylesheetLocation(location);
}
- public XSLTResult setStylesheetLocation(String location) {
+ public void setStylesheetLocation(String location) {
if (location == null)
throw new IllegalArgumentException("Null location");
this.stylesheetLocation = location;
- return this;
}
public String getStylesheetLocation() {
@@ -230,9 +229,8 @@
*
* @param parse
*/
- public XSLTResult setParse(boolean parse) {
+ public void setParse(boolean parse) {
this.parse = parse;
- return this;
}
public void execute(ActionInvocation invocation) throws Exception {
