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/20 09:56:15 UTC
svn commit: r669811 [2/2] - in
/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket:
ajax/markup/html/form/ markup/html/ markup/html/border/ markup/html/debug/
markup/html/form/ markup/html/form/upload/ markup/html/form/validation/...
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Fri Jun 20 00:56:13 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java Fri Jun 20 00:56:13 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;
@@ -80,8 +80,7 @@
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));
@@ -90,7 +89,7 @@
// 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;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java Fri Jun 20 00:56:13 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java Fri Jun 20 00:56:13 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java Fri Jun 20 00:56:13 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);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.java Fri Jun 20 00:56:13 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java Fri Jun 20 00:56:13 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.
@@ -62,14 +62,13 @@
}
/**
- * @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)
{
- final FeedbackMessage message = listItem.getDefaultModelObject();
+ final FeedbackMessage message = listItem.getModelObject();
message.markRendered();
final IModel<String> replacementModel = new Model<String>()
{
@@ -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)
@@ -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)
{
@@ -295,7 +295,7 @@
*/
protected final List<FeedbackMessage> getCurrentMessages()
{
- final List<FeedbackMessage> messages = messageListView.getDefaultModelObject();
+ final List<FeedbackMessage> messages = messageListView.getModelObject();
return Collections.unmodifiableList(messages);
}
@@ -315,13 +315,13 @@
*
* 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)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java Fri Jun 20 00:56:13 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Fri Jun 20 00:56:13 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
@@ -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;
@@ -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)
{
@@ -1069,7 +1071,8 @@
if (isNodeExpanded(item.getDefaultModelObject()))
{
// build the items for children of the items' treenode.
- items = buildTreeItems(item, nodeChildren(item.getDefaultModelObject()), item.getLevel() + 1);
+ items = buildTreeItems(item, nodeChildren(item.getDefaultModelObject()),
+ item.getLevel() + 1);
}
else
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Fri Jun 20 00:56:13 2008
@@ -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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java Fri Jun 20 00:56:13 2008
@@ -156,8 +156,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(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()))
{
@@ -166,14 +165,14 @@
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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java Fri Jun 20 00:56:13 2008
@@ -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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java Fri Jun 20 00:56:13 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java Fri Jun 20 00:56:13 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java Fri Jun 20 00:56:13 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);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java Fri Jun 20 00:56:13 2008
@@ -61,7 +61,7 @@
while (existingItems.hasNext())
{
final Item<T> item = existingItems.next();
- modelToItem.put(item.getDefaultModel(), item);
+ modelToItem.put(item.getModel(), item);
}
return new Iterator<Item<T>>()
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java Fri Jun 20 00:56:13 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);
@@ -289,7 +289,7 @@
* @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);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java Fri Jun 20 00:56:13 2008
@@ -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)
@@ -95,7 +95,7 @@
// 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
{
@@ -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();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Fri Jun 20 00:56:13 2008
@@ -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.
@@ -214,8 +213,8 @@
/**
* 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))
@@ -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())
@@ -792,8 +791,8 @@
* 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();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java Fri Jun 20 00:56:13 2008
@@ -96,7 +96,7 @@
// 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java Fri Jun 20 00:56:13 2008
@@ -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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java Fri Jun 20 00:56:13 2008
@@ -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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java Fri Jun 20 00:56:13 2008
@@ -173,7 +173,7 @@
* tags.
*
*/
- private static class MessageContainer extends MarkupContainer<String>
+ private static class MessageContainer extends MarkupContainer
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java Fri Jun 20 00:56:13 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;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java Fri Jun 20 00:56:13 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);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java Fri Jun 20 00:56:13 2008
@@ -40,7 +40,7 @@
* @param <T>
* The model data type
*/
-public class XsltOutputTransformerContainer<T> extends AbstractOutputTransformerContainer<T>
+public class XsltOutputTransformerContainer extends AbstractOutputTransformerContainer
{
private static final long serialVersionUID = 1L;
@@ -60,12 +60,12 @@
* @param xslFilePath
* XSL input file path
*/
- public XsltOutputTransformerContainer(final String id, final IModel<T> model,
+ public XsltOutputTransformerContainer(final String id, final IModel<?> model,
final String xslFilePath)
{
super(id);
- this.xslFile = xslFilePath;
+ xslFile = xslFilePath;
// The containers tag will be transformed as well. Thus we make sure that
// the xml provided to the xsl processor is well formed (has a single
@@ -87,7 +87,7 @@
* the model (unused)
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public XsltOutputTransformerContainer(final String id, final IModel<T> model)
+ public XsltOutputTransformerContainer(final String id, final IModel<?> model)
{
this(id, model, null);
}
@@ -123,6 +123,6 @@
public CharSequence transform(final Component component, final CharSequence output)
throws Exception
{
- return new XsltTransformer(this.xslFile).transform(component, output);
+ return new XsltTransformer(xslFile).transform(component, output);
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/BoundCompoundPropertyModel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/BoundCompoundPropertyModel.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/BoundCompoundPropertyModel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/BoundCompoundPropertyModel.java Fri Jun 20 00:56:13 2008
@@ -91,15 +91,14 @@
/**
* Adds a property binding, using the component's id as the property expression.
*
- * @param
- * <P>
- * The Model object of the component
+ * @param <P>
+ * The Model object of the component
*
* @param component
* The component to bind
* @return The component, for convenience in adding components
*/
- public <P> Component<P> bind(final Component<P> component)
+ public Component bind(final Component component)
{
if (component == null)
{
@@ -113,9 +112,8 @@
/**
* Adds a property binding.
*
- * @param
- * <P>
- * The Model object of the component
+ * @param <P>
+ * The Model object of the component
*
* @param component
* The component to bind
@@ -123,7 +121,7 @@
* A property expression pointing to the property in this model
* @return The component, for convenience in adding components
*/
- public <P> Component<P> bind(final Component<P> component, final String propertyExpression)
+ public Component bind(final Component component, final String propertyExpression)
{
if (component == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java Fri Jun 20 00:56:13 2008
@@ -68,19 +68,18 @@
/**
* Wrapper used when assigning a ComponentPropertyModel to a component.
*
- * @param
- * <P>
- * The Model Object
+ * @param <P>
+ * The Model Object
*/
private class AssignmentWrapper<P> extends AbstractReadOnlyModel<P> implements IWrapModel<P>
{
private static final long serialVersionUID = 1L;
- private final Component<P> component;
+ private final Component component;
private final String propertyName;
- AssignmentWrapper(final Component<P> component, final String propertyName)
+ AssignmentWrapper(final Component component, final String propertyName)
{
this.component = component;
this.propertyName = propertyName;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java Fri Jun 20 00:56:13 2008
@@ -127,7 +127,7 @@
/**
* @see org.apache.wicket.model.IComponentInheritedModel#wrapOnInheritance(org.apache.wicket.Component)
*/
- public <C> IWrapModel<C> wrapOnInheritance(Component<C> component)
+ public <C> IWrapModel<C> wrapOnInheritance(Component component)
{
return new AttachedCompoundPropertyModel<C>(component);
}
@@ -161,7 +161,7 @@
{
private static final long serialVersionUID = 1L;
- private final Component<C> owner;
+ private final Component owner;
/**
* Constructor
@@ -169,7 +169,7 @@
* @param owner
* component that this model has been attached to
*/
- public AttachedCompoundPropertyModel(Component<C> owner)
+ public AttachedCompoundPropertyModel(Component owner)
{
super(CompoundPropertyModel.this);
this.owner = owner;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java Fri Jun 20 00:56:13 2008
@@ -24,8 +24,8 @@
* {@link StringResourceModel}. It lacks parameter substitutions, but is generally easier to use.
* <p>
* If you don't use this model as primary component model (you don't specify it in component
- * constructor and don't assign it to component using {@link Component#setDefaultModel(IModel)}), you will
- * need to connect the model with a component using {@link #wrapOnAssignment(Component)}.
+ * constructor and don't assign it to component using {@link Component#setDefaultModel(IModel)}),
+ * you will need to connect the model with a component using {@link #wrapOnAssignment(Component)}.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -74,14 +74,14 @@
{
// this shouldn't be called always wrapped!
return Application.get().getResourceSettings().getLocalizer().getString(resourceKey,
- (Component<String>)null, defaultValue);
+ (Component)null, defaultValue);
}
/**
* @see org.apache.wicket.model.IComponentAssignedModel#wrapOnAssignment(org.apache.wicket.Component)
*/
- public IWrapModel<String> wrapOnAssignment(final Component<String> component)
+ public IWrapModel<String> wrapOnAssignment(final Component component)
{
return new AssignmentWrapper(resourceKey, defaultValue, component);
}
@@ -93,7 +93,7 @@
{
private static final long serialVersionUID = 1L;
- private final Component<String> component;
+ private final Component component;
/**
* Construct.
@@ -102,8 +102,7 @@
* @param defaultValue
* @param component
*/
- public AssignmentWrapper(String resourceKey, String defaultValue,
- Component<String> component)
+ public AssignmentWrapper(String resourceKey, String defaultValue, Component component)
{
super(resourceKey, defaultValue);
this.component = component;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java Fri Jun 20 00:56:13 2008
@@ -51,10 +51,9 @@
* reusable components/containers that are packaged with their own string resource bundles it should
* be the actual component/container rather than the page. For more information on this please see
* {@link org.apache.wicket.resource.loader.ComponentStringResourceLoader}. The relative component
- * may actually be <code>null</code> when all resource loading is to be done from a global
- * resource loader. However, we recommend that a relative component is still supplied even in these
- * cases in order to 'future proof' your application with regards to changing resource loading
- * strategies.
+ * may actually be <code>null</code> when all resource loading is to be done from a global resource
+ * loader. However, we recommend that a relative component is still supplied even in these cases in
+ * order to 'future proof' your application with regards to changing resource loading strategies.
* <li><b>model </b>- This parameter is mandatory if either the resourceKey, the found string
* resource (see below) or any of the substitution parameters (see below) contain property
* expressions. Where property expressions are present they will all be evaluated relative to this
@@ -65,10 +64,10 @@
* <code>java.text.MessageFormat</code> object. Each parameter may be an ordinary Object, in which
* case it will be processed by the standard formatting rules associated with
* <code>java.text.MessageFormat</code>. Alternatively, the parameter may be an instance of
- * <code>IModel</code> in which case the <code>getObject()</code> method will be applied prior
- * to the parameter being passed to the <code>java.text.MessageFormat</code>. This allows such
- * features dynamic parameters that are obtained using a <code>PropertyModel</code> object or even
- * nested string resource models.
+ * <code>IModel</code> in which case the <code>getObject()</code> method will be applied prior to
+ * the parameter being passed to the <code>java.text.MessageFormat</code>. This allows such features
+ * dynamic parameters that are obtained using a <code>PropertyModel</code> object or even nested
+ * string resource models.
* </ul>
* As well as the supplied parameters, the found string resource can contain formatting information.
* It may contain property expressions in which case these are evaluated using the model object
@@ -205,7 +204,7 @@
/** The default value of the message. */
private final String defaultValue;
- public IWrapModel<String> wrapOnAssignment(Component<String> component)
+ public IWrapModel<String> wrapOnAssignment(Component component)
{
return new AssignmentWrapper(component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java Fri Jun 20 00:56:13 2008
@@ -246,9 +246,9 @@
/**
* @see org.apache.wicket.session.ISessionStore#newVersionManager(Page)
*/
- public <T> IPageVersionManager<T> newVersionManager(Page page)
+ public IPageVersionManager newVersionManager(Page page)
{
- return new UndoPageVersionManager<T>(page, 20);
+ return new UndoPageVersionManager(page, 20);
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java Fri Jun 20 00:56:13 2008
@@ -69,8 +69,8 @@
* <p>
* Note that the versionNumber and ajaxVersionNumber parameters may be -1.
* <ul>
- * <li>If ajaxVersionNumber is -1 and versionNumber is specified, the page store must
- * return the page with highest ajax version.
+ * <li>If ajaxVersionNumber is -1 and versionNumber is specified, the page store must return
+ * the page with highest ajax version.
* <li>If both versionNumber and ajaxVersioNumber are -1, the pagestore must return last
* touched (saved) page version with given id.
* </ul>
@@ -416,9 +416,7 @@
* @param <T>
* The page's model object type
*/
- private static final class SecondLevelCachePageVersionManager<T>
- implements
- IPageVersionManager<T>
+ private static final class SecondLevelCachePageVersionManager implements IPageVersionManager
{
private static final long serialVersionUID = 1L;
@@ -724,9 +722,9 @@
* @see org.apache.wicket.protocol.http.HttpSessionStore#newVersionManager(org.apache.wicket.Page)
*/
@Override
- public <T> IPageVersionManager<T> newVersionManager(Page page)
+ public IPageVersionManager newVersionManager(Page page)
{
- return new SecondLevelCachePageVersionManager<T>(page);
+ return new SecondLevelCachePageVersionManager(page);
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java Fri Jun 20 00:56:13 2008
@@ -55,15 +55,13 @@
/**
* An <code>IModel</code> is about to change.
*
- * @param <T>
- * type of component's model object
*
* @param component
* the <code>Component</code> for which the <code>IModel</code> changed
*/
- <T> void componentModelChanging(Component component)
+ void componentModelChanging(Component component)
{
- changes.add(new ModelChange<T>(component));
+ changes.add(new ModelChange(component));
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java Fri Jun 20 00:56:13 2008
@@ -34,7 +34,7 @@
* type of component's model object
* @since 1.2.6
*/
-class ModelChange<T> extends Change
+class ModelChange extends Change
{
private static final long serialVersionUID = 1L;
@@ -45,7 +45,7 @@
private final Component component;
/** the original <code>IModel</code> */
- private IModel<T> originalModel;
+ private IModel<?> originalModel;
/**
* Constructor.
@@ -65,7 +65,7 @@
this.component = component;
// Get component model
- final IModel<T> model = component.getDefaultModel();
+ final IModel<?> model = component.getDefaultModel();
// If the component has a model, it's about to change!
if (model != null)
@@ -102,7 +102,7 @@
if (cloneModel)
{
model.detach();
- originalModel = (IModel<T>)Objects.cloneModel(model);
+ originalModel = (IModel<?>)Objects.cloneModel(model);
}
else
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java?rev=669811&r1=669810&r2=669811&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java Fri Jun 20 00:56:13 2008
@@ -25,16 +25,16 @@
/**
- * A version manager implemented by recording <code>Component</code> changes as undo records.
- * These records can later be reversed to get back to a given version of the <code>Page</code>
- * being managed.
+ * A version manager implemented by recording <code>Component</code> changes as undo records. These
+ * records can later be reversed to get back to a given version of the <code>Page</code> being
+ * managed.
*
* @author Jonathan Locke
* @param <T>
* Type of Page
* @since 1.2.6
*/
-public class UndoPageVersionManager<T> implements IPageVersionManager<T>
+public class UndoPageVersionManager implements IPageVersionManager
{
/** logger */
private static final Logger log = LoggerFactory.getLogger(UndoPageVersionManager.class);