You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/06/28 14:48:55 UTC

[3/4] git commit: Minor improvements - add a constructor without parameters, improve javadoc.

Minor improvements - add a constructor without parameters, improve javadoc.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/daef3cd7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/daef3cd7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/daef3cd7

Branch: refs/heads/master
Commit: daef3cd72f96f78df943e00d446503e03dab13f1
Parents: e1bcc95
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 28 15:46:18 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jun 28 15:46:18 2012 +0300

----------------------------------------------------------------------
 .../request/resource/ResourceStreamResource.java   |   22 +++++++++++----
 1 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/daef3cd7/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
index a3a259d..134f69d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
@@ -49,10 +49,20 @@ public class ResourceStreamResource extends AbstractResource
 
 	private Duration cacheDuration;
 
+
+	/**
+	 * Constructor.
+	 */
+	public ResourceStreamResource()
+	{
+		this(null);
+	}
+
 	/**
-	 * Construct.
+	 * Constructor.
 	 * 
 	 * @param stream
+	 *      the resource stream to read from
 	 */
 	public ResourceStreamResource(IResourceStream stream)
 	{
@@ -61,7 +71,7 @@ public class ResourceStreamResource extends AbstractResource
 
 	/**
 	 * @param fileName
-	 * @return this
+	 * @return this object, for chaining
 	 */
 	public ResourceStreamResource setFileName(String fileName)
 	{
@@ -71,7 +81,7 @@ public class ResourceStreamResource extends AbstractResource
 
 	/**
 	 * @param contentDisposition
-	 * @return thsi
+	 * @return this object, for chaining
 	 */
 	public ResourceStreamResource setContentDisposition(ContentDisposition contentDisposition)
 	{
@@ -81,7 +91,7 @@ public class ResourceStreamResource extends AbstractResource
 
 	/**
 	 * @param textEncoding
-	 * @return this
+	 * @return this object, for chaining
 	 */
 	public ResourceStreamResource setTextEncoding(String textEncoding)
 	{
@@ -100,7 +110,7 @@ public class ResourceStreamResource extends AbstractResource
 	/**
 	 * @param cacheDuration
 	 *            the duration for which the resource will be cached by the browser
-	 * @return this component
+	 * @return this object, for chaining
 	 */
 	public ResourceStreamResource setCacheDuration(Duration cacheDuration)
 	{
@@ -110,7 +120,7 @@ public class ResourceStreamResource extends AbstractResource
 
 	/**
 	 * Lazy or dynamic initialization of the wrapped IResourceStream(Writer)
-	 * @return the underlying IResourceStream
+	 * @return the underlying IResourceStream. May be {@code null}.
 	 */
 	protected IResourceStream getResourceStream()
 	{