Author: pete
Date: Sat Sep 11 12:50:38 2010
New Revision: 996139
URL: http://svn.apache.org/viewvc?rev=996139&view=rev
Log:
improve readabilty through helper methods
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java?rev=996139&r1=996138&r2=996139&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
Sat Sep 11 12:50:38 2010
@@ -392,7 +392,7 @@ public class KittenCaptchaPanel extends
protected void configureResponse(ResourceResponse response,
Attributes attributes)
{
super.configureResponse(response, attributes);
- response.setCacheDuration(0);
+ response.disableCaching();
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=996139&r1=996138&r2=996139&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
Sat Sep 11 12:50:38 2010
@@ -307,7 +307,7 @@ public abstract class AbstractResource i
*/
public void setCacheDurationToMaximum()
{
- cacheDuration = Integer.MAX_VALUE;
+ cacheDuration = RequestUtils.MAX_CACHE_DURATION;
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=996139&r1=996138&r2=996139&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
Sat Sep 11 12:50:38 2010
@@ -211,7 +211,7 @@ public class PackageResource extends Abs
// if timestamps are enabled on resource we can maximize
caching with no pain
if(Application.get().getResourceSettings().getUseTimestampOnResources())
{
- resourceResponse.setCacheDuration(Integer.MAX_VALUE);
+ resourceResponse.setCacheDurationToMaximum();
resourceResponse.setCachePublic(true);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java?rev=996139&r1=996138&r2=996139&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
Sat Sep 11 12:50:38 2010
@@ -215,11 +215,12 @@ public interface IResourceSettings
/**
* Set the the default cache duration for WebResource.
* <p/>
- * Setting <code>duration = Integer.MAX_VALUE</code> will select the
largest recommended value
- * based on RFC-2616 which actually is one year.
+ * Based on RFC-2616 this should not exceed one year.
*
* @param defaultDuration
* default cache duration in seconds
+ *
+ * @see org.apache.wicket.protocol.http.RequestUtils#MAX_CACHE_DURATION
*/
void setDefaultCacheDuration(int defaultDuration);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java?rev=996139&r1=996138&r2=996139&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
Sat Sep 11 12:50:38 2010
@@ -99,7 +99,7 @@ public class WicketFilterTest extends Te
protected ResourceResponse
newResourceResponse(Attributes attributes)
{
ResourceResponse response =
super.newResourceResponse(attributes);
-
response.setCacheDuration(Integer.MAX_VALUE);
+ response.setCacheDurationToMaximum();
return response;
}
};
