You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2008/06/20 23:38:13 UTC
svn commit: r670075 - in
/wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps:
app1/Home.java app2/Home.java
Author: ehillenius
Date: Fri Jun 20 14:38:13 2008
New Revision: 670075
URL: http://svn.apache.org/viewvc?rev=670075&view=rev
Log:
igor's generics wip
Modified:
wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java
Modified: wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java?rev=670075&r1=670074&r2=670075&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java Fri Jun 20 14:38:13 2008
@@ -65,7 +65,7 @@
public class Home extends WebPage
{
- private class ActionPanel extends Panel<Contact>
+ private class ActionPanel extends Panel
{
private static final long serialVersionUID = 1L;
@@ -85,7 +85,7 @@
@Override
public void onClick()
{
- selected = ActionPanel.this.getDefaultModelObject();
+ selected = (Contact)ActionPanel.this.getDefaultModelObject();
}
});
}
@@ -146,8 +146,8 @@
@Override
protected void populateItem(ListItem<String> item)
{
- item.add(new Radio<String>("radio", item.getDefaultModel()));
- item.add(new Label<String>("number", item.getDefaultModelObjectAsString()));
+ item.add(new Radio<String>("radio", item.getModel()));
+ item.add(new Label("number", item.getDefaultModelObjectAsString()));
};
};
group.add(numbers);
@@ -161,8 +161,8 @@
@Override
protected void populateItem(ListItem<String> item)
{
- item.add(new Check<String>("check", item.getDefaultModel()));
- item.add(new Label<String>("number", item.getDefaultModelObjectAsString()));
+ item.add(new Check<String>("check", item.getModel()));
+ item.add(new Label("number", item.getDefaultModelObjectAsString()));
};
};
checks.add(checksList);
@@ -212,6 +212,7 @@
{
private static final long serialVersionUID = 1L;
+ @SuppressWarnings("unchecked")
@Override
public <X> IConverter<X> getConverter(Class<X> clazz)
{
@@ -265,8 +266,8 @@
@Override
protected void populateItem(ListItem<Line> item)
{
- item.add(new TextField<String>("lineEdit", new PropertyModel<String>(item.getDefaultModel(),
- "text")));
+ item.add(new TextField<String>("lineEdit", new PropertyModel<String>(
+ item.getDefaultModel(), "text")));
}
}
@@ -374,8 +375,7 @@
}
});
- add(new Label<Contact>("selectedLabel", new PropertyModel<Contact>(this,
- "selectedContactLabel")));
+ add(new Label("selectedLabel", new PropertyModel<Contact>(this, "selectedContactLabel")));
add(new DataView<Contact>("simple", new ContactDataProvider())
{
@@ -384,13 +384,13 @@
@Override
protected void populateItem(final Item<Contact> item)
{
- Contact contact = item.getDefaultModelObject();
- item.add(new ActionPanel("actions", item.getDefaultModel()));
- item.add(new Label<String>("contactid", String.valueOf(contact.getId())));
- item.add(new Label<String>("firstname", contact.getFirstName()));
- item.add(new Label<String>("lastname", contact.getLastName()));
- item.add(new Label<String>("homephone", contact.getHomePhone()));
- item.add(new Label<String>("cellphone", contact.getCellPhone()));
+ Contact contact = item.getModelObject();
+ item.add(new ActionPanel("actions", item.getModel()));
+ item.add(new Label("contactid", String.valueOf(contact.getId())));
+ item.add(new Label("firstname", contact.getFirstName()));
+ item.add(new Label("lastname", contact.getLastName()));
+ item.add(new Label("homephone", contact.getHomePhone()));
+ item.add(new Label("cellphone", contact.getCellPhone()));
item.add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>()
{
Modified: wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java?rev=670075&r1=670074&r2=670075&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java Fri Jun 20 14:38:13 2008
@@ -42,6 +42,6 @@
return Pool.getConnection().getData();
}
};
- add(new Label<String>("label", model));
+ add(new Label("label", model));
}
}
\ No newline at end of file