From cbfd45460c277ca2fc69cf383aaa32695bd6165a Mon Sep 17 00:00:00 2001 From: "Donald J. Brown" Date: Tue, 10 Oct 2006 21:35:35 +0000 Subject: [PATCH] Reverted setters to not return self, ognl won't recognize them WW-1463 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@462586 13f79535-47bb-0310-9956-ffa450edef68 --- .../struts2/dispatcher/HttpHeaderResult.java | 9 +++------ .../struts2/dispatcher/PlainTextResult.java | 3 +-- .../dispatcher/ServletActionRedirectResult.java | 9 +++------ .../struts2/dispatcher/ServletRedirectResult.java | 3 +-- .../apache/struts2/dispatcher/StreamResult.java | 15 +++++---------- .../views/freemarker/FreemarkerResult.java | 3 +-- .../views/freemarker/PortletFreemarkerResult.java | 3 +-- .../org/apache/struts2/views/xslt/XSLTResult.java | 6 ++---- 8 files changed, 17 insertions(+), 34 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java index 95c0fc93d..4c4540920 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java @@ -105,9 +105,8 @@ public class HttpHeaderResult implements Result { * @param parse true if HTTP header values should be evaluated agains the ValueStack, false * otherwise. */ - public HttpHeaderResult setParse(boolean parse) { + public void setParse(boolean parse) { this.parse = parse; - return this; } /** @@ -116,9 +115,8 @@ public class HttpHeaderResult implements Result { * @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 @@ public class HttpHeaderResult implements Result { * @param name * @param value */ - public HttpHeaderResult addHeader(String name, String value) { + public void addHeader(String name, String value) { headers.put(name, value); - return this; } /** diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java index 671eeef44..62490a4f0 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java @@ -101,9 +101,8 @@ public class PlainTextResult extends StrutsResultSupport { * * @param charSet The character set */ - public PlainTextResult setCharSet(String charSet) { + public void setCharSet(String charSet) { this.charSet = charSet; - return this; } /* (non-Javadoc) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java index 4d4a92072..33222a810 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java @@ -204,9 +204,8 @@ public class ServletActionRedirectResult extends ServletRedirectResult { * * @param actionName The name */ - public ServletActionRedirectResult setActionName(String actionName) { + public void setActionName(String actionName) { this.actionName = actionName; - return this; } /** @@ -214,9 +213,8 @@ public class ServletActionRedirectResult extends ServletRedirectResult { * * @param namespace The namespace */ - public ServletActionRedirectResult setNamespace(String namespace) { + public void setNamespace(String namespace) { this.namespace = namespace; - return this; } /** @@ -224,9 +222,8 @@ public class ServletActionRedirectResult extends ServletRedirectResult { * * @param method The method */ - public ServletActionRedirectResult setMethod(String method) { + public void setMethod(String method) { this.method = method; - return this; } /** diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java index 86ddba8ce..5eee5b9b3 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java @@ -94,9 +94,8 @@ public class ServletRedirectResult extends StrutsResultSupport { * @param prependServletContext true to prepend the location with the servlet context path, * false otherwise. */ - public ServletRedirectResult setPrependServletContext(boolean prependServletContext) { + public void setPrependServletContext(boolean prependServletContext) { this.prependServletContext = prependServletContext; - return this; } /** diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java index a698164b5..6f4f0a044 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java @@ -104,9 +104,8 @@ public class StreamResult extends StrutsResultSupport { /** * @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 @@ public class StreamResult extends StrutsResultSupport { /** * @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 @@ public class StreamResult extends StrutsResultSupport { /** * @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 @@ public class StreamResult extends StrutsResultSupport { /** * @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 @@ public class StreamResult extends StrutsResultSupport { /** * @param inputName The inputName to set. */ - public StreamResult setInputName(String inputName) { + public void setInputName(String inputName) { this.inputName = inputName; - return this; } /** diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java index 326073493..ac6105df0 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java @@ -113,9 +113,8 @@ public class FreemarkerResult extends StrutsResultSupport { super(location); } - public FreemarkerResult setContentType(String aContentType) { + public void setContentType(String aContentType) { pContentType = aContentType; - return this; } /** diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java index 49b6b5441..b5d3c5aa9 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java @@ -73,9 +73,8 @@ public class PortletFreemarkerResult extends StrutsResultSupport { super(location); } - public PortletFreemarkerResult setContentType(String aContentType) { + public void setContentType(String aContentType) { pContentType = aContentType; - return this; } /** diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java index 93f496b0b..b0ee149cb 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java @@ -214,11 +214,10 @@ public class XSLTResult implements Result { 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 @@ public class XSLTResult implements Result { * * @param parse */ - public XSLTResult setParse(boolean parse) { + public void setParse(boolean parse) { this.parse = parse; - return this; } public void execute(ActionInvocation invocation) throws Exception {