Author: ivaynberg
Date: Thu Sep 6 23:59:19 2007
New Revision: 573484
URL: http://svn.apache.org/viewvc?rev=573484&view=rev
Log:
WICKET-927: Deprecate Fragment constructors that dont take a markup provider
http://issues.apache.org/jira/browse/WICKET-927
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java?rev=573484&r1=573483&r2=573484&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
Thu Sep 6 23:59:19 2007
@@ -28,14 +28,12 @@
import org.apache.wicket.version.undo.Change;
/**
- * Usually you either have a markup file or a xml tag with
- * wicket:id="myComponent" to associate markup with a component. However in
some
- * rare cases, especially when working with small panels it is a bit awkward to
- * maintain tiny pieces of markup in plenty of panel markup files. Use cases
are
+ * Usually you either have a markup file or a xml tag with
wicket:id="myComponent" to associate
+ * markup with a component. However in some rare cases, especially when
working with small panels it
+ * is a bit awkward to maintain tiny pieces of markup in plenty of panel
markup files. Use cases are
* for example list views where list items are different depending on a state.
* <p>
- * Fragments provide a means to maintain the panels tiny piece of markup in the
- * parents markup file.
+ * Fragments provide a means to maintain the panels tiny piece of markup in
the parents markup file.
* <p>
*
* <pre>
@@ -69,6 +67,8 @@
* The component id
* @param markupId
* The associated id of the associated markup fragment
+ *
+ * @deprecated use [EMAIL PROTECTED] #Fragment(String, String,
MarkupContainer)}
*/
public Fragment(final String id, final String markupId)
{
@@ -86,6 +86,8 @@
* The associated id of the associated markup fragment
* @param model
* The model for this fragment
+ *
+ * @deprecated use [EMAIL PROTECTED] #Fragment(String, String,
MarkupContainer, IModel)}
*/
public Fragment(final String id, final String markupId, final IModel
model)
{
@@ -207,14 +209,14 @@
* Get the markup stream which shall be used to search for the fragment
*
* @param markupStream
- * The markup stream is associated with the component (not
the
- * fragment)
+ * The markup stream is associated with the component (not
the fragment)
* @return The markup stream to be used to find the fragment markup
*/
protected MarkupStream chooseMarkupStream(final MarkupStream
markupStream)
{
MarkupStream stream = null;
+ // TODO Post 1.3: Cleanup this after deprecated constructors
are removed
if (markupProvider == null)
{
stream = markupStream;
@@ -280,8 +282,7 @@
}
/**
- * Position the markup stream at the child component relative to the
- * <b>provider</b> markup
+ * Position the markup stream at the child component relative to the
<b>provider</b> markup
*
* @param path
* @return
@@ -315,6 +316,9 @@
public MarkupStream getAssociatedMarkupStream(boolean throwException)
{
MarkupStream stream = null;
+
+ // TODO Post 1.3: Cleanup this after deprecated constructors
are removed
+
if (markupProvider != null)
{
