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/21 02:29:20 UTC
svn commit: r670101 [2/2] - in /wicket/sandbox/ivaynberg/generics:
archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/
wicket-examples/src/main/java/org/apac...
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java Fri Jun 20 17:29:18 2008
@@ -57,7 +57,7 @@
form.add(new TextField<String>("symbol", model));
// labels for displaying the chosen symbol
- add(new Label<String>("symbol", model));
+ add(new Label("symbol", model));
// and its quote
add(new StockQuoteLabel("quote", model));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner.java Fri Jun 20 17:29:18 2008
@@ -25,7 +25,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public abstract class Banner<T> extends Panel<T>
+public abstract class Banner extends Panel
{
/**
* Construct.
@@ -43,7 +43,7 @@
* @param id
* @param model
*/
- public Banner(String id, IModel<T> model)
+ public Banner(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner1.java Fri Jun 20 17:29:18 2008
@@ -24,7 +24,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public class Banner1<T> extends Banner<T>
+public class Banner1<T> extends Banner
{
/**
* Construct.
@@ -42,7 +42,7 @@
* @param id
* @param model
*/
- public Banner1(String id, IModel<T> model)
+ public Banner1(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/Banner2.java Fri Jun 20 17:29:18 2008
@@ -24,7 +24,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public class Banner2<T> extends Banner<T>
+public class Banner2<T> extends Banner
{
/**
* Construct.
@@ -42,7 +42,7 @@
* @param id
* @param model
*/
- public Banner2(String id, IModel<T> model)
+ public Banner2(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Panel1.java Fri Jun 20 17:29:18 2008
@@ -24,7 +24,7 @@
* @author Eelco Hillenius
* @param <T>
*/
-public class Panel1<T> extends TemplatePanel<T>
+public class Panel1 extends TemplatePanel
{
/**
* Construct.
@@ -45,7 +45,7 @@
* @param model
* the model
*/
- public Panel1(String id, IModel<T> model)
+ public Panel1(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java Fri Jun 20 17:29:18 2008
@@ -44,7 +44,7 @@
*/
public TemplatePage()
{
- add(new Label<String>("title", new PropertyModel<String>(this, "pageTitle")));
+ add(new Label("title", new PropertyModel<String>(this, "pageTitle")));
add(currentBanner = new Banner1("ad"));
add(new Link("changeAdLink")
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePanel.java Fri Jun 20 17:29:18 2008
@@ -23,9 +23,8 @@
* Base panel to be extended.
*
* @author Eelco Hillenius
- * @param <T>
*/
-public abstract class TemplatePanel<T> extends Panel<T>
+public abstract class TemplatePanel extends Panel
{
/**
* Construct.
@@ -46,7 +45,7 @@
* @param model
* the model
*/
- public TemplatePanel(String id, IModel<T> model)
+ public TemplatePanel(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java Fri Jun 20 17:29:18 2008
@@ -75,8 +75,8 @@
@Override
protected void populateItem(ListItem<File> listItem)
{
- final File file = listItem.getDefaultModelObject();
- listItem.add(new Label<String>("file", file.getName()));
+ final File file = listItem.getModelObject();
+ listItem.add(new Label("file", file.getName()));
listItem.add(new Link("delete")
{
@Override
@@ -187,7 +187,7 @@
add(simpleUploadForm);
// Add folder view
- add(new Label<String>("dir", uploadFolder.getAbsolutePath()));
+ add(new Label("dir", uploadFolder.getAbsolutePath()));
fileListView = new FileListView("fileList", new LoadableDetachableModel<List<File>>()
{
@Override
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java Fri Jun 20 17:29:18 2008
@@ -72,8 +72,8 @@
@Override
protected void populateItem(ListItem<File> listItem)
{
- final File file = listItem.getDefaultModelObject();
- listItem.add(new Label<String>("file", file.getName()));
+ final File file = listItem.getModelObject();
+ listItem.add(new Label("file", file.getName()));
listItem.add(new Link("delete")
{
@Override
@@ -171,7 +171,7 @@
add(simpleUploadForm);
// Add folder view
- add(new Label<String>("dir", uploadFolder.getAbsolutePath()));
+ add(new Label("dir", uploadFolder.getAbsolutePath()));
fileListView = new FileListView("fileList", new LoadableDetachableModel<List<File>>()
{
@Override
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java Fri Jun 20 17:29:18 2008
@@ -38,7 +38,7 @@
*/
private static final class WizardLink extends Link
{
- private final Class<? extends Wizard<?>> wizardClass;
+ private final Class<? extends Wizard> wizardClass;
/**
* Construct.
@@ -50,7 +50,7 @@
* @param wizardClass
* Class of the wizard to instantiate
*/
- public <C extends Wizard<?>> WizardLink(String id, Class<C> wizardClass)
+ public <C extends Wizard> WizardLink(String id, Class<C> wizardClass)
{
super(id);
this.wizardClass = wizardClass;
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java Fri Jun 20 17:29:18 2008
@@ -43,13 +43,13 @@
/**
* This wizard shows some basic form use. It uses custom panels for the form elements, and a single
- * domain object ({@link User}) as it's subject. Also, the user roles step}is an optional step,
- * that will only be executed when assignRoles is true (and that value is edited in the user details
+ * domain object ({@link User}) as it's subject. Also, the user roles step}is an optional step, that
+ * will only be executed when assignRoles is true (and that value is edited in the user details
* step).
*
* @author Eelco Hillenius
*/
-public class NewUserWizard extends Wizard<NewUserWizard>
+public class NewUserWizard extends Wizard
{
/**
* The confirmation step.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java Fri Jun 20 17:29:18 2008
@@ -37,7 +37,7 @@
* @param wizardClass
* class of the wizard component
*/
- public <C extends Wizard<?>> WizardPage(Class<C> wizardClass)
+ public <C extends Wizard> WizardPage(Class<C> wizardClass)
{
if (wizardClass == null)
{
@@ -45,8 +45,8 @@
}
try
{
- Constructor<? extends Wizard<?>> ctor = wizardClass.getConstructor(String.class);
- Wizard<?> wizard = ctor.newInstance("wizard");
+ Constructor<? extends Wizard> ctor = wizardClass.getConstructor(String.class);
+ Wizard wizard = ctor.newInstance("wizard");
add(wizard);
}
catch (Exception e)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Fri Jun 20 17:29:18 2008
@@ -42,7 +42,7 @@
* @param <T>
* @author Eelco Hillenius
*/
-public class AjaxEditableChoiceLabel<T> extends AjaxEditableLabel<T>
+public class AjaxEditableChoiceLabel extends AjaxEditableLabel
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Fri Jun 20 17:29:18 2008
@@ -70,7 +70,7 @@
* @param <T>
*/
// TODO wonder if it makes sense to refactor this into a formcomponentpanel
-public class AjaxEditableLabel<T> extends Panel
+public class AjaxEditableLabel extends Panel
{
private static final long serialVersionUID = 1L;
@@ -196,7 +196,7 @@
* The validator
* @return This
*/
- public final AjaxEditableLabel<T> add(IValidator validator)
+ public final AjaxEditableLabel add(IValidator validator)
{
getEditor().add(validator);
return this;
@@ -224,7 +224,7 @@
* @param labelModel
* @return this for chaining
*/
- public final AjaxEditableLabel<T> setLabel(final IModel<String> labelModel)
+ public final AjaxEditableLabel setLabel(final IModel<String> labelModel)
{
getEditor().setLabel(labelModel);
return this;
@@ -234,7 +234,7 @@
* @see org.apache.wicket.MarkupContainer#setDefaultModel(org.apache.wicket.model.IModel)
*/
@Override
- public final AjaxEditableLabel<T> setDefaultModel(IModel<?> model)
+ public final AjaxEditableLabel setDefaultModel(IModel<?> model)
{
super.setDefaultModel(model);
getLabel().setDefaultModel(model);
@@ -248,7 +248,7 @@
* @param required
* @return this for chaining
*/
- public final AjaxEditableLabel<T> setRequired(final boolean required)
+ public final AjaxEditableLabel setRequired(final boolean required)
{
getEditor().setRequired(required);
return this;
@@ -261,7 +261,7 @@
* @param type
* @return this for chaining
*/
- public final AjaxEditableLabel<T> setType(Class<?> type)
+ public final AjaxEditableLabel setType(Class<?> type)
{
getEditor().setType(type);
return this;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Fri Jun 20 17:29:18 2008
@@ -35,7 +35,7 @@
* @param <T>
* Model object type
*/
-public class AjaxEditableMultiLineLabel<T> extends AjaxEditableLabel<T>
+public class AjaxEditableMultiLineLabel extends AjaxEditableLabel
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java Fri Jun 20 17:29:18 2008
@@ -33,7 +33,7 @@
*/
public AjaxEditableLabelPage()
{
- final AjaxEditableLabel<String> ajaxLabel = new AjaxEditableLabel<String>("ajaxLabel",
+ final AjaxEditableLabel ajaxLabel = new AjaxEditableLabel("ajaxLabel",
new Model<String>("ajaxTest"));
add(ajaxLabel);
add(new AjaxLink("toggle")
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java?rev=670101&r1=670100&r2=670101&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java Fri Jun 20 17:29:18 2008
@@ -45,7 +45,7 @@
public void testAjaxEditableLabel()
{
Page page = tester.getLastRenderedPage();
- AjaxEditableLabel<?> ajaxLabel = (AjaxEditableLabel<?>)page.get("ajaxLabel");
+ AjaxEditableLabel ajaxLabel = (AjaxEditableLabel)page.get("ajaxLabel");
AbstractAjaxBehavior labelBehavior = (AbstractAjaxBehavior)ajaxLabel.get("label")
.getBehaviors()
@@ -72,7 +72,7 @@
public void testDisabledAjaxEditableLabel()
{
Page page = tester.getLastRenderedPage();
- AjaxEditableLabel<?> ajaxLabel = (AjaxEditableLabel<?>)page.get("ajaxLabel");
+ AjaxEditableLabel ajaxLabel = (AjaxEditableLabel)page.get("ajaxLabel");
AjaxLink toggle = (AjaxLink)page.get("toggle");
AbstractAjaxBehavior toggleBehavior = (AbstractAjaxBehavior)toggle.getBehaviors().get(0);