You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ts...@apache.org on 2015/06/29 17:31:49 UTC
wicket git commit: WICKET-5819 Use ResourceReference instead of
PackageResourceReference
Repository: wicket
Updated Branches:
refs/heads/master 759a8355c -> e20bfa738
WICKET-5819 Use ResourceReference instead of PackageResourceReference
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e20bfa73
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e20bfa73
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e20bfa73
Branch: refs/heads/master
Commit: e20bfa738aa64f35b668f05866e0c0b7ca71c1f4
Parents: 759a835
Author: Tobias Soloschenko <ts...@apache.org>
Authored: Mon Jun 29 17:30:58 2015 +0200
Committer: Tobias Soloschenko <ts...@apache.org>
Committed: Mon Jun 29 17:30:58 2015 +0200
----------------------------------------------------------------------
.../markup/html/media/MediaComponent.java | 22 ++++++++---------
.../apache/wicket/markup/html/media/Source.java | 25 ++++++++++++--------
.../wicket/markup/html/media/audio/Audio.java | 18 +++++++-------
.../wicket/markup/html/media/video/Video.java | 17 +++++++------
4 files changed, 43 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e20bfa73/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
index 96d757b..0a026df 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
@@ -23,7 +23,7 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
-import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* The media component is used to provide basic functionality to the video and audio component. The
@@ -132,7 +132,7 @@ public abstract class MediaComponent extends WebMarkupContainer
private final PageParameters pageParameters;
- private final PackageResourceReference resourceReference;
+ private final ResourceReference resourceReference;
private final String url;
@@ -166,9 +166,9 @@ public abstract class MediaComponent extends WebMarkupContainer
* @param id
* The component id
* @param resourceReference
- * the package resource reference of the media file
+ * the resource reference of the media file
*/
- public MediaComponent(String id, PackageResourceReference resourceReference)
+ public MediaComponent(String id, ResourceReference resourceReference)
{
this(id, null, null, null, resourceReference);
}
@@ -181,9 +181,9 @@ public abstract class MediaComponent extends WebMarkupContainer
* @param model
* the internally used model
* @param resourceReference
- * the package resource reference of the media file
+ * the resource reference of the media file
*/
- public MediaComponent(String id, IModel<?> model, PackageResourceReference resourceReference)
+ public MediaComponent(String id, IModel<?> model, ResourceReference resourceReference)
{
this(id, model, null, null, resourceReference);
}
@@ -194,11 +194,11 @@ public abstract class MediaComponent extends WebMarkupContainer
* @param id
* The component id
* @param resourceReference
- * the package resource reference of the media file
+ * the resource reference of the media file
* @param pageParameters
* the page parameters to be used to be prepended to the media URL
*/
- public MediaComponent(String id, PackageResourceReference resourceReference,
+ public MediaComponent(String id, ResourceReference resourceReference,
PageParameters pageParameters)
{
this(id, null, null, pageParameters, resourceReference);
@@ -212,11 +212,11 @@ public abstract class MediaComponent extends WebMarkupContainer
* @param model
* the internally used model
* @param resourceReference
- * the package resource reference of the media file
+ * the resource reference of the media file
* @param pageParameters
* the page parameters to be used to be prepended to the media URL
*/
- public MediaComponent(String id, IModel<?> model, PackageResourceReference resourceReference,
+ public MediaComponent(String id, IModel<?> model, ResourceReference resourceReference,
PageParameters pageParameters)
{
this(id, model, null, pageParameters, resourceReference);
@@ -268,7 +268,7 @@ public abstract class MediaComponent extends WebMarkupContainer
}
private MediaComponent(String id, IModel<?> model, String url, PageParameters pageParameters,
- PackageResourceReference resourceReference)
+ ResourceReference resourceReference)
{
super(id, model);
this.url = url;
http://git-wip-us.apache.org/repos/asf/wicket/blob/e20bfa73/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java
index 1621365..157221c 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java
@@ -23,6 +23,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResource;
import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.resource.IResourceStream;
/**
@@ -42,7 +43,7 @@ public class Source extends WebMarkupContainer
private String media;
- private final PackageResourceReference resourceReference;
+ private final ResourceReference resourceReference;
private final PageParameters pageParameters;
@@ -80,7 +81,7 @@ public class Source extends WebMarkupContainer
* @param resourceReference
* the resource reference to provide the source data
*/
- public Source(String id, PackageResourceReference resourceReference)
+ public Source(String id, ResourceReference resourceReference)
{
this(id, null, null, null, resourceReference);
}
@@ -95,7 +96,7 @@ public class Source extends WebMarkupContainer
* @param resourceReference
* the resource reference to provide the source data
*/
- public Source(String id, IModel<?> model, PackageResourceReference resourceReference)
+ public Source(String id, IModel<?> model, ResourceReference resourceReference)
{
this(id, model, null, null, resourceReference);
}
@@ -110,7 +111,7 @@ public class Source extends WebMarkupContainer
* @param resourceReference
* the resource reference to provide the source data
*/
- public Source(String id, PackageResourceReference resourceReference,
+ public Source(String id, ResourceReference resourceReference,
PageParameters pageParameters)
{
this(id, null, null, pageParameters, resourceReference);
@@ -128,7 +129,7 @@ public class Source extends WebMarkupContainer
* @param pageParameters
* the the page parameters applied to the source URL
*/
- public Source(String id, IModel<?> model, PackageResourceReference resourceReference,
+ public Source(String id, IModel<?> model, ResourceReference resourceReference,
PageParameters pageParameters)
{
this(id, model, null, pageParameters, resourceReference);
@@ -163,7 +164,7 @@ public class Source extends WebMarkupContainer
}
private Source(String id, IModel<?> model, String url, PageParameters pageParameters,
- PackageResourceReference resourceReference)
+ ResourceReference resourceReference)
{
super(id, model);
this.url = url;
@@ -195,10 +196,14 @@ public class Source extends WebMarkupContainer
}
else if (resourceReference != null)
{
- PackageResource resource = resourceReference.getResource();
- IResourceStream resourceStream = resource.getCacheableResourceStream();
- String contentType = resourceStream.getContentType();
- tag.put("type", contentType);
+ // if package resource reference we can get the content
+ // type of the package resource
+ if(resourceReference instanceof PackageResourceReference){
+ PackageResource resource = ((PackageResourceReference)resourceReference).getResource();
+ IResourceStream resourceStream = resource.getCacheableResourceStream();
+ String contentType = resourceStream.getContentType();
+ tag.put("type", contentType);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e20bfa73/wicket-core/src/main/java/org/apache/wicket/markup/html/media/audio/Audio.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/audio/Audio.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/audio/Audio.java
index 2b7cb61..d16faae 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/audio/Audio.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/audio/Audio.java
@@ -20,7 +20,7 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.media.MediaComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* An audio media component to playback audio files.
@@ -63,9 +63,9 @@ public class Audio extends MediaComponent
* @param id
* the component id
* @param resourceReference
- * the package resource reference of the audio file
+ * the resource reference of the audio file
*/
- public Audio(String id, PackageResourceReference resourceReference)
+ public Audio(String id, ResourceReference resourceReference)
{
super(id, resourceReference);
}
@@ -78,9 +78,9 @@ public class Audio extends MediaComponent
* @param model
* the internally used model
* @param resourceReference
- * the package resource reference of the audio file
+ * the resource reference of the audio file
*/
- public Audio(String id, IModel<?> model, PackageResourceReference resourceReference)
+ public Audio(String id, IModel<?> model, ResourceReference resourceReference)
{
super(id, model, resourceReference);
}
@@ -91,11 +91,11 @@ public class Audio extends MediaComponent
* @param id
* the component id
* @param resourceReference
- * the package resource reference of the audio file
+ * the resource reference of the audio file
* @param pageParameters
* the page parameters to be used to be prepended to the audio URL
*/
- public Audio(String id, PackageResourceReference resourceReference,
+ public Audio(String id, ResourceReference resourceReference,
PageParameters pageParameters)
{
super(id, resourceReference, pageParameters);
@@ -109,11 +109,11 @@ public class Audio extends MediaComponent
* @param model
* the internally used model
* @param resourceReference
- * the package resource reference of the audio file
+ * the resource reference of the audio file
* @param pageParameters
* the page parameters to be used to be prepended to the audio URL
*/
- public Audio(String id, IModel<?> model, PackageResourceReference resourceReference,
+ public Audio(String id, IModel<?> model, ResourceReference resourceReference,
PageParameters pageParameters)
{
super(id, model, resourceReference, pageParameters);
http://git-wip-us.apache.org/repos/asf/wicket/blob/e20bfa73/wicket-core/src/main/java/org/apache/wicket/markup/html/media/video/Video.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/video/Video.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/video/Video.java
index c792356..0d2bbcf 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/video/Video.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/video/Video.java
@@ -21,7 +21,6 @@ import org.apache.wicket.markup.html.media.MediaComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
/**
@@ -73,9 +72,9 @@ public class Video extends MediaComponent
* @param id
* the component id
* @param resourceReference
- * the package resource reference of the video file
+ * the resource reference of the video file
*/
- public Video(String id, PackageResourceReference resourceReference)
+ public Video(String id, ResourceReference resourceReference)
{
super(id, resourceReference);
}
@@ -88,9 +87,9 @@ public class Video extends MediaComponent
* @param model
* the internally used model
* @param resourceReference
- * the package resource reference of the video file
+ * the resource reference of the video file
*/
- public Video(String id, IModel<?> model, PackageResourceReference resourceReference)
+ public Video(String id, IModel<?> model, ResourceReference resourceReference)
{
super(id, model, resourceReference);
}
@@ -101,11 +100,11 @@ public class Video extends MediaComponent
* @param id
* the component id
* @param resourceReference
- * the package resource reference of the video file
+ * the resource reference of the video file
* @param pageParameters
* the page parameters to be used to be prepended to the video URL
*/
- public Video(String id, PackageResourceReference resourceReference,
+ public Video(String id, ResourceReference resourceReference,
PageParameters pageParameters)
{
super(id, resourceReference, pageParameters);
@@ -119,11 +118,11 @@ public class Video extends MediaComponent
* @param model
* the internally used model
* @param resourceReference
- * the package resource reference of the video file
+ * the resource reference of the video file
* @param pageParameters
* the page parameters to be used to be prepended to the video URL
*/
- public Video(String id, IModel<?> model, PackageResourceReference resourceReference,
+ public Video(String id, IModel<?> model, ResourceReference resourceReference,
PageParameters pageParameters)
{
super(id, model, resourceReference, pageParameters);