You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2010/01/12 01:10:09 UTC
svn commit: r898125 - in /wicket/trunk:
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/
wicket/src/main/disabled/org/apache/wicket/
wicket/src/main/disabled/org/apache/wicket/markup/html/
wicket/src/main/disabled/org/a...
Author: knopp
Date: Tue Jan 12 00:10:08 2010
New Revision: 898125
URL: http://svn.apache.org/viewvc?rev=898125&view=rev
Log:
more fixes
Added:
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/Resource.java
- copied unchanged from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/Resource.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/DynamicWebResource.java (contents, props changed)
- copied, changed from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DynamicWebResource.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/WebResource.java (contents, props changed)
- copied, changed from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebResource.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/image/
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/image/resource/
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java (contents, props changed)
- copied, changed from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ByteArrayResource.java (contents, props changed)
- copied, changed from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ByteArrayResource.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ContextRelativeResource.java (contents, props changed)
- copied, changed from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ContextRelativeResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ByteArrayResource.java (with props)
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/DynamicImageResource.java (with props)
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Resource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DynamicWebResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ByteArrayResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ContextRelativeResource.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/IResourceFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/AbstractResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceStreamResource.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java Tue Jan 12 00:10:08 2010
@@ -33,9 +33,9 @@
import java.util.Random;
import org.apache.wicket.IClusterable;
-import org.apache.wicket.markup.html.image.resource.DynamicImageResource;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.resource.DynamicImageResource;
import org.apache.wicket.util.time.Time;
@@ -229,7 +229,6 @@
*
* @see org.apache.wicket.Resource#invalidate()
*/
- @Override
public final void invalidate()
{
challengeIdhashCode = null;
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/DynamicWebResource.java (from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DynamicWebResource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/DynamicWebResource.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/DynamicWebResource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DynamicWebResource.java&r1=897353&r2=898125&rev=898125&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/DynamicWebResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/WebResource.java (from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebResource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/WebResource.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/WebResource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebResource.java&r1=897353&r2=898125&rev=898125&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/WebResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/WebResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java (from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java&r1=897353&r2=898125&rev=898125&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ByteArrayResource.java (from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ByteArrayResource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ByteArrayResource.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ByteArrayResource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ByteArrayResource.java&r1=897353&r2=898125&rev=898125&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ByteArrayResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ByteArrayResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ContextRelativeResource.java (from r897353, wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ContextRelativeResource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ContextRelativeResource.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ContextRelativeResource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ContextRelativeResource.java&r1=897353&r2=898125&rev=898125&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/resource/ContextRelativeResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/IResourceFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/IResourceFactory.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/IResourceFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/IResourceFactory.java Tue Jan 12 00:10:08 2010
@@ -18,6 +18,8 @@
import java.util.Locale;
+import org.apache.wicket.ng.resource.IResource;
+
/**
* A factory which creates resources for a given specification string. The format of the
* specification string is determined by the resource factory subclass. If the resource factory
@@ -40,6 +42,6 @@
* The component's variation
* @return The resource
*/
- Resource newResource(final String specification, final Locale locale, final String style,
+ IResource newResource(final String specification, final Locale locale, final String style,
final String variation);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java Tue Jan 12 00:10:08 2010
@@ -17,13 +17,13 @@
package org.apache.wicket.markup.html.form;
import org.apache.wicket.IResourceListener;
-import org.apache.wicket.Resource;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.image.resource.LocalizedImageResource;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.ng.resource.IResource;
import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.util.value.ValueMap;
/**
@@ -92,7 +92,7 @@
* The resource parameters
*/
public ImageButton(final String id, final ResourceReference resourceReference,
- ValueMap resourceParameters)
+ PageParameters resourceParameters)
{
super(id);
setImageResourceReference(resourceReference, resourceParameters);
@@ -111,7 +111,7 @@
* @param imageResource
* The image resource
*/
- public ImageButton(final String id, final Resource imageResource)
+ public ImageButton(final String id, final IResource imageResource)
{
super(id);
setImageResource(imageResource);
@@ -145,14 +145,14 @@
*/
public void onResourceRequested()
{
- localizedImageResource.onResourceRequested();
+ localizedImageResource.onResourceRequested(null);
}
/**
* @param imageResource
* The new ImageResource to set.
*/
- public void setImageResource(final Resource imageResource)
+ public void setImageResource(final IResource imageResource)
{
localizedImageResource.setResource(imageResource);
}
@@ -173,7 +173,7 @@
* Set the resource parameters for the resource.
*/
public void setImageResourceReference(final ResourceReference resourceReference,
- final ValueMap parameters)
+ final PageParameters parameters)
{
localizedImageResource.setResourceReference(resourceReference, parameters);
}
@@ -194,7 +194,7 @@
/**
* @return Resource returned from subclass
*/
- protected Resource getImageResource()
+ protected IResource getImageResource()
{
return localizedImageResource.getResource();
}
@@ -220,7 +220,7 @@
checkComponentTag(tag, "input");
checkComponentTagAttribute(tag, "type", "image");
- final Resource resource = getImageResource();
+ final IResource resource = getImageResource();
if (resource != null)
{
localizedImageResource.setResource(resource);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java Tue Jan 12 00:10:08 2010
@@ -18,15 +18,15 @@
import org.apache.wicket.Component;
import org.apache.wicket.IResourceListener;
-import org.apache.wicket.Resource;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.image.resource.LocalizedImageResource;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.ng.resource.IResource;
import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.util.value.ValueMap;
/**
* An Image component displays a localizable image resource.
@@ -95,7 +95,7 @@
* The resource parameters
*/
public Image(final String id, final ResourceReference resourceReference,
- ValueMap resourceParameters)
+ PageParameters resourceParameters)
{
super(id);
setImageResourceReference(resourceReference, resourceParameters);
@@ -114,7 +114,7 @@
* @param imageResource
* The image resource
*/
- public Image(final String id, final Resource imageResource)
+ public Image(final String id, final IResource imageResource)
{
super(id);
setImageResource(imageResource);
@@ -145,14 +145,14 @@
*/
public void onResourceRequested()
{
- localizedImageResource.onResourceRequested();
+ localizedImageResource.onResourceRequested(null);
}
/**
* @param imageResource
* The new ImageResource to set.
*/
- public void setImageResource(final Resource imageResource)
+ public void setImageResource(final IResource imageResource)
{
localizedImageResource.setResource(imageResource);
}
@@ -173,7 +173,7 @@
* Set the resource parameters for the resource.
*/
public void setImageResourceReference(final ResourceReference resourceReference,
- final ValueMap parameters)
+ final PageParameters parameters)
{
localizedImageResource.setResourceReference(resourceReference, parameters);
}
@@ -194,7 +194,7 @@
/**
* @return Resource returned from subclass
*/
- protected Resource getImageResource()
+ protected IResource getImageResource()
{
return localizedImageResource.getResource();
}
@@ -227,7 +227,7 @@
{
checkComponentTag(tag, "img");
super.onComponentTag(tag);
- final Resource resource = getImageResource();
+ final IResource resource = getImageResource();
if (resource != null)
{
localizedImageResource.setResource(resource);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java Tue Jan 12 00:10:08 2010
@@ -16,9 +16,10 @@
*/
package org.apache.wicket.markup.html.image;
-import org.apache.wicket.Resource;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.ng.resource.IResource;
import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.value.ValueMap;
@@ -56,7 +57,7 @@
* @param id
* @param imageResource
*/
- public NonCachingImage(String id, Resource imageResource)
+ public NonCachingImage(String id, IResource imageResource)
{
super(id, imageResource);
}
@@ -71,7 +72,7 @@
* @param resourceParameters
*/
public NonCachingImage(String id, ResourceReference resourceReference,
- ValueMap resourceParameters)
+ PageParameters resourceParameters)
{
super(id, resourceReference, resourceParameters);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java Tue Jan 12 00:10:08 2010
@@ -21,9 +21,9 @@
import java.io.InputStream;
import java.sql.Blob;
import java.sql.SQLException;
-import java.util.Locale;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.ng.resource.DynamicImageResource;
import org.apache.wicket.util.io.Streams;
@@ -44,27 +44,6 @@
/**
* Construct.
*
- * @param locale
- */
- public BlobImageResource(Locale locale)
- {
- super(locale);
- }
-
- /**
- * Construct.
- *
- * @param format
- * @param locale
- */
- public BlobImageResource(String format, Locale locale)
- {
- super(format, locale);
- }
-
- /**
- * Construct.
- *
* @param format
*/
public BlobImageResource(String format)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java Tue Jan 12 00:10:08 2010
@@ -17,7 +17,8 @@
package org.apache.wicket.markup.html.image.resource;
import java.awt.image.BufferedImage;
-import java.util.Locale;
+
+import org.apache.wicket.ng.resource.DynamicImageResource;
/**
* A DynamicImageResource subclass that holds a BufferedImage generated by code elsewhere. The image
@@ -50,27 +51,6 @@
/**
* Construct.
*
- * @param locale
- */
- public BufferedDynamicImageResource(Locale locale)
- {
- super(locale);
- }
-
- /**
- * Construct.
- *
- * @param format
- * @param locale
- */
- public BufferedDynamicImageResource(String format, Locale locale)
- {
- super(format, locale);
- }
-
- /**
- * Construct.
- *
* @param format
*/
public BufferedDynamicImageResource(String format)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java Tue Jan 12 00:10:08 2010
@@ -19,8 +19,8 @@
import java.util.Locale;
import org.apache.wicket.IResourceFactory;
-import org.apache.wicket.Resource;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.ng.resource.IResource;
import org.apache.wicket.util.parse.metapattern.Group;
import org.apache.wicket.util.parse.metapattern.IntegerGroup;
import org.apache.wicket.util.parse.metapattern.MetaPattern;
@@ -40,7 +40,7 @@
* @see org.apache.wicket.IResourceFactory#newResource(java.lang.String, java.util.Locale,
* java.lang.String, java.lang.String)
*/
- public Resource newResource(final String specification, final Locale locale,
+ public IResource newResource(final String specification, final Locale locale,
final String style, final String variation)
{
final Parser parser = new Parser(specification);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Tue Jan 12 00:10:08 2010
@@ -21,22 +21,24 @@
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.IResourceFactory;
import org.apache.wicket.IResourceListener;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Resource;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.ng.resource.IResource;
import org.apache.wicket.ng.resource.PackageResource;
import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.ng.resource.IResource.Attributes;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.parse.metapattern.Group;
import org.apache.wicket.util.parse.metapattern.MetaPattern;
import org.apache.wicket.util.parse.metapattern.OptionalMetaPattern;
import org.apache.wicket.util.parse.metapattern.parsers.MetaPatternParser;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.value.ValueMap;
/**
@@ -67,7 +69,7 @@
*
* @author Jonathan Locke
*/
-public final class LocalizedImageResource implements IClusterable, IResourceListener
+public final class LocalizedImageResource implements IClusterable
{
private static final long serialVersionUID = 1L;
@@ -81,13 +83,13 @@
private final Component component;
/** The image resource this image component references */
- private Resource resource;
+ private IResource resource;
/** The resource reference */
private ResourceReference resourceReference;
/** The resource parameters */
- private ValueMap resourceParameters;
+ private PageParameters resourceParameters;
/** The locale of the image resource */
private Locale locale;
@@ -179,33 +181,36 @@
// If we have a resource reference
if (resourceReference != null)
{
+ component.getApplication().getResourceReferenceRegistry().registerResourceReference(
+ resourceReference);
// Bind the reference to the application
- resourceReference.bind(component.getApplication());
// Then dereference the resource
resource = resourceReference.getResource();
if (resource instanceof PackageResource)
{
- resourceReference.setLocale(((PackageResource)resource).getLocale());
+ // TODO NG - deal with this
+ // it's really ugly how resource pushes locale to resource reference :-|
+ // resourceReference.setLocale(((PackageResource)resource).getLocale());
}
}
}
- /**
- * @see org.apache.wicket.IResourceListener#onResourceRequested()
- */
- public final void onResourceRequested()
+ public final void onResourceRequested(PageParameters parameters)
{
bind();
- resource.onResourceRequested();
+ RequestCycle requestCycle = RequestCycle.get();
+ Attributes attributes = new Attributes(requestCycle.getRequest(),
+ requestCycle.getResponse(), parameters);
+ resource.respond(attributes);
}
/**
* @param resource
* The resource to set.
*/
- public final void setResource(final Resource resource)
+ public final void setResource(final IResource resource)
{
if (this.resource != resource)
{
@@ -238,7 +243,7 @@
* The resource parameters for the shared resource
*/
public final void setResourceReference(final ResourceReference resourceReference,
- final ValueMap resourceParameters)
+ final PageParameters resourceParameters)
{
if (resourceReference != this.resourceReference)
{
@@ -291,44 +296,49 @@
{
resourceReference = (ResourceReference)modelObject;
}
- else if (modelObject instanceof Resource)
+ else if (modelObject instanceof IResource)
{
- resource = (Resource)modelObject;
+ resource = (IResource)modelObject;
}
+ // FIXME NG
+ // Not yet supported
+
// Need to load image resource for this component?
- if (resource == null && resourceReference == null)
- {
- // Get SRC attribute of tag
- final CharSequence src = tag.getString("src");
- if (src != null)
- {
- // Try to load static image
- loadStaticImage(src.toString());
- }
- else
- {
- // Get VALUE attribute of tag
- final CharSequence value = tag.getString("value");
- if (value != null)
- {
- // Try to generate an image using an image factory
- newImage(value);
- }
- else
- {
- // Load static image using model object as the path
- loadStaticImage(component.getDefaultModelObjectAsString());
- }
- }
- }
+// if (resource == null && resourceReference == null)
+// {
+// // Get SRC attribute of tag
+// final CharSequence src = tag.getString("src");
+// if (src != null)
+// {
+// // Try to load static image
+// // loadStaticImage(src.toString());
+// }
+// else
+// {
+// // Get VALUE attribute of tag
+// final CharSequence value = tag.getString("value");
+// if (value != null)
+// {
+// // Try to generate an image using an image factory
+// newImage(value);
+// }
+// else
+// {
+// // Load static image using model object as the path
+// loadStaticImage(component.getDefaultModelObjectAsString());
+// }
+// }
+// }
// Get URL for resource
final CharSequence url;
if (resourceReference != null)
{
// Create URL to shared resource
- url = RequestCycle.get().urlFor(resourceReference, resourceParameters);
+ IRequestHandler handler = new ResourceReferenceRequestHandler(resourceReference,
+ resourceParameters);
+ url = RequestCycle.get().renderUrlFor(handler);
}
else
{
@@ -365,41 +375,27 @@
return factory;
}
- /**
- * Tries to load static image at the given path and throws an exception if the image cannot be
- * located.
- *
- * @param path
- * The path to the image
- * @throws WicketRuntimeException
- * Thrown if the image cannot be located
- */
- @SuppressWarnings("unchecked")
- private void loadStaticImage(final String path)
+
+ static class SimpleStaticResourceReference extends ResourceReference
{
- MarkupContainer parent = component.findParentWithAssociatedMarkup();
- final Class scope = parent.getClass();
- resourceReference = new ResourceReference(scope, path)
- {
- private static final long serialVersionUID = 1L;
-
- /**
- * @see org.apache.wicket.ResourceReference#newResource()
- */
- @Override
- protected Resource newResource()
- {
- PackageResource pr = PackageResource.get(getScope(), getName(), locale, style,
- variation);
- locale = pr.getLocale();
- return pr;
- }
- };
- resourceReference.setLocale(locale);
- resourceReference.setStyle(style);
- resourceReference.setVariation(variation);
- bind();
- }
+ final IResource resource;
+
+ public SimpleStaticResourceReference(Class<?> scope, String name, Locale locale,
+ String style, String variation, IResource resource)
+ {
+ super(scope, name, locale, style, variation);
+ this.resource = resource;
+ }
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public IResource getResource()
+ {
+ return resource;
+ }
+
+ };
/**
* Generates an image resource based on the attribute values on tag
@@ -424,22 +420,23 @@
if (!Strings.isEmpty(imageReferenceName))
{
// Is resource already available via the application?
- if (application.getSharedResources().get(Application.class, imageReferenceName,
- locale, style, variation, true) == null)
+ if (application.getResourceReferenceRegistry().getResourceReference(
+ Application.class, imageReferenceName, locale, style, variation, false) == null)
{
// Resource not available yet, so create it with factory and
// share via Application
- final Resource imageResource = getResourceFactory(application, factoryName).newResource(
+ final IResource imageResource = getResourceFactory(application, factoryName).newResource(
specification, locale, style, variation);
- application.getSharedResources().add(Application.class, imageReferenceName,
- locale, style, variation, imageResource);
+
+ ResourceReference ref = new SimpleStaticResourceReference(Application.class,
+ imageReferenceName, locale, style, variation, imageResource);
+
+ application.getResourceReferenceRegistry().registerResourceReference(ref);
}
// Create resource reference
- resourceReference = new ResourceReference(Application.class, imageReferenceName);
- resourceReference.setLocale(locale);
- resourceReference.setStyle(style);
- resourceReference.setVariation(variation);
+ resourceReference = new ResourceReference(Application.class, imageReferenceName,
+ locale, style, variation);
}
else
{
@@ -461,7 +458,7 @@
*
* @return resource or <code>null</code> if there is none
*/
- public final Resource getResource()
+ public final IResource getResource()
{
return resource;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java Tue Jan 12 00:10:08 2010
@@ -20,6 +20,7 @@
import java.awt.image.BufferedImage;
import java.lang.ref.SoftReference;
+import org.apache.wicket.ng.resource.DynamicImageResource;
import org.apache.wicket.util.time.Time;
@@ -116,7 +117,6 @@
*
* @see org.apache.wicket.Resource#invalidate()
*/
- @Override
public synchronized void invalidate()
{
imageData = null;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/AbstractResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/AbstractResource.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/AbstractResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/AbstractResource.java Tue Jan 12 00:10:08 2010
@@ -34,7 +34,7 @@
/**
* Convenience resource implementation. The subclass must implement
- * {@link #newResourceData(org.apache.wicket.ng.resource.IResource.Attributes)} method.
+ * {@link #newResourceResponse(org.apache.wicket.ng.resource.IResource.Attributes)} method.
*
* @author Matej Knopp
*/
@@ -50,12 +50,12 @@
}
/**
- * Override this method to return a {@link ResourceData} for the request.
+ * Override this method to return a {@link ResourceResponse} for the request.
*
* @param attributes
* @return resource data instance
*/
- protected abstract ResourceData newResourceData(Attributes attributes);
+ protected abstract ResourceResponse newResourceResponse(Attributes attributes);
/**
* Represents content disposition of a resource
@@ -79,7 +79,7 @@
*
* @author Matej Knopp
*/
- public static class ResourceData
+ public static class ResourceResponse
{
private Integer errorCode;
private String fileName = null;
@@ -95,7 +95,7 @@
/**
* Construct.
*/
- public ResourceData()
+ public ResourceResponse()
{
cacheDuration = Application.get().getResourceSettings().getDefaultCacheDuration();
}
@@ -331,7 +331,7 @@
}
};
- protected void configureCache(WebRequest request, WebResponse response, ResourceData data,
+ protected void configureCache(WebRequest request, WebResponse response, ResourceResponse data,
Attributes attributes)
{
if (data.isCacheable())
@@ -349,7 +349,7 @@
public final void respond(Attributes attributes)
{
- ResourceData data = newResourceData(attributes);
+ ResourceResponse data = newResourceResponse(attributes);
WebRequest request = (WebRequest)attributes.getRequest();
WebResponse response = (WebResponse)attributes.getResponse();
Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ByteArrayResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ByteArrayResource.java?rev=898125&view=auto
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ByteArrayResource.java (added)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ByteArrayResource.java Tue Jan 12 00:10:08 2010
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.ng.resource;
+
+import java.util.Locale;
+
+import org.apache.wicket.util.time.Time;
+
+/**
+ * @author Matej Knopp
+ */
+public class ByteArrayResource extends AbstractResource
+{
+ private static final long serialVersionUID = 1L;
+
+ /** the content type. */
+ private final String contentType;
+
+ /** binary data. */
+ private final byte[] array;
+
+ /** the time that this resource was last modified; same as construction time. */
+ private final Time lastModified = Time.now();
+
+ private final String filename;
+
+ /**
+ * Creates a Resource from the given byte array with its content type
+ *
+ * @param contentType
+ * The Content type of the array.
+ * @param array
+ * The binary content
+ */
+ public ByteArrayResource(final String contentType, final byte[] array)
+ {
+ this.contentType = contentType;
+ this.array = array;
+ filename = null;
+ }
+
+ /**
+ * Creates a Resource from the given byte array with its content type
+ *
+ * @param contentType
+ * The Content type of the array.
+ * @param array
+ * The binary content
+ * @param filename
+ * The filename that will be set as the Content-Disposition header.
+ */
+ public ByteArrayResource(final String contentType, final byte[] array, final String filename)
+ {
+ this.contentType = contentType;
+ this.array = array;
+ this.filename = filename;
+ }
+
+ /**
+ * Creates a Resource from the given byte array with its content type and the locale for which
+ * it is valid.
+ *
+ * @param contentType
+ * The Content type of the array.
+ * @param array
+ * The binary content.
+ * @param locale
+ * The locale of this resource
+ */
+ public ByteArrayResource(final String contentType, final byte[] array, final Locale locale)
+ {
+ this.contentType = contentType;
+ this.array = array;
+ filename = null;
+ }
+
+ protected void configureResponse(final ResourceResponse response, final Attributes attributes)
+ {
+
+ }
+
+ @Override
+ protected ResourceResponse newResourceResponse(final Attributes attributes)
+ {
+ final ResourceResponse response = new ResourceResponse();
+
+ response.setContentType(contentType);
+ response.setLastModified(lastModified.toDate());
+
+ if (response.dataNeedsToBeWritten(attributes))
+ {
+
+ if (filename != null)
+ {
+ response.setFileName(filename);
+ response.setContentDisposition(ContentDisposition.ATTACHMENT);
+ }
+ else
+ {
+ response.setContentDisposition(ContentDisposition.INLINE);
+ }
+ response.setWriteCallback(new WriteCallback()
+ {
+ @Override
+ public void writeData(final Attributes attributes)
+ {
+ attributes.getResponse().write(array);
+ }
+ });
+
+ configureResponse(response, attributes);
+
+ }
+
+ return response;
+ }
+
+}
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ByteArrayResource.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/DynamicImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/DynamicImageResource.java?rev=898125&view=auto
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/DynamicImageResource.java (added)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/DynamicImageResource.java Tue Jan 12 00:10:08 2010
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.ng.resource;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
+import javax.imageio.ImageIO;
+
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.util.time.Time;
+
+public abstract class DynamicImageResource extends AbstractResource
+{
+ /** The image type */
+ private String format = "png";
+
+ /** The last modified time of this resource */
+ private Time lastModifiedTime;
+
+
+ public DynamicImageResource()
+ {
+ }
+
+ /**
+ * Creates a dynamic resource from for the given locale
+ *
+ * @param format
+ * The image format ("png", "jpeg", etc)
+ */
+ public DynamicImageResource(String format)
+ {
+ setFormat(format);
+ }
+
+ /**
+ * @return Returns the image format.
+ */
+ public synchronized final String getFormat()
+ {
+ return format;
+ }
+
+ /**
+ * Sets the format of this resource
+ *
+ * @param format
+ * The format (jpg, png or gif..)
+ */
+ public synchronized final void setFormat(String format)
+ {
+ this.format = format;
+ }
+
+ /**
+ * set the last modified time for this resource.
+ *
+ * @param time
+ */
+ protected synchronized void setLastModifiedTime(Time time)
+ {
+ lastModifiedTime = time;
+ }
+
+ /**
+ * @param image
+ * The image to turn into data
+ * @return The image data for this dynamic image
+ */
+ protected byte[] toImageData(final BufferedImage image)
+ {
+ try
+ {
+ // Create output stream
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+ // Write image using any matching ImageWriter
+ ImageIO.write(image, format, out);
+
+ // Return the image data
+ return out.toByteArray();
+ }
+ catch (IOException e)
+ {
+ throw new WicketRuntimeException("Unable to convert dynamic image to stream", e);
+ }
+ }
+
+ /**
+ * Get image data for our dynamic image resource. If the subclass regenerates the data, it
+ * should set the lastModifiedTime when it does so. This ensures that image caching works
+ * correctly.
+ *
+ * @return The image data for this dynamic image
+ */
+ protected abstract byte[] getImageData();
+
+
+ protected void configureResponse(final ResourceResponse response, final Attributes attributes)
+ {
+
+ }
+
+ @Override
+ protected ResourceResponse newResourceResponse(final Attributes attributes)
+ {
+ final ResourceResponse response = new ResourceResponse();
+
+ if (lastModifiedTime != null)
+ {
+ response.setLastModified(lastModifiedTime.toDate());
+ }
+ else
+ {
+ response.setLastModified(new Date());
+ }
+
+ if (response.dataNeedsToBeWritten(attributes))
+ {
+ response.setContentType("image/" + getFormat());
+
+ response.setContentDisposition(ContentDisposition.INLINE);
+
+ response.setWriteCallback(new WriteCallback()
+ {
+ @Override
+ public void writeData(final Attributes attributes)
+ {
+ attributes.getResponse().write(getImageData());
+ }
+ });
+
+ configureResponse(response, attributes);
+ }
+
+ return response;
+ }
+}
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/DynamicImageResource.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceStreamResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceStreamResource.java?rev=898125&r1=898124&r2=898125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceStreamResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceStreamResource.java Tue Jan 12 00:10:08 2010
@@ -63,9 +63,9 @@
}
@Override
- protected ResourceData newResourceData(Attributes attributes)
+ protected ResourceResponse newResourceResponse(Attributes attributes)
{
- ResourceData data = new ResourceData();
+ ResourceResponse data = new ResourceResponse();
data.setLastModified(stream.lastModifiedTime().toDate());
// performance check; don't bother to do anything if the resource is still cached by client