Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

wicket 1.4.0 updates

  • Loading branch information...
commit 7dbfb97af41bb48aca6c2c16154e5b3bb40db932 1 parent a98b8be
@n8han authored
View
4 ...der-auth-components-ao/src/main/java/net/databinder/auth/components/ao/UserAdminPage.java
@@ -57,7 +57,7 @@ protected void onSubmit() {
@SuppressWarnings("unchecked")
@Override
protected void setPassword(String password) {
- if (getUserForm().getEntityModel().isBound())
+ if (form.getEntityModel().isBound())
super.setPassword(password);
else
((Map)getUserForm().getModelObject()).put("passwordHash", UserHelper.getHash(password));
@@ -65,7 +65,7 @@ protected void setPassword(String password) {
@Override
protected Button deleteButton(String id) {
- return getUserForm().new DeleteButton(id);
+ return form.new DeleteButton(id);
}
@Override
View
10 ...nder-components/src/main/java/net/databinder/components/ObjectFilteredPropertyColumn.java
@@ -33,17 +33,17 @@
* DataTable property filter column that works with joined entities instead of string properties.
* @author Mark Southern
*/
-public class ObjectFilteredPropertyColumn<T> extends ChoiceFilteredPropertyColumn<T> {
- private ChoiceRenderer<T> choiceRenderer;
+public class ObjectFilteredPropertyColumn<T, Y> extends ChoiceFilteredPropertyColumn<T, Y> {
+ private ChoiceRenderer<Y> choiceRenderer;
private String displayProperty;
- public ObjectFilteredPropertyColumn(IModel<String> displayModel, String sortProperty, String displayProperty, String propertyExpression, String filterLabelProperty, IModel<List<? extends T>> filterChoices) {
+ public ObjectFilteredPropertyColumn(IModel<String> displayModel, String sortProperty, String displayProperty, String propertyExpression, String filterLabelProperty, IModel<List<? extends Y>> filterChoices) {
super(displayModel,sortProperty,propertyExpression,filterChoices);
- choiceRenderer = new ChoiceRenderer<T>(filterLabelProperty);
+ choiceRenderer = new ChoiceRenderer<Y>(filterLabelProperty);
this.displayProperty = displayProperty;
}
- protected IChoiceRenderer<T> getChoiceRenderer() {
+ protected IChoiceRenderer<Y> getChoiceRenderer() {
return choiceRenderer;
}
View
2  pom.slip
@@ -17,7 +17,7 @@ project(xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance",xmlns="http://mave
distribution: "repo"
properties:
- wicket.version: "1.4-rc1"
+ wicket.version: "1.4.0"
scala.version: "2.7.5"
packaging: "pom"
View
2  pom.xml
@@ -16,7 +16,7 @@
</license>
</licenses>
<properties>
- <wicket.version>1.4-rc1</wicket.version>
+ <wicket.version>1.4.0</wicket.version>
<scala.version>2.7.5</scala.version>
</properties>
<packaging>pom</packaging>

0 comments on commit 7dbfb97

Please sign in to comment.
Something went wrong with that request. Please try again.