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 [2/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/wi...
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java Sat Jun 28 22:50:41 2008
@@ -62,10 +62,10 @@
/**
*/
-public class Home extends WebPage<Void>
+public class Home extends WebPage
{
- private class ActionPanel extends Panel<Contact>
+ private class ActionPanel extends Panel
{
private static final long serialVersionUID = 1L;
@@ -78,14 +78,14 @@
public ActionPanel(String id, IModel<Contact> model)
{
super(id, model);
- add(new Link<Void>("select")
+ add(new Link("select")
{
private static final long serialVersionUID = 1L;
@Override
public void onClick()
{
- selected = ActionPanel.this.getModelObject();
+ selected = (Contact)ActionPanel.this.getDefaultModelObject();
}
});
}
@@ -108,7 +108,7 @@
{
super(name, new CompoundPropertyModel<FormInputModel>(new FormInputModel()));
add(new LocaleDropDownChoice("localeSelect"));
- add(new Link<Void>("defaultLocaleLink")
+ add(new Link("defaultLocaleLink")
{
private static final long serialVersionUID = 1L;
@@ -126,7 +126,7 @@
Integer.class);
add(integerTextField.add(NumberValidator.POSITIVE));
add(new TextField<Double>("doubleProperty", Double.class));
- WebMarkupContainer<?> dateLabel = new WebMarkupContainer<Void>("dateLabel");
+ WebMarkupContainer dateLabel = new WebMarkupContainer("dateLabel");
add(dateLabel);
TextField<Date> datePropertyTextField = new TextField<Date>("dateProperty", Date.class);
add(datePropertyTextField);
@@ -147,7 +147,7 @@
protected void populateItem(ListItem<String> item)
{
item.add(new Radio<String>("radio", item.getModel()));
- item.add(new Label<String>("number", item.getModelObjectAsString()));
+ item.add(new Label("number", item.getDefaultModelObjectAsString()));
};
};
group.add(numbers);
@@ -162,7 +162,7 @@
protected void populateItem(ListItem<String> item)
{
item.add(new Check<String>("check", item.getModel()));
- item.add(new Label<String>("number", item.getModelObjectAsString()));
+ 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)
{
@@ -222,9 +223,9 @@
add(new LinesListView("lines"));
- add(new ImageButton<Void>("saveButton"));
+ add(new ImageButton("saveButton"));
- add(new Link<Void>("resetButtonLink")
+ add(new Link("resetButtonLink")
{
private static final long serialVersionUID = 1L;
@@ -233,7 +234,7 @@
{
InputForm.this.modelChanged();
}
- }.add(new Image<Void>("resetButtonImage")));
+ }.add(new Image("resetButtonImage")));
}
/**
@@ -242,7 +243,7 @@
@Override
public void onSubmit()
{
- info("Saved model " + getModelObject());
+ info("Saved model " + getDefaultModelObject());
}
}
@@ -265,8 +266,8 @@
@Override
protected void populateItem(ListItem<Line> item)
{
- item.add(new TextField<String>("lineEdit", new PropertyModel<String>(item.getModel(),
- "text")));
+ item.add(new TextField<String>("lineEdit", new PropertyModel<String>(
+ item.getDefaultModel(), "text")));
}
}
@@ -312,7 +313,7 @@
public LocaleDropDownChoice(String id)
{
super(id, LOCALES, new LocaleChoiceRenderer());
- setModel(new PropertyModel<Locale>(Home.this, "locale"));
+ setDefaultModel(new PropertyModel<Locale>(Home.this, "locale"));
}
/**
@@ -353,7 +354,7 @@
public Home()
{
- add(new Link<Void>("link")
+ add(new Link("link")
{
private static final long serialVersionUID = 1L;
int i = 0;
@@ -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())
{
@@ -386,11 +386,11 @@
{
Contact contact = item.getModelObject();
item.add(new ActionPanel("actions", item.getModel()));
- 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()));
+ 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/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java Sat Jun 28 22:50:41 2008
@@ -46,7 +46,7 @@
*
* @author almaw
*/
-public class ResourceTestPage extends WebPage<Void>
+public class ResourceTestPage extends WebPage
{
/**
* Defines the number of images per page
@@ -87,7 +87,7 @@
}
final byte[] imageData = baos.toByteArray();
- item.add(new Image<Void>("image", new WebResource()
+ item.add(new Image("image", new WebResource()
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java Sat Jun 28 22:50:41 2008
@@ -55,7 +55,7 @@
}
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Home.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
/**
*/
-public class Home extends WebPage<Void>
+public class Home extends WebPage
{
/**
@@ -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
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java Sat Jun 28 22:50:41 2008
@@ -41,7 +41,7 @@
}
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java Sat Jun 28 22:50:41 2008
@@ -79,7 +79,7 @@
/**
* @see IUnauthorizedComponentInstantiationListener#onUnauthorizedInstantiation(Component)
*/
- public final void onUnauthorizedInstantiation(final Component<?> component)
+ public final void onUnauthorizedInstantiation(final Component component)
{
// If there is a sign in page class declared, and the unauthorized
// component is a page, but it's not the sign in page
@@ -92,7 +92,7 @@
}
else
{
- onUnauthorizedPage((Page<?>)component);
+ onUnauthorizedPage((Page)component);
}
}
else
@@ -129,7 +129,7 @@
/**
* @return Subclass of sign-in page
*/
- protected abstract Class<? extends WebPage<?>> getSignInPageClass();
+ protected abstract Class<? extends WebPage> getSignInPageClass();
/**
* Called when an AUTHENTICATED user tries to navigate to a page that they are not authorized to
@@ -139,7 +139,7 @@
* @param page
* The page
*/
- protected void onUnauthorizedPage(final Page<?> page)
+ protected void onUnauthorizedPage(final Page page)
{
// The component was not a page, so throw an exception
throw new UnauthorizedInstantiationException(page.getClass());
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
*
* @author Jonathan Locke
*/
-public class SignInPage extends WebPage<Void>
+public class SignInPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
*
* @author Jonathan Locke
*/
-public class SignOutPage extends WebPage<Void>
+public class SignOutPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java Sat Jun 28 22:50:41 2008
@@ -39,7 +39,7 @@
* @author Juergen Donnerstag
* @author Eelco Hillenius
*/
-public class SignInPanel extends Panel<Void>
+public class SignInPanel extends Panel
{
private static final long serialVersionUID = 1L;
@@ -83,8 +83,7 @@
"password")));
// MarkupContainer row for remember me checkbox
- final WebMarkupContainer<?> rememberMeRow = new WebMarkupContainer<Void>(
- "rememberMeRow");
+ final WebMarkupContainer rememberMeRow = new WebMarkupContainer("rememberMeRow");
add(rememberMeRow);
// Add rememberMe checkbox
@@ -182,7 +181,7 @@
*/
public String getUsername()
{
- return username.getModelObjectAsString();
+ return username.getDefaultModelObjectAsString();
}
/**
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java Sat Jun 28 22:50:41 2008
@@ -46,7 +46,7 @@
/**
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public <T extends Component<?>> boolean isInstantiationAuthorized(final Class<T> componentClass)
+ public <T extends Component> boolean isInstantiationAuthorized(final Class<T> componentClass)
{
// We are authorized unless we are found not to be
boolean authorized = true;
@@ -77,7 +77,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(final Component<?> component, final Action action)
+ public boolean isActionAuthorized(final Component component, final Action action)
{
// Get component's class
final Class<?> componentClass = component.getClass();
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java Sat Jun 28 22:50:41 2008
@@ -31,7 +31,7 @@
* // only users with role ADMIN are allowed to create instances of this page, whether it is
* // either bookmarkable or not
* @AuthorizeInstantiation("ADMIN")
- * public class AdminAnnotationsBookmarkablePage extends WebPage<Void>
+ * public class AdminAnnotationsBookmarkablePage extends WebPage
* </pre>
*
* @see org.apache.wicket.authorization.IAuthorizationStrategy
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java Sat Jun 28 22:50:41 2008
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 1L;
/** Holds roles objects for component classes */
- private final Map<Class<? extends Component<?>>, Roles> rolesForComponentClass = new HashMap<Class<? extends Component<?>>, Roles>();
+ private final Map<Class<? extends Component>, Roles> rolesForComponentClass = new HashMap<Class<? extends Component>, Roles>();
/**
* Gives the given role permission to instantiate the given class.
@@ -49,7 +49,7 @@
* @param rolesToAdd
* The roles to add
*/
- public final <T extends Component<?>> void authorize(final Class<T> componentClass,
+ public final <T extends Component> void authorize(final Class<T> componentClass,
final Roles rolesToAdd)
{
if (componentClass == null)
@@ -80,7 +80,7 @@
* @param componentClass
* The component class
*/
- public final <T extends Component<?>> void authorizeAll(final Class<T> componentClass)
+ public final <T extends Component> void authorizeAll(final Class<T> componentClass)
{
if (componentClass == null)
{
@@ -100,7 +100,7 @@
* @return the roles that have a binding with the given component class, or null if no entries
* are found
*/
- public <T extends Component<?>> Roles authorizedRoles(final Class<T> componentClass)
+ public <T extends Component> Roles authorizedRoles(final Class<T> componentClass)
{
if (componentClass == null)
{
@@ -120,7 +120,7 @@
* @param rolesToRemove
* The role to deny
*/
- public final <T extends Component<?>> void unauthorize(final Class<T> componentClass,
+ public final <T extends Component> void unauthorize(final Class<T> componentClass,
final Roles rolesToRemove)
{
if (componentClass == null)
@@ -156,7 +156,7 @@
/**
* @return gets map with roles objects for a component classes
*/
- protected final Map<Class<? extends Component<?>>, Roles> getRolesForComponentClass()
+ protected final Map<Class<? extends Component>, Roles> getRolesForComponentClass()
{
return rolesForComponentClass;
}
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java Sat Jun 28 22:50:41 2008
@@ -85,7 +85,7 @@
* The comma separated roles that are authorized to create component instances of
* type componentClass
*/
- public static final <T extends Component<?>> void authorize(final Class<T> componentClass,
+ public static final <T extends Component> void authorize(final Class<T> componentClass,
final String roles)
{
final Application application = Application.get();
@@ -108,7 +108,7 @@
* @param roles
* The comma separated roles to authorize
*/
- public static final void authorize(final Component<?> component, final Action action,
+ public static final void authorize(final Component component, final Action action,
final String roles)
{
ActionPermissions permissions = component.getMetaData(ACTION_PERMISSIONS);
@@ -128,7 +128,7 @@
* @param componentClass
* The component class
*/
- public static final <T extends Component<?>> void authorizeAll(final Class<T> componentClass)
+ public static final <T extends Component> void authorizeAll(final Class<T> componentClass)
{
Application application = Application.get();
InstantiationPermissions authorizedRoles = application.getMetaData(INSTANTIATION_PERMISSIONS);
@@ -146,7 +146,7 @@
* @param action
* The action to authorize
*/
- public static final void authorizeAll(final Component<?> component, final Action action)
+ public static final void authorizeAll(final Component component, final Action action)
{
ActionPermissions permissions = component.getMetaData(ACTION_PERMISSIONS);
if (permissions != null)
@@ -170,7 +170,7 @@
* The comma separated list of roles that are no longer to be authorized to create
* instances of type componentClass
*/
- public static final <T extends Component<?>> void unauthorize(final Class<T> componentClass,
+ public static final <T extends Component> void unauthorize(final Class<T> componentClass,
final String roles)
{
final InstantiationPermissions permissions = Application.get().getMetaData(
@@ -196,7 +196,7 @@
* The comma separated list of roles that are no longer allowed to perform the given
* action
*/
- public static final void unauthorize(final Component<?> component, final Action action,
+ public static final void unauthorize(final Component component, final Action action,
final String roles)
{
final ActionPermissions permissions = component.getMetaData(ACTION_PERMISSIONS);
@@ -215,7 +215,7 @@
* @param componentClass
* The component class
*/
- public static final <T extends Component<?>> void unauthorizeAll(Class<T> componentClass)
+ public static final <T extends Component> void unauthorizeAll(Class<T> componentClass)
{
authorizeAll(componentClass);
authorize(componentClass, NO_ROLE);
@@ -230,7 +230,7 @@
* @param action
* the action to authorize
*/
- public static final void unauthorizeAll(final Component<?> component, final Action action)
+ public static final void unauthorizeAll(final Component component, final Action action)
{
authorizeAll(component, action);
authorize(component, action, NO_ROLE);
@@ -253,7 +253,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(final Component<?> component, final Action action)
+ public boolean isActionAuthorized(final Component component, final Action action)
{
if (component == null)
{
@@ -277,7 +277,7 @@
*
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public <T extends Component<?>> boolean isInstantiationAuthorized(final Class<T> componentClass)
+ public <T extends Component> boolean isInstantiationAuthorized(final Class<T> componentClass)
{
if (componentClass == null)
{
@@ -309,7 +309,7 @@
* @return the roles that are authorized for creation of the componentClass, or null if no
* specific authorization was configured
*/
- private static <T extends Component<?>> Roles rolesAuthorizedToInstantiate(
+ private static <T extends Component> Roles rolesAuthorizedToInstantiate(
final Class<T> componentClass)
{
final InstantiationPermissions permissions = Application.get().getMetaData(
@@ -330,7 +330,7 @@
* the action
* @return the roles for the action as defined with the given component
*/
- private static Roles rolesAuthorizedToPerformAction(final Component<?> component,
+ private static Roles rolesAuthorizedToPerformAction(final Component component,
final Action action)
{
final ActionPermissions permissions = component.getMetaData(ACTION_PERMISSIONS);
Modified: wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java (original)
+++ wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
* @author Eelco Hillenius
*/
@AuthorizeInstantiation("ADMIN")
-public class AdminPage extends WebPage<Void>
+public class AdminPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java (original)
+++ wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java Sat Jun 28 22:50:41 2008
@@ -81,7 +81,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return new NormalPage();
}
@@ -101,7 +101,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return new AdminPage();
}
@@ -121,7 +121,7 @@
{
private boolean eventReceived = false;
- public void onUnauthorizedInstantiation(Component<?> component)
+ public void onUnauthorizedInstantiation(Component component)
{
eventReceived = true;
}
@@ -137,7 +137,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return new AdminPage();
}
Modified: wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java (original)
+++ wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public class NormalPage extends WebPage<Void>
+public class NormalPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java (original)
+++ wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java Sat Jun 28 22:50:41 2008
@@ -92,7 +92,7 @@
{
WicketTester tester = new WicketTester();
tester.setupRequestAndResponse();
- Label<String> label = new Label<String>("label", "text");
+ Label label = new Label("label", "text");
Action mambo = new Action("mambo");
MetaDataRoleAuthorizationStrategy strategy = new MetaDataRoleAuthorizationStrategy(
new IRoleCheckingStrategy()
@@ -119,7 +119,7 @@
{
WicketTester tester = new WicketTester();
tester.setupRequestAndResponse();
- Label<String> label = new Label<String>("label", "text");
+ Label label = new Label("label", "text");
Action mambo = new Action("mambo");
MetaDataRoleAuthorizationStrategy strategy = new MetaDataRoleAuthorizationStrategy(
new IRoleCheckingStrategy()
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java Sat Jun 28 22:50:41 2008
@@ -44,11 +44,8 @@
*
* @author eelcohillenius
*/
-public abstract class DateConverter implements IConverter
+public abstract class DateConverter implements IConverter<Date>
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
/**
@@ -84,7 +81,7 @@
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
* java.util.Locale)
*/
- public Object convertToObject(String value, Locale locale)
+ public Date convertToObject(String value, Locale locale)
{
if (Strings.isEmpty(value))
{
@@ -144,9 +141,9 @@
* @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
* java.util.Locale)
*/
- public String convertToString(Object value, Locale locale)
+ public String convertToString(Date value, Locale locale)
{
- DateTime dt = new DateTime(((Date)value).getTime(), getTimeZone());
+ DateTime dt = new DateTime((value).getTime(), getTimeZone());
DateTimeFormatter format = getFormat();
if (applyTimeZoneDifference)
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java Sat Jun 28 22:50:41 2008
@@ -17,6 +17,7 @@
package org.apache.wicket.datetime.markup.html.basic;
import java.text.SimpleDateFormat;
+import java.util.Date;
import org.apache.wicket.datetime.DateConverter;
import org.apache.wicket.datetime.PatternDateConverter;
@@ -66,7 +67,7 @@
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public static DateLabel forDatePattern(String id, IModel model, String datePattern)
+ public static DateLabel forDatePattern(String id, IModel<Date> model, String datePattern)
{
return new DateLabel(id, model, new PatternDateConverter(datePattern, true));
}
@@ -101,7 +102,7 @@
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public static DateLabel forDateStyle(String id, IModel model, String dateStyle)
+ public static DateLabel forDateStyle(String id, IModel<Date> model, String dateStyle)
{
return new DateLabel(id, model, new StyleDateConverter(dateStyle, true));
}
@@ -146,7 +147,7 @@
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public static DateLabel forShortStyle(String id, IModel model)
+ public static DateLabel forShortStyle(String id, IModel<Date> model)
{
return new DateLabel(id, model, new StyleDateConverter(true));
}
@@ -178,7 +179,7 @@
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public static DateLabel withConverter(String id, IModel model, DateConverter converter)
+ public static DateLabel withConverter(String id, IModel<Date> model, DateConverter converter)
{
return new DateLabel(id, model, converter);
}
@@ -217,7 +218,7 @@
* @param converter
* The converter to use
*/
- public DateLabel(String id, IModel model, DateConverter converter)
+ public DateLabel(String id, IModel<Date> model, DateConverter converter)
{
super(id, model);
if (converter == null)
@@ -247,6 +248,7 @@
/**
* Returns the specialized converter.
*/
+ @SuppressWarnings("unchecked")
@Override
public IConverter getConverter(Class clazz)
{
@@ -274,7 +276,7 @@
@Override
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- String s = getModelObjectAsString();
+ String s = getDefaultModelObjectAsString();
if (before != null)
{
s = before + s;
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java Sat Jun 28 22:50:41 2008
@@ -50,7 +50,7 @@
*
* @author eelcohillenius
*/
-public class DateTextField extends TextField implements ITextFormatProvider
+public class DateTextField extends TextField<Date> implements ITextFormatProvider
{
private static final long serialVersionUID = 1L;
@@ -68,7 +68,7 @@
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public static DateTextField forDatePattern(String id, IModel model, String datePattern)
+ public static DateTextField forDatePattern(String id, IModel<Date> model, String datePattern)
{
return new DateTextField(id, model, new PatternDateConverter(datePattern, true));
}
@@ -104,7 +104,7 @@
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public static DateTextField forDateStyle(String id, IModel model, String dateStyle)
+ public static DateTextField forDateStyle(String id, IModel<Date> model, String dateStyle)
{
return new DateTextField(id, model, new StyleDateConverter(dateStyle, true));
}
@@ -150,7 +150,7 @@
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public static DateTextField forShortStyle(String id, IModel model)
+ public static DateTextField forShortStyle(String id, IModel<Date> model)
{
return new DateTextField(id, model, new StyleDateConverter(true));
}
@@ -182,7 +182,7 @@
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public static DateTextField withConverter(String id, IModel model, DateConverter converter)
+ public static DateTextField withConverter(String id, IModel<Date> model, DateConverter converter)
{
return new DateTextField(id, model, converter);
}
@@ -202,7 +202,7 @@
* @param converter
* The converter to use
*/
- public DateTextField(String id, IModel model, DateConverter converter)
+ public DateTextField(String id, IModel<Date> model, DateConverter converter)
{
super(id, model, Date.class);
if (converter == null)
@@ -217,6 +217,7 @@
* @return The specialized converter.
* @see org.apache.wicket.Component#getConverter(java.lang.Class)
*/
+ @SuppressWarnings("unchecked")
@Override
public final IConverter getConverter(Class clazz)
{
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java Sat Jun 28 22:50:41 2008
@@ -106,15 +106,13 @@
contributeDependencies();
}
- add(new StringHeaderContributor(new LoadableDetachableModel()
+ add(new StringHeaderContributor(new LoadableDetachableModel<CharSequence>()
{
-
private static final long serialVersionUID = 1L;
@Override
- protected Object load()
+ protected CharSequence load()
{
-
// not pretty to look at, but cheaper than using a template
String markupId = AbstractCalendar.this.getMarkupId();
String javascriptId = getJavascriptId();
@@ -138,9 +136,9 @@
Properties p = new Properties();
configureWidgetProperties(p);
b.append("\", { ");
- for (Iterator i = p.entrySet().iterator(); i.hasNext();)
+ for (Iterator<Entry<Object, Object>> i = p.entrySet().iterator(); i.hasNext();)
{
- Entry entry = (Entry)i.next();
+ Entry<Object, Object> entry = i.next();
b.append(entry.getKey());
Object value = entry.getValue();
if (value instanceof CharSequence)
@@ -264,7 +262,7 @@
* @param widgetProperties
* the current widget properties
*/
- protected void configureWidgetProperties(Map widgetProperties)
+ protected void configureWidgetProperties(Map<Object, Object> widgetProperties)
{
}
}
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java Sat Jun 28 22:50:41 2008
@@ -55,7 +55,7 @@
*
* @author eelcohillenius
*/
-public class DateField extends FormComponentPanel
+public class DateField extends FormComponentPanel<Date>
{
private static final long serialVersionUID = 1L;
@@ -79,11 +79,11 @@
* @param id
* @param model
*/
- public DateField(String id, IModel model)
+ public DateField(String id, IModel<Date> model)
{
super(id, model);
setType(Date.class);
- PropertyModel dateFieldModel = new PropertyModel(this, "date");
+ PropertyModel<Date> dateFieldModel = new PropertyModel<Date>(this, "date");
add(dateField = newDateTextField("date", dateFieldModel));
dateField.add(new DatePicker());
}
@@ -118,7 +118,7 @@
public void setDate(Date date)
{
this.date = (date != null) ? new MutableDateTime(date) : null;
- setModelObject(date);
+ setDefaultModelObject(date);
}
/**
@@ -176,7 +176,7 @@
dateField.setRequired(isRequired());
dateField.setEnabled(isEnabled() && isEnableAllowed());
- Date d = (Date)getModelObject();
+ Date d = (Date)getDefaultModelObject();
if (d != null)
{
date = new MutableDateTime(d);
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Sat Jun 28 22:50:41 2008
@@ -128,7 +128,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#bind(org.apache.wicket.Component)
*/
@Override
- public void bind(Component<?> component) {
+ public void bind(Component component) {
this.component = component;
checkComponentProvidesDateFormat(component);
component.setOutputMarkupId(true);
@@ -138,7 +138,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
@Override
- public void onRendered(Component<?> component) {
+ public void onRendered(Component component) {
super.onRendered(component);
// Append the span and img icon right after the rendering of the
// component. Not as pretty as working with a panel etc, but works
@@ -283,7 +283,7 @@
* @throws UnableToDetermineFormatException
* if this date picker is unable to determine a format.
*/
- private final void checkComponentProvidesDateFormat(Component<?> component) {
+ private final void checkComponentProvidesDateFormat(Component component) {
if (getDatePattern() == null) {
throw new UnableToDetermineFormatException();
}
@@ -352,7 +352,7 @@
// localize date fields
localize(widgetProperties);
- Object modelObject = component.getModelObject();
+ Object modelObject = component.getDefaultModelObject();
// null and cast check
if (modelObject instanceof Date) {
Date date = (Date) modelObject;
@@ -629,7 +629,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#isEnabled(org.apache.wicket.Component)
*/
@Override
- public boolean isEnabled(Component<?> component) {
+ public boolean isEnabled(Component component) {
return component.isEnabled() && component.isEnableAllowed();
}
}
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java Sat Jun 28 22:50:41 2008
@@ -52,7 +52,7 @@
* @author eelcohillenius
* @see DateField for a variant with just the date field and date picker
*/
-public class DateTimeField extends FormComponentPanel
+public class DateTimeField extends FormComponentPanel<Date>
{
/**
* Enumerated type for different ways of handling the render part of requests.
@@ -77,13 +77,13 @@
}
}
- private static final IConverter MINUTES_CONVERTER = new ZeroPaddingIntegerConverter(2);
+ private static final IConverter<Integer> MINUTES_CONVERTER = new ZeroPaddingIntegerConverter(2);
private static final long serialVersionUID = 1L;
private AM_PM amOrPm = AM_PM.AM;
- private DropDownChoice amOrPmChoice;
+ private DropDownChoice<AM_PM> amOrPmChoice;
private MutableDateTime date;
@@ -91,11 +91,11 @@
private Integer hours;
- private TextField hoursField;
+ private TextField<Integer> hoursField;
private Integer minutes;
- private TextField minutesField;
+ private TextField<Integer> minutesField;
/**
* Construct.
@@ -113,39 +113,43 @@
* @param id
* @param model
*/
- public DateTimeField(String id, IModel model)
+ public DateTimeField(String id, IModel<Date> model)
{
super(id, model);
setType(Date.class);
- PropertyModel dateFieldModel = new PropertyModel(this, "date");
+ PropertyModel<Date> dateFieldModel = new PropertyModel<Date>(this, "date");
add(dateField = newDateTextField("date", dateFieldModel));
dateField.add(new DatePicker()
{
private static final long serialVersionUID = 1L;
- protected void configure(Map widgetProperties)
+ @Override
+ protected void configure(Map<String, Object> widgetProperties)
{
super.configure(widgetProperties);
DateTimeField.this.configure(widgetProperties);
}
});
- add(hoursField = new TextField("hours", new PropertyModel(this, "hours"), Integer.class));
+ add(hoursField = new TextField<Integer>("hours", new PropertyModel<Integer>(this, "hours"),
+ Integer.class));
hoursField.add(new HoursValidator());
- hoursField.setLabel(new Model("hours"));
- add(minutesField = new TextField("minutes", new PropertyModel(this, "minutes"),
- Integer.class)
+ hoursField.setLabel(new Model<String>("hours"));
+ add(minutesField = new TextField<Integer>("minutes", new PropertyModel<Integer>(this,
+ "minutes"), Integer.class)
{
private static final long serialVersionUID = 1L;
+ @SuppressWarnings("unchecked")
+ @Override
public IConverter getConverter(Class type)
{
return MINUTES_CONVERTER;
}
});
minutesField.add(NumberValidator.range(0, 59));
- minutesField.setLabel(new Model("minutes"));
- add(amOrPmChoice = new DropDownChoice("amOrPmChoice", new PropertyModel(this, "amOrPm"),
- Arrays.asList(AM_PM.values())));
+ minutesField.setLabel(new Model<String>("minutes"));
+ add(amOrPmChoice = new DropDownChoice<AM_PM>("amOrPmChoice", new PropertyModel<AM_PM>(this,
+ "amOrPm"), Arrays.asList(AM_PM.values())));
}
/**
@@ -186,6 +190,7 @@
/**
* @see org.apache.wicket.markup.html.form.FormComponent#getInput()
*/
+ @Override
public String getInput()
{
// since we override convertInput, we can let this method return a value
@@ -223,7 +228,7 @@
public void setDate(Date date)
{
this.date = (date != null) ? new MutableDateTime(date) : null;
- setModelObject(date);
+ setDefaultModelObject(date);
}
/**
@@ -276,6 +281,7 @@
*
* @see org.apache.wicket.markup.html.form.FormComponent#convertInput()
*/
+ @Override
protected void convertInput()
{
Object dateFieldInput = dateField.getConvertedInput();
@@ -284,7 +290,7 @@
MutableDateTime date = new MutableDateTime(dateFieldInput);
Integer hours = (Integer)hoursField.getConvertedInput();
Integer minutes = (Integer)minutesField.getConvertedInput();
- AM_PM amOrPm = (AM_PM)amOrPmChoice.getConvertedInput();
+ AM_PM amOrPm = amOrPmChoice.getConvertedInput();
try
{
@@ -326,6 +332,7 @@
* @deprecated replaced by {@link #newDateTextField(String, PropertyModel)}
*/
// TODO remove after deprecation release
+ @Deprecated
protected final DateTextField newDateTextField(PropertyModel dateFieldModel)
{
throw new UnsupportedOperationException();
@@ -346,6 +353,7 @@
/**
* @see org.apache.wicket.Component#onBeforeRender()
*/
+ @Override
protected void onBeforeRender()
{
dateField.setRequired(isRequired());
@@ -360,7 +368,7 @@
boolean use12HourFormat = use12HourFormat();
amOrPmChoice.setVisible(use12HourFormat);
- Date d = (Date)getModelObject();
+ Date d = (Date)getDefaultModelObject();
if (d != null)
{
date = new MutableDateTime(d);
@@ -449,6 +457,7 @@
/**
* @see org.apache.wicket.validation.validator.AbstractValidator#onValidate(org.apache.wicket.validation.IValidatable)
*/
+ @Override
protected void onValidate(IValidatable validatable)
{
Number value = (Number)validatable.getValue();
@@ -461,6 +470,7 @@
/**
* @see org.apache.wicket.validation.validator.AbstractValidator#variablesMap(org.apache.wicket.validation.IValidatable)
*/
+ @Override
protected Map variablesMap(IValidatable validatable)
{
final Map map = super.variablesMap(validatable);
@@ -472,6 +482,7 @@
/**
* @see org.apache.wicket.validation.validator.AbstractValidator#resourceKey()
*/
+ @Override
protected String resourceKey()
{
return "NumberValidator.range";
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java Sat Jun 28 22:50:41 2008
@@ -33,7 +33,7 @@
*
* @author Eelco Hillenius
*/
-public final class WicketExampleHeader extends Panel<Void>
+public final class WicketExampleHeader extends Panel
{
/**
* Construct.
@@ -45,10 +45,10 @@
* @param page
* The example page
*/
- public WicketExampleHeader(String id, String exampleTitle, WebPage<?> page)
+ public WicketExampleHeader(String id, String exampleTitle, WebPage page)
{
super(id);
- WebMarkupContainer<?> hideInPortlet = new WebMarkupContainer<Void>("hideInPortlet")
+ WebMarkupContainer hideInPortlet = new WebMarkupContainer("hideInPortlet")
{
/**
* @see org.apache.wicket.Component#isVisible()
@@ -61,14 +61,14 @@
};
add(hideInPortlet);
hideInPortlet.add(new InspectorBug("inspector", page));
- add(new Label<String>("exampleTitle", exampleTitle));
- Link<?> link = new Link<Void>("sources")
+ add(new Label("exampleTitle", exampleTitle));
+ Link link = new Link("sources")
{
@SuppressWarnings("unchecked")
@Override
public void onClick()
{
- setResponsePage(new SourcesPage((Class<? extends Page<?>>)getPage().getClass()));
+ setResponsePage(new SourcesPage((Class<? extends Page>)getPage().getClass()));
}
};
add(link);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
* @author Jonathan Locke
* @param <T>
*/
-public class WicketExamplePage<T> extends WebPage<T>
+public class WicketExamplePage extends WebPage
{
/**
* Constructor
@@ -41,7 +41,7 @@
*
* @param model
*/
- public WicketExamplePage(IModel<T> model)
+ public WicketExamplePage(IModel<?> model)
{
super(model);
final String packageName = getClass().getPackage().getName();
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java Sat Jun 28 22:50:41 2008
@@ -73,7 +73,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java Sat Jun 28 22:50:41 2008
@@ -82,7 +82,7 @@
};
form.add(field);
- final Label label = new Label("selectedValue", field.getModel());
+ final Label label = new Label("selectedValue", field.getDefaultModel());
label.setOutputMarkupId(true);
form.add(label);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java Sat Jun 28 22:50:41 2008
@@ -23,7 +23,7 @@
/**
* Base page for ajax example
*/
-public class BasePage<T> extends WicketExamplePage<T>
+public class BasePage extends WicketExamplePage
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java Sat Jun 28 22:50:41 2008
@@ -38,7 +38,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class ChoicePage extends BasePage<Void>
+public class ChoicePage extends BasePage
{
private String selectedMake;
@@ -99,7 +99,7 @@
};
- Form<?> form = new Form<Void>("form");
+ Form<?> form = new Form("form");
add(form);
final DropDownChoice<String> makes = new DropDownChoice<String>("makes",
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Clock.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Clock.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Clock.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Clock.java Sat Jun 28 22:50:41 2008
@@ -29,7 +29,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class Clock extends Label<String>
+public class Clock extends Label
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java Sat Jun 28 22:50:41 2008
@@ -33,7 +33,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class EditableLabelPage extends BasePage<EditableLabelPage>
+public class EditableLabelPage extends BasePage
{
/** available sites for the multiple select. */
private static final List<String> SITES = Arrays.asList(new String[] { "The Server Side",
@@ -49,13 +49,13 @@
*/
public EditableLabelPage()
{
- setModel(new CompoundPropertyModel<EditableLabelPage>(this));
- add(new AjaxEditableLabel<String>("text1"));
- add(new AjaxEditableLabel<String>("text2"));
- add(new AjaxEditableMultiLineLabel<String>("text3"));
- add(new AjaxEditableChoiceLabel<String>("site", SITES));
+ setDefaultModel(new CompoundPropertyModel<EditableLabelPage>(this));
+ add(new AjaxEditableLabel("text1"));
+ add(new AjaxEditableLabel("text2"));
+ add(new AjaxEditableMultiLineLabel("text3"));
+ add(new AjaxEditableChoiceLabel("site", SITES));
- add(new Label<String>("refresh-counter", new AbstractReadOnlyModel<String>()
+ add(new Label("refresh-counter", new AbstractReadOnlyModel<String>()
{
@Override
public String getObject()
@@ -64,7 +64,7 @@
}
}));
- add(new Link<Void>("refresh-link")
+ add(new Link("refresh-link")
{
@Override
public void onClick()
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
/**
* Demonstrates ajax effects
*/
-public class EffectsPage extends BasePage<Void>
+public class EffectsPage extends BasePage
{
private int counter1 = 0;
private int counter2 = 0;
@@ -69,17 +69,15 @@
*/
public EffectsPage()
{
- final Label<Integer> c1 = new Label<Integer>("c1", new PropertyModel<Integer>(this,
- "counter1"));
+ final Label c1 = new Label("c1", new PropertyModel<Integer>(this, "counter1"));
c1.setOutputMarkupId(true);
add(c1);
- final Label<Integer> c2 = new Label<Integer>("c2", new PropertyModel<Integer>(this,
- "counter2"));
+ final Label c2 = new Label("c2", new PropertyModel<Integer>(this, "counter2"));
c2.setOutputMarkupId(true);
add(c2);
- add(new AjaxLink<Void>("c1-link")
+ add(new AjaxLink("c1-link")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -90,7 +88,7 @@
}
});
- add(new AjaxFallbackLink<Void>("c2-link")
+ add(new AjaxFallbackLink("c2-link")
{
@Override
public void onClick(AjaxRequestTarget target)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java Sat Jun 28 22:50:41 2008
@@ -37,7 +37,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class FormPage extends BasePage<Void>
+public class FormPage extends BasePage
{
private final Bean bean = new Bean();
@@ -56,7 +56,7 @@
add(form);
form.setOutputMarkupId(true);
- FormComponent<?> fc;
+ FormComponent fc;
// add form components to the form as usual
@@ -80,7 +80,7 @@
AjaxFormValidatingBehavior.addToAllFormComponents(form, "onkeyup", Duration.ONE_SECOND);
// add a button that can be used to submit the form via ajax
- form.add(new AjaxButton<Void>("ajax-button", form)
+ form.add(new AjaxButton("ajax-button", form)
{
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java Sat Jun 28 22:50:41 2008
@@ -43,7 +43,7 @@
*
* @author Martijn Dashorst
*/
-public class GuestBook extends BasePage<Void>
+public class GuestBook extends BasePage
{
/** A global list of all comments from all users across all sessions */
public static final List<Comment> commentList = new ArrayList<Comment>();
@@ -51,10 +51,10 @@
/** The list view that shows comments */
private final ListView<Comment> commentListView;
/** Container for the comments, used to update the listview. */
- private final WebMarkupContainer<?> comments;
+ private final WebMarkupContainer comments;
/** The textarea for entering the comments, is updated in the ajax call. */
- private Component<String> text;
+ private Component text;
/**
* Constructor.
@@ -66,7 +66,7 @@
add(commentForm);
// the WebMarkupContainer is used to update the listview in an ajax call
- comments = new WebMarkupContainer<Void>("comments");
+ comments = new WebMarkupContainer("comments");
add(comments.setOutputMarkupId(true));
// Add commentListView of existing comments
@@ -77,8 +77,8 @@
public void populateItem(final ListItem<Comment> listItem)
{
final Comment comment = listItem.getModelObject();
- listItem.add(new Label<Date>("date", new Model<Date>(comment.getDate())));
- listItem.add(new MultiLineLabel<String>("text", comment.getText()));
+ listItem.add(new Label("date", new Model<Date>(comment.getDate())));
+ listItem.add(new MultiLineLabel("text", comment.getText()));
}
});
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class Index extends BasePage<Void>
+public class Index extends BasePage
{
/**
* Constructor.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java Sat Jun 28 22:50:41 2008
@@ -31,7 +31,7 @@
*
* @author ivaynberg
*/
-public class LinksPage extends BasePage<Void>
+public class LinksPage extends BasePage
{
private int counter1 = 0;
private int counter2 = 0;
@@ -66,22 +66,19 @@
*/
public LinksPage()
{
- final Label<Integer> c1 = new Label<Integer>("c1", new PropertyModel<Integer>(this,
- "counter1"));
+ final Label c1 = new Label("c1", new PropertyModel<Integer>(this, "counter1"));
c1.setOutputMarkupId(true);
add(c1);
- final Label<Integer> c2 = new Label<Integer>("c2", new PropertyModel<Integer>(this,
- "counter2"));
+ final Label c2 = new Label("c2", new PropertyModel<Integer>(this, "counter2"));
c2.setOutputMarkupId(true);
add(c2);
- final Label<Integer> c3 = new Label<Integer>("c3", new PropertyModel<Integer>(this,
- "counter3"));
+ final Label c3 = new Label("c3", new PropertyModel<Integer>(this, "counter3"));
c3.setOutputMarkupId(true);
add(c3);
- add(new AjaxLink<Void>("c1-link")
+ add(new AjaxLink("c1-link")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -91,7 +88,7 @@
}
});
- add(new AjaxFallbackLink<Void>("c2-link")
+ add(new AjaxFallbackLink("c2-link")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -108,7 +105,7 @@
}
});
- add(new IndicatingAjaxLink<Void>("c3-link")
+ add(new IndicatingAjaxLink("c3-link")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -127,7 +124,7 @@
}
});
- add(new AjaxLink<Void>("success-link")
+ add(new AjaxLink("success-link")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -160,7 +157,7 @@
};
});
- add(new AjaxLink<Void>("failure-link")
+ add(new AjaxLink("failure-link")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -194,7 +191,7 @@
};
});
- add(new AjaxLink<Void>("set-response-page")
+ add(new AjaxLink("set-response-page")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -203,7 +200,7 @@
}
});
- add(new AjaxLink<Void>("exception")
+ add(new AjaxLink("exception")
{
@Override
public void onClick(AjaxRequestTarget target)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java Sat Jun 28 22:50:41 2008
@@ -78,7 +78,7 @@
@Override
protected void onUpdate(AjaxRequestTarget target)
{
- label.setModelObject(getValue(field.getModelObjectAsString()));
+ label.setDefaultModelObject(getValue(field.getDefaultModelObjectAsString()));
target.addComponent(label);
}
};
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.java Sat Jun 28 22:50:41 2008
@@ -56,7 +56,7 @@
{
protected void populateItem(ListItem item)
{
- item.add(new Label("name", item.getModelObjectAsString()));
+ item.add(new Label("name", item.getDefaultModelObjectAsString()));
}
};
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java Sat Jun 28 22:50:41 2008
@@ -74,7 +74,7 @@
*/
public void onClick()
{
- RatingModel rating = (RatingModel)getModelObject();
+ RatingModel rating = (RatingModel)getDefaultModelObject();
rating.nrOfVotes = 0;
rating.rating = 0;
rating.sumOfRatings = 0;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java Sat Jun 28 22:50:41 2008
@@ -31,7 +31,7 @@
*
* @author ivaynberg
*/
-public class TabbedPanelPage extends BasePage<Void>
+public class TabbedPanelPage extends BasePage
{
/**
* Constructor
@@ -43,7 +43,7 @@
tabs.add(new AbstractTab(new Model<String>("first tab"))
{
@Override
- public Panel<Void> getPanel(String panelId)
+ public Panel getPanel(String panelId)
{
return new TabPanel1(panelId);
}
@@ -52,7 +52,7 @@
tabs.add(new AbstractTab(new Model<String>("second tab"))
{
@Override
- public Panel<Void> getPanel(String panelId)
+ public Panel getPanel(String panelId)
{
return new TabPanel2(panelId);
}
@@ -61,7 +61,7 @@
tabs.add(new AbstractTab(new Model<String>("third tab"))
{
@Override
- public Panel<Void> getPanel(String panelId)
+ public Panel getPanel(String panelId)
{
return new TabPanel3(panelId);
}
@@ -73,7 +73,7 @@
/**
* Panel representing the content panel for the first tab.
*/
- private static class TabPanel1 extends Panel<Void>
+ private static class TabPanel1 extends Panel
{
/**
* Constructor
@@ -90,7 +90,7 @@
/**
* Panel representing the content panel for the second tab.
*/
- private static class TabPanel2 extends Panel<Void>
+ private static class TabPanel2 extends Panel
{
/**
* Constructor
@@ -107,7 +107,7 @@
/**
* Panel representing the content panel for the third tab.
*/
- private static class TabPanel3 extends Panel<Void>
+ private static class TabPanel3 extends Panel
{
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java Sat Jun 28 22:50:41 2008
@@ -38,7 +38,7 @@
*
* @author Martijn Dashorst
*/
-public class TodoList extends BasePage<Void>
+public class TodoList extends BasePage
{
/**
* The todo object.
@@ -113,7 +113,7 @@
/**
* Container for displaying the todo items in a list.
*/
- public class TodoItemsContainer extends WebMarkupContainer<Void>
+ public class TodoItemsContainer extends WebMarkupContainer
{
/**
* Constructor.
@@ -136,8 +136,8 @@
protected void populateItem(ListItem<TodoItem> item)
{
// add an AJAX checkbox to the item
- item.add(new AjaxCheckBox("check", new PropertyModel<Boolean>(item.getModel(),
- "checked"))
+ item.add(new AjaxCheckBox("check", new PropertyModel<Boolean>(
+ item.getDefaultModel(), "checked"))
{
@Override
protected void onUpdate(AjaxRequestTarget target)
@@ -149,7 +149,7 @@
}
});
// display the text of the todo item
- item.add(new Label<String>("text", new PropertyModel<String>(item.getModel(),
+ item.add(new Label("text", new PropertyModel<String>(item.getDefaultModel(),
"text")));
}
});
@@ -159,13 +159,13 @@
/**
* Container for showing either the add link, or the addition form.
*/
- public class AddItemsContainer extends WebMarkupContainer<Void>
+ public class AddItemsContainer extends WebMarkupContainer
{
/** Visibility toggle so that either the link or the form is visible. */
private boolean linkVisible = true;
/** Link for displaying the AddTodo form. */
- private final class AddTodoLink extends AjaxFallbackLink<Void>
+ private final class AddTodoLink extends AjaxFallbackLink
{
/** Constructor. */
private AddTodoLink(String id)
@@ -201,7 +201,7 @@
* Link for removing all completed todos from the list, this link follows the same
* visibility rules as the add link.
*/
- private final class RemoveCompletedTodosLink extends AjaxFallbackLink<Void>
+ private final class RemoveCompletedTodosLink extends AjaxFallbackLink
{
/**
* Constructor.
@@ -253,20 +253,20 @@
super(id, new CompoundPropertyModel<TodoItem>(new TodoItem()));
setOutputMarkupId(true);
add(new TextField<String>("text"));
- add(new AjaxButton<Void>("add", this)
+ add(new AjaxButton("add", this)
{
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
// retrieve the todo item
- TodoItem item = (TodoItem)getParent().getModelObject();
+ TodoItem item = (TodoItem)getParent().getDefaultModelObject();
// add the item
onAdd(item, target);
}
});
- add(new AjaxButton<Void>("cancel", this)
+ add(new AjaxButton("cancel", this)
{
@Override
public void onSubmit(AjaxRequestTarget target, Form<?> form)
@@ -386,7 +386,7 @@
/**
* Container for redrawing the todo items list with an AJAX call.
*/
- private final WebMarkupContainer<?> showItems;
+ private final WebMarkupContainer showItems;
/**
* The list of todo items.
@@ -402,7 +402,7 @@
showItems = new TodoItemsContainer("showItems");
add(showItems);
- add(new AjaxFallbackLink<Void>("ajaxback")
+ add(new AjaxFallbackLink("ajaxback")
{
/**
* @see org.apache.wicket.ajax.markup.html.AjaxFallbackLink#onClick(org.apache.wicket.ajax.AjaxRequestTarget)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java Sat Jun 28 22:50:41 2008
@@ -28,7 +28,7 @@
* @author Matej Knopp
*
*/
-public class ModalContent1Page extends WebPage<Void>
+public class ModalContent1Page extends WebPage
{
/**
@@ -38,7 +38,7 @@
*/
public ModalContent1Page(final ModalWindowPage modalWindowPage, final ModalWindow window)
{
- add(new AjaxLink<Void>("closeOK")
+ add(new AjaxLink("closeOK")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -49,7 +49,7 @@
}
});
- add(new AjaxLink<Void>("closeCancel")
+ add(new AjaxLink("closeCancel")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -78,7 +78,7 @@
modal.setPageCreator(new ModalWindow.PageCreator()
{
- public Page<?> createPage()
+ public Page createPage()
{
return new ModalContent2Page(modal);
}
@@ -94,7 +94,7 @@
}
});
- add(new AjaxLink<Void>("open")
+ add(new AjaxLink("open")
{
@Override
public void onClick(AjaxRequestTarget target)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent2Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent2Page.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent2Page.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent2Page.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
* @author Matej Knopp
*
*/
-public class ModalContent2Page extends WebPage<Void>
+public class ModalContent2Page extends WebPage
{
/**
@@ -34,7 +34,7 @@
*/
public ModalContent2Page(final ModalWindow window)
{
- add(new AjaxLink<Void>("close")
+ add(new AjaxLink("close")
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java Sat Jun 28 22:50:41 2008
@@ -28,15 +28,15 @@
/**
* @author Matej Knopp
*/
-public class ModalWindowPage extends BasePage<Void>
+public class ModalWindowPage extends BasePage
{
/**
*/
public ModalWindowPage()
{
- final Label<String> result;
- add(result = new Label<String>("result", new PropertyModel<String>(this, "result")));
+ final Label result;
+ add(result = new Label("result", new PropertyModel<String>(this, "result")));
result.setOutputMarkupId(true);
/*
@@ -51,7 +51,7 @@
modal1.setPageCreator(new ModalWindow.PageCreator()
{
- public Page<?> createPage()
+ public Page createPage()
{
return new ModalContent1Page(ModalWindowPage.this, modal1);
}
@@ -72,7 +72,7 @@
}
});
- add(new AjaxLink<Void>("showModal1")
+ add(new AjaxLink("showModal1")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -109,7 +109,7 @@
}
});
- add(new AjaxLink<Void>("showModal2")
+ add(new AjaxLink("showModal2")
{
@Override
public void onClick(AjaxRequestTarget target)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java Sat Jun 28 22:50:41 2008
@@ -35,7 +35,7 @@
*
* @author Matej Knopp
*/
-public abstract class BaseTreePage extends BasePage<Void>
+public abstract class BaseTreePage extends BasePage
{
/**
@@ -43,7 +43,7 @@
*/
public BaseTreePage()
{
- add(new AjaxLink<Void>("expandAll")
+ add(new AjaxLink("expandAll")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -53,7 +53,7 @@
}
});
- add(new AjaxLink<Void>("collapseAll")
+ add(new AjaxLink("collapseAll")
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -63,7 +63,7 @@
}
});
- add(new AjaxLink<Void>("switchRootless")
+ add(new AjaxLink("switchRootless")
{
@Override
public void onClick(AjaxRequestTarget target)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java Sat Jun 28 22:50:41 2008
@@ -33,7 +33,7 @@
*
* @author ivaynberg
*/
-public class Index extends WicketExamplePage<Void>
+public class Index extends WicketExamplePage
{
/** Click count. */
private int count = 0;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java Sat Jun 28 22:50:41 2008
@@ -49,7 +49,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/BasePage.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* @author almaw
*/
-public class BasePage<T> extends WicketExamplePage<T>
+public class BasePage extends WicketExamplePage
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/HomePage.java Sat Jun 28 22:50:41 2008
@@ -22,6 +22,6 @@
*
* @author Jonathan Locke
*/
-public class HomePage extends BasePage<Void>
+public class HomePage extends BasePage
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MyAuthenticatedWebApplication.java Sat Jun 28 22:50:41 2008
@@ -36,7 +36,7 @@
}
@Override
- protected Class< ? extends WebPage< ? >> getSignInPageClass()
+ protected Class< ? extends WebPage> getSignInPageClass()
{
return MySignInPage.class;
}
@@ -45,7 +45,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return HomePage.class;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* @author almaw
*/
-public class BasePage<T> extends WicketExamplePage<T>
+public class BasePage extends WicketExamplePage
{
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java Sat Jun 28 22:50:41 2008
@@ -36,21 +36,21 @@
*
* @author Eelco Hillenius
*/
-public class Index extends BasePage<Void>
+public class Index extends BasePage
{
/**
* Construct.
*/
public Index()
{
- add(new Label<User>("currentUser", new PropertyModel<User>(this, "session.user")));
+ add(new Label("currentUser", new PropertyModel<User>(this, "session.user")));
add(new ListView<User>("users", RolesApplication.USERS)
{
@Override
protected void populateItem(ListItem<User> item)
{
final User user = item.getModelObject();
- item.add(new Link<Void>("selectUserLink")
+ item.add(new Link("selectUserLink")
{
@Override
public void onClick()
@@ -58,13 +58,13 @@
RolesSession session = (RolesSession)Session.get();
session.setUser(user);
}
- }.add(new Label<User>("userId", new Model<User>(user))));
+ }.add(new Label("userId", new Model<User>(user))));
}
});
// pages that are protected using wicket meta data
add(new BookmarkablePageLink("adminBookmarkableLink", AdminBookmarkablePage.class));
- add(new Link<Void>("adminInternalLink")
+ add(new Link("adminInternalLink")
{
@Override
public void onClick()
@@ -77,7 +77,7 @@
// pages that are protected using annotations
add(new BookmarkablePageLink("adminAnnotBookmarkableLink",
AdminAnnotationsBookmarkablePage.class));
- add(new Link<Void>("adminAnnotInternalLink")
+ add(new Link("adminAnnotInternalLink")
{
@Override
public void onClick()
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java Sat Jun 28 22:50:41 2008
@@ -55,7 +55,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Index.class;
}