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/07/02 17:48:31 UTC
wicket git commit: WICKET-5819 - Getter/Setter for PageParameter
video/audio/track/source
Repository: wicket
Updated Branches:
refs/heads/master cfa36fbea -> a8191cce6
WICKET-5819 - Getter/Setter for PageParameter video/audio/track/source
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a8191cce
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a8191cce
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a8191cce
Branch: refs/heads/master
Commit: a8191cce673b6bab6811f2bc0f056e337529b413
Parents: cfa36fb
Author: Tobias Soloschenko <ts...@apache.org>
Authored: Thu Jul 2 17:46:54 2015 +0200
Committer: Tobias Soloschenko <ts...@apache.org>
Committed: Thu Jul 2 17:46:54 2015 +0200
----------------------------------------------------------------------
.../markup/html/media/MediaComponent.java | 27 +++++++++++++++++---
.../apache/wicket/markup/html/media/Source.java | 25 ++++++++++++++++--
.../apache/wicket/markup/html/media/Track.java | 23 ++++++++++++++++-
.../wicket/markup/html/media/video/Video.java | 14 ++++++++--
4 files changed, 80 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a8191cce/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 0a026df..88a6076 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
@@ -26,9 +26,7 @@ import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
import org.apache.wicket.request.resource.ResourceReference;
/**
- * The media component is used to provide basic functionality to the video and audio component. The
- * given media streaming resource reference supports Content-Ranges and other stuff to make the
- * audio and video playback smooth.
+ * The media component is used to provide basic functionality to the video and audio component.
*
* @author Tobias Soloschenko
* @author Andrew Lombardi
@@ -130,7 +128,7 @@ public abstract class MediaComponent extends WebMarkupContainer
private Cors crossOrigin;
- private final PageParameters pageParameters;
+ private PageParameters pageParameters;
private final ResourceReference resourceReference;
@@ -384,6 +382,27 @@ public abstract class MediaComponent extends WebMarkupContainer
}
/**
+ * Gets the page parameter applied to the URL of the media component
+ *
+ * @return the page parameter applied to the URL of the media component
+ */
+ public PageParameters getPageParameters()
+ {
+ return pageParameters;
+ }
+
+ /**
+ * Sets the page parameter applied to the URL of the media component
+ *
+ * @param pageParameters
+ * the page parameter which are going to be applied to the URL of the media component
+ */
+ public void setPageParameters(PageParameters pageParameters)
+ {
+ this.pageParameters = pageParameters;
+ }
+
+ /**
* If the playback is muted initially
*
* @return If the playback is muted initially
http://git-wip-us.apache.org/repos/asf/wicket/blob/a8191cce/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 157221c..c9b6e5f 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
@@ -43,9 +43,9 @@ public class Source extends WebMarkupContainer
private String media;
- private final ResourceReference resourceReference;
+ private PageParameters pageParameters;
- private final PageParameters pageParameters;
+ private final ResourceReference resourceReference;
private final String url;
@@ -320,4 +320,25 @@ public class Source extends WebMarkupContainer
{
this.media = media;
}
+
+ /**
+ * Gets the page parameter applied to the URL of the source
+ *
+ * @return the page parameter applied to the URL of the source
+ */
+ public PageParameters getPageParameters()
+ {
+ return pageParameters;
+ }
+
+ /**
+ * Sets the page parameter applied to the URL of the source
+ *
+ * @param pageParameters
+ * the page parameter which are going to be applied to the URL of the source
+ */
+ public void setPageParameters(PageParameters pageParameters)
+ {
+ this.pageParameters = pageParameters;
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a8191cce/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java
index 9b053bf..da16738 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java
@@ -91,7 +91,7 @@ public class Track extends WebMarkupContainer
private final String url;
- private final PageParameters pageParameters;
+ private PageParameters pageParameters;
/**
* Creates a track
@@ -366,4 +366,25 @@ public class Track extends WebMarkupContainer
{
this.srclang = srclang;
}
+
+ /**
+ * Gets the page parameter applied to the URL of the track
+ *
+ * @return the page parameter applied to the URL of the track
+ */
+ public PageParameters getPageParameters()
+ {
+ return pageParameters;
+ }
+
+ /**
+ * Sets the page parameter applied to the URL of the track
+ *
+ * @param pageParameters
+ * the page parameter which are going to be applied to the URL of the track
+ */
+ public void setPageParameters(PageParameters pageParameters)
+ {
+ this.pageParameters = pageParameters;
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a8191cce/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 0d2bbcf..5c12cd2 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
@@ -104,8 +104,7 @@ public class Video extends MediaComponent
* @param pageParameters
* the page parameters to be used to be prepended to the video URL
*/
- public Video(String id, ResourceReference resourceReference,
- PageParameters pageParameters)
+ public Video(String id, ResourceReference resourceReference, PageParameters pageParameters)
{
super(id, resourceReference, pageParameters);
}
@@ -234,6 +233,17 @@ public class Video extends MediaComponent
}
/**
+ * Sets the posters page parameters
+ *
+ * @param posterPageParameters
+ * the page parameters for the poster
+ */
+ public void setPosterPageParameters(PageParameters posterPageParameters)
+ {
+ this.posterPageParameters = posterPageParameters;
+ }
+
+ /**
* Sets the image to be displayed if the video isn't available
*
* @param poster