You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/06/29 07:51:39 UTC
svn commit: r672603 [12/18] - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/
wicket-auth-roles/src/main/java/org/apache/w...
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
*
* @author Jonathan Locke
*/
-public class AccessDeniedPage extends WebPage<Object>
+public class AccessDeniedPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java Sat Jun 28 22:50:41 2008
@@ -32,7 +32,7 @@
/**
* Form for posting JavaScript properties.
*/
-public class BrowserInfoForm extends Panel<Object>
+public class BrowserInfoForm extends Panel
{
/** log. */
private static final Logger log = LoggerFactory.getLogger(BrowserInfoForm.class);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Sat Jun 28 22:50:41 2008
@@ -53,7 +53,7 @@
*
* @author Eelco Hillenius
*/
-public class BrowserInfoPage extends WebPage<Object>
+public class BrowserInfoPage extends WebPage
{
/** log. */
private static final Logger log = LoggerFactory.getLogger(BrowserInfoPage.class);
@@ -132,14 +132,14 @@
*/
private final void initComps()
{
- WebComponent<Object> meta = new WebComponent<Object>("meta");
+ WebComponent meta = new WebComponent("meta");
PageParameters parameters = new PageParameters();
parameters.put("cto", continueTo);
CharSequence url = urlFor(new BookmarkablePageRequestTarget(BrowserInfoPage.class,
parameters));
meta.add(new AttributeModifier("content", true, new Model<String>("0; url=" + url)));
add(meta);
- WebMarkupContainer<Object> link = new WebMarkupContainer<Object>("link");
+ WebMarkupContainer link = new WebMarkupContainer("link");
link.add(new AttributeModifier("href", true, new Model<Serializable>((Serializable)url)));
add(link);
add(new BrowserInfoForm("postback")
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java Sat Jun 28 22:50:41 2008
@@ -36,7 +36,7 @@
*
* @author Jonathan Locke
*/
-public class ExceptionErrorPage extends WebPage<Object>
+public class ExceptionErrorPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -51,12 +51,12 @@
* @param page
* The page being rendered when the exception was thrown
*/
- public ExceptionErrorPage(final Throwable throwable, final Page< ? > page)
+ public ExceptionErrorPage(final Throwable throwable, final Page page)
{
this.throwable = throwable;
// Add exception label
- add(new MultiLineLabel<String>("exception", Strings.toString(throwable)));
+ add(new MultiLineLabel("exception", Strings.toString(throwable)));
// Get values
String resource = "";
@@ -75,22 +75,21 @@
}
// Create markup label
- final MultiLineLabel<String> markupLabel = new MultiLineLabel<String>("markup", markup);
+ final MultiLineLabel markupLabel = new MultiLineLabel("markup", markup);
markupLabel.setEscapeModelStrings(false);
// Add container with markup highlighted
- final WebMarkupContainer<String> markupHighlight = new WebMarkupContainer<String>(
- "markupHighlight");
+ final WebMarkupContainer markupHighlight = new WebMarkupContainer("markupHighlight");
markupHighlight.add(markupLabel);
- markupHighlight.add(new Label<String>("resource", resource));
+ markupHighlight.add(new Label("resource", resource));
add(markupHighlight);
// Show container if markup stream is available
markupHighlight.setVisible(markupStream != null);
- add(new Link<Object>("displayPageViewLink")
+ add(new Link("displayPageViewLink")
{
private static final long serialVersionUID = 1L;
@@ -102,7 +101,7 @@
}
});
- add(new Label<String>("componentTree", ""));
+ add(new Label("componentTree", ""));
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
*
* @author Jonathan Locke
*/
-public class InternalErrorPage extends WebPage<Object>
+public class InternalErrorPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
*
* @author Jonathan Locke
*/
-public class PageExpiredErrorPage extends WebPage<Object>
+public class PageExpiredErrorPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java Sat Jun 28 22:50:41 2008
@@ -29,7 +29,7 @@
*
* @author Eelco Hillenius
*/
-public class RedirectPage extends WebPage<Object>
+public class RedirectPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -55,7 +55,7 @@
*/
public RedirectPage(final CharSequence url, final int waitBeforeRedirectInSeconds)
{
- final WebMarkupContainer<Object> redirect = new WebMarkupContainer<Object>("redirect");
+ final WebMarkupContainer redirect = new WebMarkupContainer("redirect");
final String content = waitBeforeRedirectInSeconds + ";URL=" + url;
redirect.add(new AttributeModifier("content", new Model<String>(content)));
add(redirect);
@@ -67,7 +67,7 @@
* @param page
* The page to redirect to.
*/
- public RedirectPage(final Page< ? > page)
+ public RedirectPage(final Page page)
{
this(page.urlFor(IRedirectListener.INTERFACE), 0);
}
@@ -81,7 +81,7 @@
* @param waitBeforeRedirectInSeconds
* The number of seconds the browser should wait before redirecting
*/
- public RedirectPage(final Page< ? > page, final int waitBeforeRedirectInSeconds)
+ public RedirectPage(final Page page, final int waitBeforeRedirectInSeconds)
{
this(page.urlFor(IRedirectListener.INTERFACE), waitBeforeRedirectInSeconds);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/ComponentFeedbackPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/ComponentFeedbackPanel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/ComponentFeedbackPanel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/ComponentFeedbackPanel.java Sat Jun 28 22:50:41 2008
@@ -39,7 +39,7 @@
* @param filter
* the component for which the messages need to be filtered.
*/
- public ComponentFeedbackPanel(String id, Component<?> filter)
+ public ComponentFeedbackPanel(String id, Component filter)
{
super(id, new ComponentFeedbackMessageFilter(filter));
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.java Sat Jun 28 22:50:41 2008
@@ -22,7 +22,7 @@
* Panel that does absolutely nothing and that can be used to display an empty block. If you need to
* conditionally display markup, use a {@link WebMarkupContainer} directly.
*/
-public final class EmptyPanel extends Panel<Void>
+public final class EmptyPanel extends Panel
{
private static final long serialVersionUID = 1L;
@@ -30,7 +30,7 @@
* Construct.
*
* @param id
- * component id
+ * component id
*/
public EmptyPanel(String id)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java Sat Jun 28 22:50:41 2008
@@ -43,7 +43,7 @@
* @author Jonathan Locke
* @author Eelco Hillenius
*/
-public class FeedbackPanel extends Panel<Void> implements IFeedback
+public class FeedbackPanel extends Panel implements IFeedback
{
/**
* List for messages.
@@ -58,13 +58,12 @@
public MessageListView(final String id)
{
super(id);
- setModel(newFeedbackMessagesModel());
+ setDefaultModel(newFeedbackMessagesModel());
}
/**
- * @see
- * org.apache.wicket.markup.html.list.ListView#populateItem(org.apache.wicket.markup.html
- * .list.ListItem)
+ * @see org.apache.wicket.markup.html.list.ListView#populateItem(org.apache.wicket.markup.html
+ * .list.ListItem)
*/
@Override
protected void populateItem(final ListItem<FeedbackMessage> listItem)
@@ -88,7 +87,7 @@
}
};
- final Component<?> label = newMessageDisplayComponent("message", message);
+ final Component label = newMessageDisplayComponent("message", message);
final AttributeModifier levelModifier = new AttributeModifier("class", replacementModel);
label.add(levelModifier);
listItem.add(levelModifier);
@@ -118,7 +117,7 @@
public FeedbackPanel(final String id, IFeedbackMessageFilter filter)
{
super(id);
- WebMarkupContainer<?> messagesContainer = new WebMarkupContainer<Void>("feedbackul")
+ WebMarkupContainer messagesContainer = new WebMarkupContainer("feedbackul")
{
private static final long serialVersionUID = 1L;
@@ -166,7 +165,7 @@
* level.
*
* @param level
- * the level, see FeedbackMessage
+ * the level, see FeedbackMessage
* @return whether there is any message for this panel of the given level
*/
public final boolean anyMessage(int level)
@@ -202,7 +201,7 @@
*/
public final FeedbackMessagesModel getFeedbackMessagesModel()
{
- return (FeedbackMessagesModel)messageListView.getModel();
+ return (FeedbackMessagesModel)messageListView.getDefaultModel();
}
/**
@@ -234,7 +233,7 @@
* Sets whether model messages should be HTML escaped. Default is true.
*
* @param escapeMessages
- * whether model messages should be HTML escaped
+ * whether model messages should be HTML escaped
*
* @deprecated use {@link #setEscapeModelStrings(boolean)}
*/
@@ -248,7 +247,7 @@
* Sets a filter to use on the feedback messages model
*
* @param filter
- * The message filter to install on the feedback messages model
+ * The message filter to install on the feedback messages model
*/
public final void setFilter(IFeedbackMessageFilter filter)
{
@@ -257,7 +256,8 @@
/**
* @param maxMessages
- * The maximum number of feedback messages that this feedback panel should show at one time
+ * The maximum number of feedback messages that this feedback panel should show at
+ * one time
*/
public final void setMaxMessages(int maxMessages)
{
@@ -268,7 +268,7 @@
* Sets the comparator used for sorting the messages.
*
* @param sortingComparator
- * comparator used for sorting the messages.
+ * comparator used for sorting the messages.
*/
public final void setSortingComparator(Comparator<FeedbackMessage> sortingComparator)
{
@@ -279,9 +279,9 @@
* Gets the css class for the given message.
*
* @param message
- * the message
+ * the message
* @return the css class; by default, this returns feedbackPanel + the message level, eg
- * 'feedbackPanelERROR', but you can override this method to provide your own
+ * 'feedbackPanelERROR', but you can override this method to provide your own
*/
protected String getCSSClass(final FeedbackMessage message)
{
@@ -315,18 +315,18 @@
*
* By default a {@link Label} is used.
*
- * Note that the created component is expected to respect feedback panel's {@link
- * #getEscapeModelStrings()} value
+ * Note that the created component is expected to respect feedback panel's
+ * {@link #getEscapeModelStrings()} value
*
* @param id
- * parent id
+ * parent id
* @param message
- * feedback message
+ * feedback message
* @return component used to display the message
*/
- protected Component<?> newMessageDisplayComponent(String id, FeedbackMessage message)
+ protected Component newMessageDisplayComponent(String id, FeedbackMessage message)
{
- Label<String> label = new Label<String>(id, message.getMessage().toString());
+ Label label = new Label(id, message.getMessage().toString());
label.setEscapeModelStrings(FeedbackPanel.this.getEscapeModelStrings());
return label;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java Sat Jun 28 22:50:41 2008
@@ -43,15 +43,14 @@
* <wicket:fragment wicket:id="frag1">panel 1</wicket:fragment>
* <wicket:fragment wicket:id="frag2">panel 2</wicket:fragment>
* </pre>
+ *
* <pre>
* add(new Fragment("myPanel1", "frag1", myPage);
* </pre>
*
* @author Juergen Donnerstag
- * @param <T>
- * model object type
*/
-public class Fragment<T> extends WebMarkupContainerWithAssociatedMarkup<T>
+public class Fragment extends WebMarkupContainerWithAssociatedMarkup
{
private static final long serialVersionUID = 1L;
@@ -59,7 +58,7 @@
private String markupId;
/** The container providing the inline markup */
- private final MarkupContainer< ? > markupProvider;
+ private final MarkupContainer markupProvider;
/**
* Constructor.
@@ -94,7 +93,7 @@
* @deprecated use {@link #Fragment(String, String, MarkupContainer, IModel)}
*/
@Deprecated
- public Fragment(final String id, final String markupId, final IModel<T> model)
+ public Fragment(final String id, final String markupId, final IModel<?> model)
{
this(id, markupId, null, model);
}
@@ -111,8 +110,7 @@
* @param markupProvider
* The component whose markup contains the fragment's markup
*/
- public Fragment(final String id, final String markupId,
- final MarkupContainer< ? > markupProvider)
+ public Fragment(final String id, final String markupId, final MarkupContainer markupProvider)
{
this(id, markupId, markupProvider, null);
}
@@ -131,8 +129,8 @@
* @param model
* The model for this fragment
*/
- public Fragment(final String id, final String markupId,
- final MarkupContainer< ? > markupProvider, final IModel<T> model)
+ public Fragment(final String id, final String markupId, final MarkupContainer markupProvider,
+ final IModel<?> model)
{
super(id, model);
@@ -372,7 +370,7 @@
*
* @return markup provider
*/
- public final MarkupContainer< ? > getMarkupProvider()
+ public final MarkupContainer getMarkupProvider()
{
return markupProvider;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java Sat Jun 28 22:50:41 2008
@@ -54,11 +54,8 @@
*
* @author Jonathan Locke
* @author Juergen Donnerstag
- *
- * @param <T>
- * The model object type
*/
-public class Panel<T> extends WebMarkupContainerWithAssociatedMarkup<T>
+public class Panel extends WebMarkupContainerWithAssociatedMarkup
{
private static final long serialVersionUID = 1L;
@@ -82,7 +79,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public Panel(final String id, final IModel<T> model)
+ public Panel(final String id, final IModel<?> model)
{
super(id, model);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java Sat Jun 28 22:50:41 2008
@@ -28,7 +28,7 @@
*
* @author Eelco Hillenius
*/
-public class PackagedResourceReference extends WebMarkupContainer<String>
+public class PackagedResourceReference extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -36,13 +36,13 @@
* Construct.
*
* @param id
- * component id
+ * component id
* @param referer
- * the class that is referring; is used as the relative root for getting the resource
+ * the class that is referring; is used as the relative root for getting the resource
* @param file
- * relative location of the packaged file
+ * relative location of the packaged file
* @param attributeToReplace
- * the attribute to replace of the target tag
+ * the attribute to replace of the target tag
*/
public PackagedResourceReference(final String id, final Class<?> referer, final String file,
final String attributeToReplace)
@@ -54,14 +54,14 @@
* Construct.
*
* @param id
- * component id
+ * component id
* @param referer
- * the class that is referring; is used as the relative root for getting the resource
+ * the class that is referring; is used as the relative root for getting the resource
* @param file
- * model that supplies the relative location of the packaged file. Must return an instance
- * of {@link String}
+ * model that supplies the relative location of the packaged file. Must return an
+ * instance of {@link String}
* @param attributeToReplace
- * the attribute to replace of the target tag
+ * the attribute to replace of the target tag
*/
public PackagedResourceReference(final String id, final Class<?> referer,
final IModel<String> file, final String attributeToReplace)
@@ -127,11 +127,11 @@
* Construct.
*
* @param id
- * component id
+ * component id
* @param resourceReference
- * the reference to the resource
+ * the reference to the resource
* @param attributeToReplace
- * the attribute to replace of the target tag
+ * the attribute to replace of the target tag
*/
public PackagedResourceReference(final String id, final ResourceReference resourceReference,
final String attributeToReplace)
@@ -143,11 +143,12 @@
* Construct.
*
* @param id
- * component id
+ * component id
* @param resourceReference
- * the reference to the resource. Must return an instance of {@link ResourceReference}
+ * the reference to the resource. Must return an instance of
+ * {@link ResourceReference}
* @param attributeToReplace
- * the attribute to replace of the target tag
+ * the attribute to replace of the target tag
*/
public PackagedResourceReference(final String id,
final IModel<ResourceReference> resourceReference, final String attributeToReplace)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Sat Jun 28 22:50:41 2008
@@ -81,7 +81,7 @@
* This class represents one row in rendered tree (TreeNode). Only TreeNodes that are visible
* (all their parent are expanded) have TreeItem created for them.
*/
- private final class TreeItem extends WebMarkupContainer<Object>
+ private final class TreeItem extends WebMarkupContainer
{
/**
* whether this tree item should also render it's children to response. this is set if we
@@ -276,7 +276,7 @@
protected void onDetach()
{
super.onDetach();
- Object object = getModelObject();
+ Object object = getDefaultModelObject();
if (object instanceof IDetachable)
{
((IDetachable)object).detach();
@@ -339,7 +339,7 @@
* Components that holds tree items. This is similar to ListView, but it renders tree items in
* the right order.
*/
- private class TreeItemContainer extends WebMarkupContainer<Void>
+ private class TreeItemContainer extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -358,13 +358,13 @@
* @see org.apache.wicket.MarkupContainer#remove(org.apache.wicket.Component)
*/
@Override
- public void remove(Component<?> component)
+ public void remove(Component component)
{
// when a treeItem is removed, remove reference to it from
// nodeToItemMAp
if (component instanceof TreeItem)
{
- nodeToItemMap.remove(((TreeItem)component).getModelObject());
+ nodeToItemMap.remove(((TreeItem)component).getDefaultModelObject());
}
super.remove(component);
}
@@ -555,7 +555,7 @@
// has been called
if (rootItem == null)
{
- Object rootNode = ((TreeModel)getModelObject()).getRoot();
+ Object rootNode = ((TreeModel)getDefaultModelObject()).getRoot();
if (rootNode != null)
{
if (isRootLess())
@@ -631,7 +631,8 @@
}
/**
- * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeExpanded(javax.swing.tree.TreeNode )
+ * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeExpanded(javax.swing.tree.TreeNode
+ * )
*/
public final void nodeExpanded(Object node)
{
@@ -642,7 +643,8 @@
}
/**
- * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeSelected(javax.swing.tree.TreeNode )
+ * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeSelected(javax.swing.tree.TreeNode
+ * )
*/
public final void nodeSelected(Object node)
{
@@ -689,9 +691,9 @@
// if the tree is in rootless mode, make sure the root node is
// expanded
- if (rootLess == true && getModelObject() != null)
+ if (rootLess == true && getDefaultModelObject() != null)
{
- getTreeState().expandNode(((TreeModel)getModelObject()).getRoot());
+ getTreeState().expandNode(((TreeModel)getDefaultModelObject()).getRoot());
}
}
}
@@ -706,7 +708,7 @@
{
if (rootItem != null)
{
- invalidateNode(rootItem.getModelObject(), true);
+ invalidateNode(rootItem.getDefaultModelObject(), true);
}
}
else
@@ -750,7 +752,7 @@
// invalidate the node and it's children, so that they are
// redrawn
- invalidateNodeWithChildren(item.getModelObject());
+ invalidateNodeWithChildren(item.getDefaultModelObject());
}
}
@@ -823,7 +825,7 @@
removeItem(item);
// deselect the node
- getTreeState().selectNode(item.getModelObject(), false);
+ getTreeState().selectNode(item.getDefaultModelObject(), false);
}
});
@@ -1012,7 +1014,7 @@
protected final boolean isNodeExpanded(Object node)
{
// In root less mode the root node is always expanded
- if (isRootLess() && rootItem != null && rootItem.getModelObject().equals(node))
+ if (isRootLess() && rootItem != null && rootItem.getDefaultModelObject().equals(node))
{
return true;
}
@@ -1066,10 +1068,11 @@
List<TreeItem> items;
// if the node is expanded
- if (isNodeExpanded(item.getModelObject()))
+ if (isNodeExpanded(item.getDefaultModelObject()))
{
// build the items for children of the items' treenode.
- items = buildTreeItems(item, nodeChildren(item.getModelObject()), item.getLevel() + 1);
+ items = buildTreeItems(item, nodeChildren(item.getDefaultModelObject()),
+ item.getLevel() + 1);
}
else
{
@@ -1118,7 +1121,7 @@
private final void checkModel()
{
// find out whether the model object (the TreeModel) has been changed
- TreeModel model = (TreeModel)getModelObject();
+ TreeModel model = (TreeModel)getDefaultModelObject();
if (model != previousModel)
{
if (previousModel != null)
@@ -1249,7 +1252,7 @@
{
public void visitItem(TreeItem item)
{
- invalidateNode(item.getModelObject(), false);
+ invalidateNode(item.getDefaultModelObject(), false);
}
});
}
@@ -1396,7 +1399,7 @@
else
{
TreeItem parent = item.getParentItem();
- return parent == null ? null : parent.getModelObject();
+ return parent == null ? null : parent.getDefaultModelObject();
}
}
@@ -1468,7 +1471,7 @@
private TreeModel getTreeModel()
{
- return (TreeModel)getModelObject();
+ return (TreeModel)getDefaultModelObject();
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Sat Jun 28 22:50:41 2008
@@ -100,13 +100,13 @@
protected void populateTreeItem(WebMarkupContainer item, int level)
{
// add junction link
- Object node = item.getModelObject();
+ Object node = item.getDefaultModelObject();
Component junctionLink = newJunctionLink(item, JUNCTION_LINK_ID, node);
junctionLink.setComponentBorder(new JunctionBorder(node, level));
item.add(junctionLink);
// add node component
- Component nodeComponent = newNodeComponent(NODE_COMPONENT_ID, item.getModel());
+ Component nodeComponent = newNodeComponent(NODE_COMPONENT_ID, item.getDefaultModel());
item.add(nodeComponent);
// add behavior that conditionally adds the "selected" CSS class name
@@ -117,7 +117,7 @@
@Override
public void onComponentTag(Component component, ComponentTag tag)
{
- Object node = component.getModelObject();
+ Object node = component.getDefaultModelObject();
String klass = getItemClass(node);
if (!Strings.isEmpty(klass))
{
@@ -413,11 +413,11 @@
* The link call back
* @return The link component
*/
- public MarkupContainer<? extends Object> newLink(String id, final ILinkCallback callback)
+ public MarkupContainer newLink(String id, final ILinkCallback callback)
{
if (getLinkType() == LinkType.REGULAR)
{
- return new Link<Object>(id)
+ return new Link(id)
{
private static final long serialVersionUID = 1L;
@@ -433,7 +433,7 @@
}
else if (getLinkType() == LinkType.AJAX)
{
- return new AjaxLink<Object>(id)
+ return new AjaxLink(id)
{
private static final long serialVersionUID = 1L;
@@ -449,7 +449,7 @@
}
else
{
- return new AjaxFallbackLink<Object>(id)
+ return new AjaxFallbackLink(id)
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java Sat Jun 28 22:50:41 2008
@@ -110,7 +110,7 @@
*/
protected ResourceReference getImageResourceReference(BaseTree tree, Object node)
{
- TreeModel model = (TreeModel)tree.getModelObject();
+ TreeModel model = (TreeModel)tree.getDefaultModelObject();
if (model.isLeaf(node))
{
return getResourceItemLeaf(node);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java Sat Jun 28 22:50:41 2008
@@ -47,7 +47,7 @@
* org.apache.wicket.markup.MarkupResourceStream,
* org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
- public final Markup loadMarkup(final MarkupContainer< ? > container,
+ public final Markup loadMarkup(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final IMarkupLoader baseLoader,
final boolean enforceReload) throws IOException, ResourceStreamNotFoundException
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java Sat Jun 28 22:50:41 2008
@@ -56,7 +56,7 @@
* @throws IOException
* @throws ResourceStreamNotFoundException
*/
- Markup loadMarkup(final MarkupContainer< ? > container,
+ Markup loadMarkup(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final IMarkupLoader baseLoader,
final boolean enforceReload) throws IOException, ResourceStreamNotFoundException;
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java Sat Jun 28 22:50:41 2008
@@ -54,7 +54,7 @@
* org.apache.wicket.markup.MarkupResourceStream,
* org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
- public final Markup loadMarkup(final MarkupContainer<?> container,
+ public final Markup loadMarkup(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final IMarkupLoader baseLoader,
final boolean enforceReload) throws IOException, ResourceStreamNotFoundException
{
@@ -79,7 +79,7 @@
* @return A markup object with the the base markup elements resolved.
* @TODO move into IMarkupLoader
*/
- private Markup checkForMarkupInheritance(final MarkupContainer<?> container,
+ private Markup checkForMarkupInheritance(final MarkupContainer container,
final Markup markup, final boolean enforceReload)
{
// Check if markup contains <wicket:extend> which tells us that
@@ -115,7 +115,7 @@
* @param enforceReload
* @return the base markup
*/
- private Markup getBaseMarkup(final MarkupContainer<?> container, final Markup markup,
+ private Markup getBaseMarkup(final MarkupContainer container, final Markup markup,
final boolean enforceReload)
{
// get the base markup
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java Sat Jun 28 22:50:41 2008
@@ -45,7 +45,7 @@
* org.apache.wicket.markup.MarkupResourceStream,
* org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
- public final Markup loadMarkup(final MarkupContainer< ? > container,
+ public final Markup loadMarkup(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final IMarkupLoader baseLoader,
final boolean enforceReload) throws IOException, ResourceStreamNotFoundException
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java Sat Jun 28 22:50:41 2008
@@ -78,7 +78,7 @@
private static final long serialVersionUID = 1L;
@Override
- public void onComponentTag(Component< ? > component, ComponentTag tag)
+ public void onComponentTag(Component component, ComponentTag tag)
{
String prefix = null;
@@ -156,24 +156,23 @@
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
*/
- public boolean resolve(MarkupContainer< ? > container, MarkupStream markupStream,
- ComponentTag tag)
+ public boolean resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag)
{
if (WICKET_RELATIVE_PATH_PREFIX_CONTAINER_ID.equals(tag.getId()))
{
- final Component< ? > wc;
+ final Component wc;
String id = WICKET_RELATIVE_PATH_PREFIX_CONTAINER_ID +
container.getPage().getAutoIndex();
if (tag.isOpenClose())
{
- wc = new WebComponent<Object>(id);
+ wc = new WebComponent(id);
}
else
{
// we do not want to mess with the hierarchy, so the container has to be
// transparent as it may have wicket components inside. for example a raw anchor tag
// that contains a label.
- wc = new WebMarkupContainer<Object>(id)
+ wc = new WebMarkupContainer(id)
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java Sat Jun 28 22:50:41 2008
@@ -120,7 +120,7 @@
* org.apache.wicket.markup.ComponentTag)
*/
@Override
- public void onComponentTag(final Component< ? > component, final ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
String expr = tag.getAttributes().getString(WICKET_MESSAGE_ATTRIBUTE_NAME);
if (!Strings.isEmpty(expr))
@@ -166,22 +166,21 @@
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
*/
- public boolean resolve(MarkupContainer< ? > container, MarkupStream markupStream,
- ComponentTag tag)
+ public boolean resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag)
{
// localize any raw markup that has wicket:message attrs
if (WICKET_MESSAGE_CONTAINER_ID.equals(tag.getId()))
{
- Component<Object> wc = null;
+ Component wc = null;
if (tag.isOpenClose())
{
- wc = new WebComponent<Object>(WICKET_MESSAGE_CONTAINER_ID +
+ wc = new WebComponent(WICKET_MESSAGE_CONTAINER_ID +
container.getPage().getAutoIndex());
}
else
{
- wc = new WebMarkupContainer<Object>(WICKET_MESSAGE_CONTAINER_ID +
+ wc = new WebMarkupContainer(WICKET_MESSAGE_CONTAINER_ID +
container.getPage().getAutoIndex());
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java Sat Jun 28 22:50:41 2008
@@ -72,7 +72,11 @@
private transient int cachedItemCount;
- /** @see org.apache.wicket.Component#Component(String, IModel) */
+ /**
+ * @param id
+ * @param model
+ * @see org.apache.wicket.Component#Component(String, IModel)
+ */
public AbstractPageableView(String id, IModel<Collection<T>> model)
{
super(id, model);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java Sat Jun 28 22:50:41 2008
@@ -39,11 +39,9 @@
*
* @author Igor Vaynberg (ivaynberg)
*
- * @param <T>
- * The model object type
*
*/
-public abstract class AbstractRepeater<T> extends WebMarkupContainer<T>
+public abstract class AbstractRepeater extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -67,7 +65,7 @@
* @param id
* @param model
*/
- public AbstractRepeater(String id, IModel<T> model)
+ public AbstractRepeater(String id, IModel<?> model)
{
super(id, model);
}
@@ -78,7 +76,7 @@
*
* @return iterator over child components to be rendered
*/
- protected abstract Iterator<Component< ? >> renderIterator();
+ protected abstract Iterator<? extends Component> renderIterator();
/**
* Renders all child items in no specified order
@@ -91,12 +89,12 @@
{
final int markupStart = markupStream.getCurrentIndex();
- Iterator<Component< ? >> it = renderIterator();
+ Iterator<? extends Component> it = renderIterator();
if (it.hasNext())
{
do
{
- Component< ? > child = it.next();
+ Component child = it.next();
if (child == null)
{
throw new IllegalStateException("the render iterator returned null for a child");
@@ -119,7 +117,7 @@
* @param child
* Child component to be rendered
*/
- protected void renderChild(final Component< ? > child)
+ protected void renderChild(final Component child)
{
child.render(getMarkupStream());
}
@@ -134,10 +132,10 @@
if (Application.get().getConfigurationType().equals(Application.DEVELOPMENT))
{
- Iterator<Component< ? >> i = iterator();
+ Iterator<? extends Component> i = iterator();
while (i.hasNext())
{
- Component< ? > c = i.next();
+ Component c = i.next();
Matcher matcher = SAFE_CHILD_ID_PATTERN.matcher(c.getId());
if (!matcher.matches())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java Sat Jun 28 22:50:41 2008
@@ -35,7 +35,7 @@
* @param <T>
* Model object type
*/
-public class Item<T> extends WebMarkupContainer<T>
+public class Item<T> extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -113,14 +113,14 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
- public static class IndexComparator implements Comparator<Item< ? >>
+ public static class IndexComparator implements Comparator<Item<?>>
{
- private static final Comparator<Item< ? >> instance = new IndexComparator();
+ private static final Comparator<Item<?>> instance = new IndexComparator();
/**
* @return static instance of the comparator
*/
- public static final Comparator<Item< ? >> getInstance()
+ public static final Comparator<Item<?>> getInstance()
{
return instance;
}
@@ -128,11 +128,54 @@
/**
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(Item< ? > lhs, Item< ? > rhs)
+ public int compare(Item<?> lhs, Item<?> rhs)
{
return lhs.getIndex() - rhs.getIndex();
}
};
+ /**
+ * Gets model
+ *
+ * @return model
+ */
+ @SuppressWarnings("unchecked")
+ public final IModel<T> getModel()
+ {
+ return (IModel<T>)getDefaultModel();
+ }
+
+ /**
+ * Sets model
+ *
+ * @param model
+ */
+ public final void setModel(IModel<T> model)
+ {
+ setDefaultModel(model);
+ }
+
+ /**
+ * Gets model object
+ *
+ * @return model object
+ */
+ @SuppressWarnings("unchecked")
+ public final T getModelObject()
+ {
+ return (T)getDefaultModelObject();
+ }
+
+ /**
+ * Sets model object
+ *
+ * @param object
+ */
+ public final void setModelObject(T object)
+ {
+ setDefaultModelObject(object);
+ }
+
+
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java Sat Jun 28 22:50:41 2008
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.markup.repeater;
-import java.util.Collection;
import java.util.Iterator;
import org.apache.wicket.markup.repeater.util.ModelIteratorAdapter;
@@ -49,7 +48,7 @@
* @param <T>
* Model object type
*/
-public abstract class RefreshingView<T> extends RepeatingView<Collection<T>>
+public abstract class RefreshingView<T> extends RepeatingView
{
private static final long serialVersionUID = 1L;
@@ -80,7 +79,7 @@
* @param model
* model
*/
- public RefreshingView(String id, IModel<Collection<T>> model)
+ public RefreshingView(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java Sat Jun 28 22:50:41 2008
@@ -68,10 +68,8 @@
*
* @author Igor Vaynberg ( ivaynberg )
*
- * @param <T>
- * Model object type
*/
-public class RepeatingView<T> extends AbstractRepeater<T>
+public class RepeatingView extends AbstractRepeater
{
/**
*
@@ -88,7 +86,7 @@
}
/** @see Component#Component(String, IModel) */
- public RepeatingView(String id, IModel<T> model)
+ public RepeatingView(String id, IModel<?> model)
{
super(id, model);
}
@@ -109,7 +107,7 @@
* @see org.apache.wicket.markup.repeater.AbstractRepeater#renderIterator()
*/
@Override
- protected Iterator<Component< ? >> renderIterator()
+ protected Iterator<? extends Component> renderIterator()
{
return iterator();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java Sat Jun 28 22:50:41 2008
@@ -42,9 +42,6 @@
*/
public abstract class DataViewBase<T> extends AbstractPageableView<T>
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
private final IDataProvider<T> dataProvider;
@@ -89,7 +86,7 @@
*/
private static final class ModelIterator<T> implements Iterator<IModel<T>>
{
- private final Iterator< ? extends T> items;
+ private final Iterator<? extends T> items;
private final IDataProvider<T> dataProvider;
private final int max;
private int index;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java Sat Jun 28 22:50:41 2008
@@ -33,7 +33,8 @@
{
private static final long serialVersionUID = 1L;
- private static EmptyDataProvider< ? > INSTANCE = new EmptyDataProvider<Void>();
+ @SuppressWarnings("unchecked")
+ private static EmptyDataProvider<?> INSTANCE = new EmptyDataProvider();
/**
* @param <T>
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java Sat Jun 28 22:50:41 2008
@@ -214,8 +214,8 @@
do
{
// Build a row
- Item< ? > rowItem = newRowItem(newChildId(), row);
- RepeatingView< ? > rowView = new RepeatingView<Void>("cols");
+ Item<?> rowItem = newRowItem(newChildId(), row);
+ RepeatingView rowView = new RepeatingView("cols");
rowItem.add(rowView);
add(rowItem);
@@ -258,7 +258,7 @@
@Override
public Iterator<Item<T>> getItems()
{
- Iterator<MarkupContainer< ? >> rows = Generics.iterator(iterator());
+ Iterator<MarkupContainer> rows = Generics.iterator(iterator());
return new ItemsIterator<T>(rows);
}
@@ -289,9 +289,9 @@
* @param index
* @return created Item
*/
- protected Item< ? > newRowItem(String id, int index)
+ protected Item<?> newRowItem(String id, int index)
{
- return new Item<Void>(id, index, null);
+ return new Item<Object>(id, index, null);
}
/**
@@ -303,7 +303,7 @@
*/
private static class ItemsIterator<T> implements Iterator<Item<T>>
{
- private final Iterator<MarkupContainer< ? >> rows;
+ private final Iterator<MarkupContainer> rows;
private Iterator<Item<T>> cells;
private Item<T> next;
@@ -312,7 +312,7 @@
* @param rows
* iterator over child row views
*/
- public ItemsIterator(Iterator<MarkupContainer< ? >> rows)
+ public ItemsIterator(Iterator<MarkupContainer> rows)
{
this.rows = rows;
findNext();
@@ -356,10 +356,10 @@
{
while (rows.hasNext())
{
- MarkupContainer< ? > row = rows.next();
+ MarkupContainer row = rows.next();
- final Iterator<Component< ? >> rawCells;
- rawCells = ((MarkupContainer< ? >)row.iterator().next()).iterator();
+ final Iterator<? extends Component> rawCells;
+ rawCells = ((MarkupContainer)row.iterator().next()).iterator();
cells = Generics.iterator(rawCells);
if (cells.hasNext())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java Sat Jun 28 22:50:41 2008
@@ -65,7 +65,7 @@
* the children are nested inside <wicket:component>, their respective Java components are not.
* They must be added to the parent container of <wicket:component>.
*/
- private final Map<Component<?>, MarkupContainer<?>> nestedComponents = new HashMap<Component<?>, MarkupContainer<?>>();
+ private final Map<Component, MarkupContainer> nestedComponents = new HashMap<Component, MarkupContainer>();
/**
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
@@ -78,8 +78,8 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public final boolean resolve(final MarkupContainer<?> container,
- final MarkupStream markupStream, final ComponentTag tag)
+ public final boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// It must be <wicket:...>
if (tag instanceof WicketTag)
@@ -89,13 +89,13 @@
if (wicketTag.isComponentTag())
{
// Create and initialize the component
- final Component<?> component = createComponent(container, wicketTag);
+ final Component component = createComponent(container, wicketTag);
if (component != null)
{
// 1. push the current component onto the stack
if (component instanceof Border)
{
- nestedComponents.put(((Border<?>)component).getBodyContainer(), container);
+ nestedComponents.put(((Border)component).getBodyContainer(), container);
}
else
{
@@ -122,10 +122,10 @@
if ((tag.getId() != null) && nestedComponents.containsKey(container))
{
// Make sure you handle nested auto-components properly
- MarkupContainer<?> parent = nestedComponents.get(container);
+ MarkupContainer parent = nestedComponents.get(container);
while (parent != null)
{
- Component<?> component = parent.get(tag.getId());
+ Component component = parent.get(tag.getId());
if (component != null)
{
component.render(markupStream);
@@ -156,8 +156,7 @@
* in case the component could not be created
*/
// Wicket is current not using any bean util jar, which is why ...
- private final Component<?> createComponent(final MarkupContainer<?> container,
- final WicketTag tag)
+ private final Component createComponent(final MarkupContainer container, final WicketTag tag)
{
// If no component name is given, create a page-unique one yourself.
String componentId = tag.getNameAttribute();
@@ -175,7 +174,7 @@
// construct the component. It must have a constructor with a single
// String (componentId) parameter.
- final Component<?> component;
+ final Component component;
try
{
// Load the class. In case a Groovy Class Resolver has been provided,
@@ -186,7 +185,7 @@
classname);
final Constructor<?> constructor = componentClass.getConstructor(new Class[] { String.class });
- component = (Component<?>)constructor.newInstance(new Object[] { componentId });
+ component = (Component)constructor.newInstance(new Object[] { componentId });
}
catch (ClassNotFoundException e)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Sat Jun 28 22:50:41 2008
@@ -82,8 +82,8 @@
* the attribute to replace the value of
* @return a new auto component or null if the path was absolute
*/
- protected final Component<?> newPackageResourceReferenceAutoComponent(
- final MarkupContainer<?> container, final String autoId, final PathInfo pathInfo,
+ protected final Component newPackageResourceReferenceAutoComponent(
+ final MarkupContainer container, final String autoId, final PathInfo pathInfo,
final String attribute)
{
if (!pathInfo.absolute && (pathInfo.path != null) && (pathInfo.path.length() > 0))
@@ -96,8 +96,7 @@
// header has been added to (e.g. the Page). What we need
// however, is the component (e.g. a Panel) which
// contributed it.
- Class<? extends Component<?>> clazz = container.getMarkupStream()
- .getContainerClass();
+ Class<? extends Component> clazz = container.getMarkupStream().getContainerClass();
// However if the markup stream is a merged markup stream (inheritance), than we
// need the class of the markup file which contained the tag.
@@ -155,7 +154,7 @@
* @param parameters
* @param anchor
*/
- public <C extends Page<?>> AutolinkBookmarkablePageLink(final String id,
+ public <C extends Page> AutolinkBookmarkablePageLink(final String id,
final Class<C> pageClass, final PageParameters parameters, final String anchor)
{
super(id, pageClass, parameters);
@@ -208,14 +207,14 @@
* @return a new auto component or null in case this method couldn't resolve to a proper
* auto component
*/
- Component<?> newAutoComponent(final MarkupContainer<?> container, final String autoId,
+ Component newAutoComponent(final MarkupContainer container, final String autoId,
final PathInfo pathInfo);
}
/**
* Encapsulates different aspects of a path. For instance, the path
- * <code>org.apache.wicket.markup.html.tree.Tree/tree.css</code> has extension
- * <code>css</code>, is relative (absolute == true) and has no page parameters.
+ * <code>org.apache.wicket.markup.html.tree.Tree/tree.css</code> has extension <code>css</code>,
+ * is relative (absolute == true) and has no page parameters.
*/
public static final class PathInfo
{
@@ -394,8 +393,8 @@
* java.lang.String, org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
*/
@SuppressWarnings("unchecked")
- public Component<?> newAutoComponent(final MarkupContainer<?> container,
- final String autoId, PathInfo pathInfo)
+ public Component newAutoComponent(final MarkupContainer container, final String autoId,
+ PathInfo pathInfo)
{
if ((pathInfo.extension != null) &&
supportedPageExtensions.contains(pathInfo.extension))
@@ -417,7 +416,7 @@
try
{
- final Class<? extends Page<?>> clazz = (Class<? extends Page<?>>)defaultClassResolver.resolveClass(className);
+ final Class<? extends Page> clazz = (Class<? extends Page>)defaultClassResolver.resolveClass(className);
return new AutolinkBookmarkablePageLink(autoId, clazz, pathInfo.pageParameters,
pathInfo.anchor);
}
@@ -428,7 +427,7 @@
}
// Make sure base markup pages (inheritance) are handled correct
- MarkupContainer<?> parentWithContainer = container;
+ MarkupContainer parentWithContainer = container;
if (container.getParent() != null)
{
parentWithContainer = container.findParentWithAssociatedMarkup();
@@ -436,7 +435,7 @@
if ((parentWithContainer instanceof Page) && !pathInfo.path.startsWith("/") &&
page.getMarkupStream().isMergedMarkup())
{
- Class<? extends Page<?>> clazz = (Class<? extends Page<?>>)container.getMarkupStream()
+ Class<? extends Page> clazz = (Class<? extends Page>)container.getMarkupStream()
.getTag()
.getMarkupClass();
if (clazz != null)
@@ -447,7 +446,7 @@
try
{
- clazz = (Class<? extends Page<?>>)defaultClassResolver.resolveClass(className);
+ clazz = (Class<? extends Page>)defaultClassResolver.resolveClass(className);
return new AutolinkBookmarkablePageLink(autoId, clazz,
pathInfo.getPageParameters(), pathInfo.anchor);
}
@@ -511,8 +510,8 @@
{
/**
* Gets the reference attribute value of the tag depending on the type of the tag. For
- * instance, anchors use the <code>href</code> attribute but script and image references
- * use the <code>src</code> attribute.
+ * instance, anchors use the <code>href</code> attribute but script and image references use
+ * the <code>src</code> attribute.
*
* @param tag
* The component tag. Not for modification.
@@ -526,7 +525,7 @@
* component resolution to their parent components. Reason: autolink tags don't have wicket:id
* and users wouldn't know where to add the component to.
*/
- private final static class ResourceReferenceAutolink extends WebMarkupContainer<Object>
+ private final static class ResourceReferenceAutolink extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -618,8 +617,8 @@
* @see org.apache.wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(org.apache.wicket.MarkupContainer,
* java.lang.String, org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
*/
- public Component<?> newAutoComponent(final MarkupContainer<?> container,
- final String autoId, final PathInfo pathInfo)
+ public Component newAutoComponent(final MarkupContainer container, final String autoId,
+ final PathInfo pathInfo)
{
return newPackageResourceReferenceAutoComponent(container, autoId, pathInfo, attribute);
}
@@ -646,8 +645,8 @@
/**
* Gets the reference attribute value of the tag depending on the type of the tag. For
- * instance, anchors use the <code>href</code> attribute but script and image references
- * use the <code>src</code> attribute.
+ * instance, anchors use the <code>href</code> attribute but script and image references use
+ * the <code>src</code> attribute.
*
* @param tag
* The component tag. Not for modification.
@@ -750,8 +749,8 @@
* The container parsing its markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public final boolean resolve(final MarkupContainer<?> container,
- final MarkupStream markupStream, final ComponentTag tag)
+ public final boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// Must be marked as autolink tag
if (tag.isAutolinkEnabled())
@@ -759,7 +758,7 @@
// Try to find the Page matching the href
// Note: to not use tag.getId() because it will be modified while
// resolving the link and hence the 2nd render will fail.
- final Component<?> link = resolveAutomaticLink(container,
+ final Component link = resolveAutomaticLink(container,
WicketLinkTagHandler.AUTOLINK_ID, tag);
// Add the link to the container
@@ -792,10 +791,10 @@
* the component tag
* @return A BookmarkablePageLink to handle the href
*/
- private final Component<?> resolveAutomaticLink(final MarkupContainer<?> container,
- final String id, final ComponentTag tag)
+ private final Component resolveAutomaticLink(final MarkupContainer container, final String id,
+ final ComponentTag tag)
{
- final Page<?> page = container.getPage();
+ final Page page = container.getPage();
// Make the id (page-)unique
final String autoId = id + Integer.toString(page.getAutoIndex());
@@ -827,7 +826,7 @@
PathInfo pathInfo = new PathInfo(reference);
// now get the resolver delegate
IAutolinkResolverDelegate autolinkResolverDelegate = tagNameToAutolinkResolverDelegates.get(tagName);
- Component<?> autoComponent = null;
+ Component autoComponent = null;
if (autolinkResolverDelegate != null)
{
autoComponent = autolinkResolverDelegate.newAutoComponent(container, autoId, pathInfo);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java Sat Jun 28 22:50:41 2008
@@ -58,7 +58,7 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
// Must be wicket:body
@@ -69,7 +69,7 @@
{
// Find the border parent. There must not be a body container in
// between
- MarkupContainer< ? > parent = container.getParent();
+ MarkupContainer parent = container.getParent();
while (parent != null)
{
if (parent instanceof Border.BorderBodyContainer)
@@ -78,7 +78,7 @@
}
else if (parent instanceof Border)
{
- Component< ? > component = parent.get(tag.getId());
+ Component component = parent.get(tag.getId());
if (component != null)
{
component.render(markupStream);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java Sat Jun 28 22:50:41 2008
@@ -41,7 +41,7 @@
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
if ((tag instanceof WicketTag) && ((WicketTag)tag).isEnclosureTag())
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java Sat Jun 28 22:50:41 2008
@@ -56,7 +56,7 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
// If <wicket:...>
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java Sat Jun 28 22:50:41 2008
@@ -65,7 +65,7 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
// Only <head> component tags have the id == "_header"
@@ -73,7 +73,7 @@
{
// Create a special header component which will gather additional
// input the <head> from 'contributors'.
- final WebMarkupContainer< ? > header = new HtmlHeaderContainer(
+ final WebMarkupContainer header = new HtmlHeaderContainer(
HtmlHeaderSectionHandler.HEADER_ID + container.getPage().getAutoIndex());
container.autoAdd(header, markupStream);
@@ -89,14 +89,14 @@
{
// Create a special header component which will gather
// additional input the <head> from 'contributors'.
- final MarkupContainer< ? > header = new HtmlHeaderContainer(
+ final MarkupContainer header = new HtmlHeaderContainer(
HtmlHeaderSectionHandler.HEADER_ID + container.getPage().getAutoIndex());
// It is <wicket:head>. Because they do not provide any
// additional functionality they are merely a means of surrounding relevant
// markup. Thus we simply create a WebMarkupContainer to handle
// the tag.
- final WebMarkupContainer< ? > header2 = new WebMarkupContainer<Object>(
+ final WebMarkupContainer header2 = new WebMarkupContainer(
HtmlHeaderSectionHandler.HEADER_ID)
{
private static final long serialVersionUID = 1L;
@@ -120,7 +120,7 @@
// additional functionality there are merely a means of surrounding
// relevant markup. Thus we simply create a WebMarkupContainer to handle
// the tag.
- final WebMarkupContainer< ? > header = new WebMarkupContainer<Object>(
+ final WebMarkupContainer header = new WebMarkupContainer(
HtmlHeaderSectionHandler.HEADER_ID)
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java Sat Jun 28 22:50:41 2008
@@ -40,6 +40,6 @@
* The current component tag while parsing the markup
* @return True if component-id was handled by the resolver, false otherwise.
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java Sat Jun 28 22:50:41 2008
@@ -51,7 +51,7 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
// It must be <wicket:...>
@@ -81,7 +81,7 @@
/**
* This is a WebMarkupContainer, except that it is transparent for it child components.
*/
- private static class TransparentWebMarkupContainer extends WebMarkupContainer<Object>
+ private static class TransparentWebMarkupContainer extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java Sat Jun 28 22:50:41 2008
@@ -40,7 +40,7 @@
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
* MarkupStream, ComponentTag)
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
// Ignore special tags like _panel, _border, _extend etc.
@@ -49,14 +49,14 @@
return false;
}
- MarkupContainer< ? > parent = container;
+ MarkupContainer parent = container;
while ((parent != null) && (parent.isTransparentResolver()))
{
// Try to find the component with the parent component.
parent = parent.getParent();
if (parent != null)
{
- Component< ? > component = parent.get(tag.getId());
+ Component component = parent.get(tag.getId());
if (component != null)
{
component.render(markupStream);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java Sat Jun 28 22:50:41 2008
@@ -96,12 +96,12 @@
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
// Try to find the component with the parent component.
final String id = tag.getId();
- MarkupContainer< ? > parent = container;
+ MarkupContainer parent = container;
while (!(parent instanceof Page) && !(parent instanceof Panel) && (parent != null))
{
@@ -111,7 +111,7 @@
return false;
}
- final Component< ? > component = parent.get(id);
+ final Component component = parent.get(id);
if ((component != null) && (component instanceof IScopedComponent))
{
IScopedComponent sc = (IScopedComponent)component;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java Sat Jun 28 22:50:41 2008
@@ -84,7 +84,7 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
// this is only here so we register wicket:container tag, this resolver
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java Sat Jun 28 22:50:41 2008
@@ -48,7 +48,7 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
if (tag instanceof WicketTag)
@@ -57,7 +57,7 @@
if (wtag.isLinkTag() && (wtag.getNamespace() != null))
{
final String id = tag.getId() + container.getPage().getAutoIndex();
- final Component< ? > component = new WebMarkupContainer<Object>(id)
+ final Component component = new WebMarkupContainer(id)
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java Sat Jun 28 22:50:41 2008
@@ -124,7 +124,7 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer<?> container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
if (tag instanceof WicketTag)
@@ -173,7 +173,7 @@
* tags.
*
*/
- private static class MessageContainer extends MarkupContainer<String>
+ private static class MessageContainer extends MarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -201,7 +201,7 @@
final ComponentTag openTag)
{
// Get the value from the properties file
- final String key = getModelObjectAsString();
+ final String key = getDefaultModelObjectAsString();
final String value = getLocalizer().getString(key, getParent(), DEFAULT_VALUE);
// if found, than render it after replacing the variables
@@ -262,7 +262,7 @@
if (value == null)
{
value = Strings.toString(PropertyResolver.getValue(variableName,
- getParent().getModelObject()));
+ getParent().getDefaultModelObject()));
}
// If still not found, try the component itself
@@ -359,7 +359,7 @@
final StringResponse response = new StringResponse();
getRequestCycle().setResponse(response);
- Component<?> component = getParent().get(id);
+ Component component = getParent().get(id);
if (component != null)
{
component.render(markupStream);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java Sat Jun 28 22:50:41 2008
@@ -35,11 +35,8 @@
* @see org.apache.wicket.markup.transformer.ITransformer
*
* @author Juergen Donnerstag
- *
- * @param <T>
- * The model data type
- */
-public abstract class AbstractOutputTransformerContainer<T> extends MarkupContainer<T>
+ * */
+public abstract class AbstractOutputTransformerContainer extends MarkupContainer
implements
ITransformer
{
@@ -63,7 +60,7 @@
*
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractOutputTransformerContainer(final String id, final IModel<T> model)
+ public AbstractOutputTransformerContainer(final String id, final IModel<?> model)
{
super(id, model);
}
@@ -76,7 +73,7 @@
* If true, only the body is applied to transformation.
* @return this
*/
- public MarkupContainer<T> setTransformBodyOnly(final boolean value)
+ public MarkupContainer setTransformBodyOnly(final boolean value)
{
transformBodyOnly = value;
return this;
@@ -98,7 +95,7 @@
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
* CharSequence)
*/
- public abstract CharSequence transform(final Component< ? > component, final CharSequence output)
+ public abstract CharSequence transform(final Component component, final CharSequence output)
throws Exception;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java Sat Jun 28 22:50:41 2008
@@ -61,7 +61,7 @@
* org.apache.wicket.markup.ComponentTag)
*/
@Override
- public void onComponentTag(final Component< ? > component, final ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
tag.put("xmlns:wicket", "http://wicket.apache.org");
@@ -85,7 +85,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
@Override
- public void onRendered(final Component< ? > component)
+ public void onRendered(final Component component)
{
final RequestCycle requestCycle = RequestCycle.get();
@@ -122,7 +122,7 @@
* java.lang.RuntimeException)
*/
@Override
- public void onException(Component< ? > component, RuntimeException exception)
+ public void onException(Component component, RuntimeException exception)
{
if (webResponse != null)
{
@@ -136,6 +136,6 @@
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
* CharSequence)
*/
- public abstract CharSequence transform(final Component< ? > component, final CharSequence output)
+ public abstract CharSequence transform(final Component component, final CharSequence output)
throws Exception;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java Sat Jun 28 22:50:41 2008
@@ -37,6 +37,6 @@
* @return The output which will be appended to the original response
* @throws Exception
*/
- CharSequence transform(final Component< ? > component, final CharSequence output)
+ CharSequence transform(final Component component, final CharSequence output)
throws Exception;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
* @param <T>
* The model data type
*/
-public class NoopOutputTransformerContainer<T> extends AbstractOutputTransformerContainer<T>
+public class NoopOutputTransformerContainer extends AbstractOutputTransformerContainer
{
private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
*
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public NoopOutputTransformerContainer(final String id, final IModel<T> model)
+ public NoopOutputTransformerContainer(final String id, final IModel<?> model)
{
super(id, model);
}
@@ -57,7 +57,7 @@
* CharSequence)
*/
@Override
- public CharSequence transform(final Component< ? > component, final CharSequence output)
+ public CharSequence transform(final Component component, final CharSequence output)
{
return output;
}