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/18 18:21:39 UTC
svn commit: r669210 [1/2] - in /wicket/sandbox/ivaynberg/generics:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/
wicket-examples/src/main/java/or...
Author: ivaynberg
Date: Wed Jun 18 09:21:33 2008
New Revision: 669210
URL: http://svn.apache.org/viewvc?rev=669210&view=rev
Log:
wip
Modified:
wicket/sandbox/ivaynberg/generics/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/XmlPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
wicket/sandbox/ivaynberg/generics/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/MyTable.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java
wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.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=669210&r1=669209&r2=669210&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 Wed Jun 18 09:21:33 2008
@@ -85,7 +85,7 @@
@Override
public void onClick()
{
- selected = ActionPanel.this.getModelObject();
+ selected = ActionPanel.this.getDefaultModelObject();
}
});
}
@@ -146,7 +146,7 @@
@Override
protected void populateItem(ListItem<String> item)
{
- item.add(new Radio<String>("radio", item.getModel()));
+ item.add(new Radio<String>("radio", item.getDefaultModel()));
item.add(new Label<String>("number", item.getModelObjectAsString()));
};
};
@@ -161,7 +161,7 @@
@Override
protected void populateItem(ListItem<String> item)
{
- item.add(new Check<String>("check", item.getModel()));
+ item.add(new Check<String>("check", item.getDefaultModel()));
item.add(new Label<String>("number", item.getModelObjectAsString()));
};
};
@@ -242,7 +242,7 @@
@Override
public void onSubmit()
{
- info("Saved model " + getModelObject());
+ info("Saved model " + getDefaultModelObject());
}
}
@@ -265,7 +265,7 @@
@Override
protected void populateItem(ListItem<Line> item)
{
- item.add(new TextField<String>("lineEdit", new PropertyModel<String>(item.getModel(),
+ item.add(new TextField<String>("lineEdit", new PropertyModel<String>(item.getDefaultModel(),
"text")));
}
}
@@ -384,8 +384,8 @@
@Override
protected void populateItem(final Item<Contact> item)
{
- Contact contact = item.getModelObject();
- item.add(new ActionPanel("actions", item.getModel()));
+ 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()));
Modified: wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java Wed Jun 18 09:21:33 2008
@@ -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/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Wed Jun 18 09:21:33 2008
@@ -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;
Modified: wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java Wed Jun 18 09:21:33 2008
@@ -223,7 +223,7 @@
public void setDate(Date date)
{
this.date = (date != null) ? new MutableDateTime(date) : null;
- setModelObject(date);
+ setDefaultModelObject(date);
}
/**
@@ -360,7 +360,7 @@
boolean use12HourFormat = use12HourFormat();
amOrPmChoice.setVisible(use12HourFormat);
- Date d = (Date)getModelObject();
+ Date d = (Date)getDefaultModelObject();
if (d != null)
{
date = new MutableDateTime(d);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java Wed Jun 18 09:21:33 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/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java Wed Jun 18 09:21:33 2008
@@ -76,7 +76,7 @@
@Override
public void populateItem(final ListItem<Comment> listItem)
{
- final Comment comment = listItem.getModelObject();
+ final Comment comment = listItem.getDefaultModelObject();
listItem.add(new Label<Date>("date", new Model<Date>(comment.getDate())));
listItem.add(new MultiLineLabel<String>("text", comment.getText()));
}
@@ -157,7 +157,7 @@
public final void onSubmit()
{
// Construct a copy of the edited comment
- final Comment comment = getModelObject();
+ final Comment comment = getDefaultModelObject();
final Comment newComment = new Comment(comment);
// Set date of comment to add
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java Wed Jun 18 09:21:33 2008
@@ -78,7 +78,7 @@
@Override
protected void onUpdate(AjaxRequestTarget target)
{
- label.setModelObject(getValue(field.getModelObjectAsString()));
+ label.setDefaultModelObject(getValue(field.getModelObjectAsString()));
target.addComponent(label);
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java Wed Jun 18 09:21:33 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/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java Wed Jun 18 09:21:33 2008
@@ -136,7 +136,7 @@
protected void populateItem(ListItem<TodoItem> item)
{
// add an AJAX checkbox to the item
- item.add(new AjaxCheckBox("check", new PropertyModel<Boolean>(item.getModel(),
+ item.add(new AjaxCheckBox("check", new PropertyModel<Boolean>(item.getDefaultModel(),
"checked"))
{
@Override
@@ -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<String>("text", new PropertyModel<String>(item.getDefaultModel(),
"text")));
}
});
@@ -259,7 +259,7 @@
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);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java Wed Jun 18 09:21:33 2008
@@ -49,7 +49,7 @@
@Override
protected void populateItem(ListItem<User> item)
{
- final User user = item.getModelObject();
+ final User user = item.getDefaultModelObject();
item.add(new Link<Void>("selectUserLink")
{
@Override
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java Wed Jun 18 09:21:33 2008
@@ -63,10 +63,10 @@
@Override
protected void populateItem(ListItem<Person> item)
{
- item.add(new Check<Person>("checkbox", item.getModel()));
- item.add(new Label<String>("name", new PropertyModel<String>(item.getModel(),
+ item.add(new Check<Person>("checkbox", item.getDefaultModel()));
+ item.add(new Label<String>("name", new PropertyModel<String>(item.getDefaultModel(),
"name")));
- item.add(new Label<String>("lastName", new PropertyModel<String>(item.getModel(),
+ item.add(new Label<String>("lastName", new PropertyModel<String>(item.getDefaultModel(),
"lastName")));
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java Wed Jun 18 09:21:33 2008
@@ -61,10 +61,10 @@
@Override
protected void populateItem(ListItem<Person> item)
{
- item.add(new Radio<Person>("radio", item.getModel()));
- item.add(new Label<String>("name", new PropertyModel<String>(item.getModel(),
+ item.add(new Radio<Person>("radio", item.getDefaultModel()));
+ item.add(new Label<String>("name", new PropertyModel<String>(item.getDefaultModel(),
"name")));
- item.add(new Label<String>("lastName", new PropertyModel<String>(item.getModel(),
+ item.add(new Label<String>("lastName", new PropertyModel<String>(item.getDefaultModel(),
"lastName")));
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java Wed Jun 18 09:21:33 2008
@@ -87,7 +87,7 @@
// add the new tabbed panel, attribute modifier only used to switch
// between different css variations
add(new TabbedPanel("tabs", tabs).add(new AttributeModifier("class", true,
- TabbedPanelPage.this.getModel())));
+ TabbedPanelPage.this.getDefaultModel())));
}
@@ -120,7 +120,7 @@
@Override
public void onClick()
{
- TabbedPanelPage.this.setModelObject(clazz);
+ TabbedPanelPage.this.setDefaultModelObject(clazz);
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/XmlPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/XmlPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/XmlPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/compref/XmlPage.java Wed Jun 18 09:21:33 2008
@@ -68,7 +68,7 @@
@Override
protected void populateItem(ListItem<Person> item)
{
- Person person = item.getModelObject();
+ Person person = item.getDefaultModelObject();
item.add(new Label<String>("firstName", person.getName()));
item.add(new Label<String>("lastName", person.getLastName()));
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java Wed Jun 18 09:21:33 2008
@@ -141,7 +141,7 @@
@Override
protected void populateItem(ListItem<SessionData> item)
{
- final SessionData sd = item.getModelObject();
+ final SessionData sd = item.getDefaultModelObject();
Link<?> link = new Link<Void>("id")
{
private static final long serialVersionUID = 1L;
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java Wed Jun 18 09:21:33 2008
@@ -88,7 +88,7 @@
@Override
protected void populateItem(final ListItem<Access> listItem)
{
- final Access access = listItem.getModelObject();
+ final Access access = listItem.getDefaultModelObject();
IPageMapEntry entry = pageMap.getEntry(access.getId());
PageParameters parameters = new PageParameters();
parameters.put("pageId", "" + entry.getNumericId());
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java Wed Jun 18 09:21:33 2008
@@ -116,7 +116,7 @@
@Override
protected void populateItem(ListItem<RequestData> item)
{
- RequestData rd = item.getModelObject();
+ RequestData rd = item.getDefaultModelObject();
item.add(new Label<String>("id", new Model<String>(rd.getSessionId())).setVisible(sessionData == null));
item.add(new Label<String>("startDate", new Model<String>(
sdf.format(rd.getStartDate()))));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java Wed Jun 18 09:21:33 2008
@@ -90,7 +90,7 @@
@Override
protected void populateItem(final ListItem<IPageMap> listItem)
{
- IPageMap p = listItem.getModelObject();
+ IPageMap p = listItem.getDefaultModelObject();
listItem.add(new PageMapView("pagemap", p));
}
});
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java Wed Jun 18 09:21:33 2008
@@ -103,7 +103,7 @@
add(new Multiply("multiply"));
// display the multiply result
Label<Integer> multiplyLabel = new Label<Integer>("multiplyLabel",
- new PropertyModel<Integer>(getModel(), "multiply"));
+ new PropertyModel<Integer>(getDefaultModel(), "multiply"));
// just for fun, add a border so that our result will be displayed
// as '[ x ]'
multiplyLabel.setComponentBorder(new BeforeAndAfterBorder());
@@ -120,7 +120,7 @@
@Override
protected void populateItem(ListItem<String> item)
{
- item.add(new Radio<String>("radio", item.getModel()));
+ item.add(new Radio<String>("radio", item.getDefaultModel()));
item.add(new Label<String>("number", item.getModelObjectAsString()));
};
}.setReuseItems(true);
@@ -133,7 +133,7 @@
@Override
protected void populateItem(ListItem<String> item)
{
- item.add(new Check<String>("check", item.getModel()));
+ item.add(new Check<String>("check", item.getDefaultModel()));
item.add(new Label<String>("number", item.getModelObjectAsString()));
};
}.setReuseItems(true);
@@ -221,7 +221,7 @@
public void onSubmit()
{
// Form validation successful. Display message showing edited model.
- info("Saved model " + getModelObject());
+ info("Saved model " + getDefaultModelObject());
}
}
@@ -247,7 +247,7 @@
// add a text field that works on each list item model (returns
// objects of
// type FormInputModel.Line) using property text.
- item.add(new TextField<String>("lineEdit", new PropertyModel<String>(item.getModel(),
+ item.add(new TextField<String>("lineEdit", new PropertyModel<String>(item.getDefaultModel(),
"text")));
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java Wed Jun 18 09:21:33 2008
@@ -101,7 +101,7 @@
@Override
public final void onSubmit()
{
- ValueMap values = getModelObject();
+ ValueMap values = getDefaultModelObject();
// check if the honey pot is filled
if (StringUtils.isNotBlank((String)values.get("comment")))
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java Wed Jun 18 09:21:33 2008
@@ -58,7 +58,7 @@
@Override
protected void populateItem(final ListItem<Letter> listItem)
{
- final Letter letter = listItem.getModelObject();
+ final Letter letter = listItem.getDefaultModelObject();
final Link<?> link = new Link<Void>("letter")
{
@Override
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java Wed Jun 18 09:21:33 2008
@@ -155,7 +155,7 @@
{
final RequestCycle cycle = getRequestCycle();
PageParameters parameters = new PageParameters();
- final Book book = getModelObject();
+ final Book book = getDefaultModelObject();
parameters.put("id", book.getId());
cycle.setResponsePage(getPageFactory().newPage(BookDetails.class, parameters));
cycle.setRedirect(true);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java Wed Jun 18 09:21:33 2008
@@ -50,7 +50,7 @@
@Override
public void populateItem(final ListItem<Book> listItem)
{
- final Book book = listItem.getModelObject();
+ final Book book = listItem.getDefaultModelObject();
listItem.add(BookDetails.link("details", book, getLocalizer().getString(
"noBookTitle", this)));
listItem.add(new Label<Book>("author", new Model<Book>(book)));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java Wed Jun 18 09:21:33 2008
@@ -73,7 +73,7 @@
@Override
protected void populateItem(ListItem<Object> listItem)
{
- Object modelObject = listItem.getModelObject();
+ Object modelObject = listItem.getDefaultModelObject();
if (modelObject instanceof List)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java Wed Jun 18 09:21:33 2008
@@ -70,7 +70,7 @@
@Override
protected void onSubmit()
{
- ExampleApplication selected = ddc.getModelObject();
+ ExampleApplication selected = ddc.getDefaultModelObject();
PortletRequestContext prc = (PortletRequestContext)RequestContext.get();
PortletPreferences prefs = prc.getPortletRequest().getPreferences();
prc.getPortletRequest().getPortletSession().setAttribute(
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java Wed Jun 18 09:21:33 2008
@@ -77,7 +77,7 @@
@Override
public void onClick()
{
- selected = (Contact)getParent().getModelObject();
+ selected = (Contact)getParent().getDefaultModelObject();
}
});
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java Wed Jun 18 09:21:33 2008
@@ -80,7 +80,7 @@
protected void populateItem(final Item<Contact> item)
{
// populate the row of the repeater
- IModel<Contact> contact = item.getModel();
+ IModel<Contact> contact = item.getDefaultModel();
item.add(new ActionPanel("actions", contact));
item.add(new TextField<Long>("id"));
item.add(new TextField<String>("firstName"));
@@ -127,7 +127,7 @@
@Override
public void onClick()
{
- setSelected(ActionPanel.this.getModelObject());
+ setSelected(ActionPanel.this.getDefaultModelObject());
}
});
@@ -136,7 +136,7 @@
@Override
public void onSubmit()
{
- Contact contact = ActionPanel.this.getModelObject();
+ Contact contact = ActionPanel.this.getDefaultModelObject();
info("Removed contact " + contact);
DatabaseLocator.getDatabase().delete(contact);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java Wed Jun 18 09:21:33 2008
@@ -40,7 +40,7 @@
@Override
protected void populateItem(Item<Contact> item)
{
- final Contact contact = item.getModelObject();
+ final Contact contact = item.getDefaultModelObject();
item.add(new Label<String>("firstName", contact.getFirstName() + " " +
contact.getLastName()));
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java Wed Jun 18 09:21:33 2008
@@ -82,8 +82,8 @@
@Override
protected void populateItem(final Item<Contact> item)
{
- Contact contact = item.getModelObject();
- item.add(new ActionPanel("actions", item.getModel()));
+ Contact contact = item.getDefaultModelObject();
+ item.add(new ActionPanel("actions", item.getDefaultModel()));
item.add(new Link<Void>("toggleHighlite")
{
@Override
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java Wed Jun 18 09:21:33 2008
@@ -43,8 +43,8 @@
@Override
protected void populateItem(final Item<Contact> item)
{
- Contact contact = item.getModelObject();
- item.add(new ActionPanel("actions", item.getModel()));
+ 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()));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java Wed Jun 18 09:21:33 2008
@@ -68,9 +68,9 @@
@Override
protected void populateItem(final Item<Contact> item)
{
- Contact contact = item.getModelObject();
+ Contact contact = item.getDefaultModelObject();
item.add(new Label<String>("itemid", item.getId()));
- item.add(new ActionPanel("actions", item.getModel()));
+ 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()));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java Wed Jun 18 09:21:33 2008
@@ -39,8 +39,8 @@
@Override
protected void populateItem(final Item<Contact> item)
{
- Contact contact = item.getModelObject();
- item.add(new ActionPanel("actions", item.getModel()));
+ 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()));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java Wed Jun 18 09:21:33 2008
@@ -44,8 +44,8 @@
@Override
protected void populateItem(final Item<Contact> item)
{
- Contact contact = item.getModelObject();
- item.add(new ActionPanel("actions", item.getModel()));
+ 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()));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Wed Jun 18 09:21:33 2008
@@ -377,7 +377,7 @@
protected void populateItem(ListItem<String> item)
{
AjaxFallbackLink<String> link = new AjaxFallbackLink<String>("link",
- item.getModel())
+ item.getDefaultModel())
{
@Override
public void onClick(AjaxRequestTarget target)
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java Wed Jun 18 09:21:33 2008
@@ -67,7 +67,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject() + ", link click count: " +
+ info("Submitted text: " + field.getDefaultModelObject() + ", link click count: " +
linkClickCount);
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java Wed Jun 18 09:21:33 2008
@@ -55,7 +55,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java Wed Jun 18 09:21:33 2008
@@ -55,7 +55,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java Wed Jun 18 09:21:33 2008
@@ -55,7 +55,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java Wed Jun 18 09:21:33 2008
@@ -55,7 +55,7 @@
@Override
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java Wed Jun 18 09:21:33 2008
@@ -55,7 +55,7 @@
* source, which should be updated on every form post (e.g. by overriding {@link Form#onSubmit}
* and in that method explicitly setting the new value). But as you can see, this method is
* slighly easier, and if we wanted to use the translated value in e.g. a database, we could
- * just query this model directly or indirectly by calling {@link Component#getModelObject()} on
+ * just query this model directly or indirectly by calling {@link Component#getDefaultModelObject()} on
* the component that holds it, and we would have a recent value.
*/
private final class ConverterModel extends Model<String>
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java Wed Jun 18 09:21:33 2008
@@ -75,7 +75,7 @@
@Override
protected void populateItem(ListItem<File> listItem)
{
- final File file = listItem.getModelObject();
+ final File file = listItem.getDefaultModelObject();
listItem.add(new Label<String>("file", file.getName()));
listItem.add(new Link<Void>("delete")
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java Wed Jun 18 09:21:33 2008
@@ -72,7 +72,7 @@
@Override
protected void populateItem(ListItem<File> listItem)
{
- final File file = listItem.getModelObject();
+ final File file = listItem.getDefaultModelObject();
listItem.add(new Label<String>("file", file.getName()));
listItem.add(new Link<Void>("delete")
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Wed Jun 18 09:21:33 2008
@@ -242,7 +242,7 @@
String displayValue = getModelObjectAsString();
if (renderer != null)
{
- Object displayObject = renderer.getDisplayValue(getModelObject());
+ Object displayObject = renderer.getDisplayValue(getDefaultModelObject());
Class<?> objectClass = (displayObject == null ? null : displayObject.getClass());
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Wed Jun 18 09:21:33 2008
@@ -342,7 +342,7 @@
@Override
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- Object modelObject = getModelObject();
+ Object modelObject = getDefaultModelObject();
if (modelObject == null || "".equals(modelObject))
{
replaceComponentTagBody(markupStream, openTag, defaultNullLabel());
@@ -507,7 +507,7 @@
// model this component can use. Set that directly to the label and
// editor so that those components work like this enclosing panel
// does not exist (must have that e.g. with CompoundPropertyModels)
- IModel<T> m = getModel();
+ IModel<T> m = getDefaultModel();
// check that a model was found
if (m == null)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Wed Jun 18 09:21:33 2008
@@ -84,7 +84,7 @@
@Override
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- Object modelObject = getModelObject();
+ Object modelObject = getDefaultModelObject();
if (modelObject == null || "".equals(modelObject))
{
replaceComponentTagBody(markupStream, openTag, defaultNullLabel());
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java Wed Jun 18 09:21:33 2008
@@ -156,7 +156,7 @@
// else let the listview recalculate it's children immediately;
// it was attached, but it needs to go through that again now
// as the signaling component attached after this
- getModel().detach();
+ getDefaultModel().detach();
super.internalOnAttach();
}
@@ -178,7 +178,7 @@
protected void populateItem(ListItem item)
{
int index = item.getIndex();
- IBreadCrumbParticipant breadCrumbParticipant = (IBreadCrumbParticipant)item.getModelObject();
+ IBreadCrumbParticipant breadCrumbParticipant = (IBreadCrumbParticipant)item.getDefaultModelObject();
item.add(newBreadCrumbComponent("crumb", index, size, breadCrumbParticipant));
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java Wed Jun 18 09:21:33 2008
@@ -482,7 +482,7 @@
*/
public Collection getModelCollection()
{
- return getModelObject();
+ return getDefaultModelObject();
}
/**
@@ -513,7 +513,7 @@
protected final void updateModel()
{
// prepare model
- List<T> model = getModelObject();
+ List<T> model = getDefaultModelObject();
model.clear();
// update model
@@ -525,7 +525,7 @@
model.add(selectedChoice);
}
- getModel().setObject(model);
+ getDefaultModel().setObject(model);
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java Wed Jun 18 09:21:33 2008
@@ -91,7 +91,7 @@
protected void convertInput()
{
- boolean supportsMultiple = getModelObject() instanceof Collection;
+ boolean supportsMultiple = getDefaultModelObject() instanceof Collection;
/*
* the input contains an array of full path of the selected option components unless nothing
@@ -144,7 +144,7 @@
path +
"] which does not point to an SelectOption component. Due to this the Select component cannot resolve the selected SelectOption component pointed to by the illegal value. A possible reason is that component hierarchy changed between rendering and form submission.");
}
- converted.add(option.getModelObject());
+ converted.add(option.getDefaultModelObject());
}
}
@@ -169,7 +169,7 @@
*/
public void updateModel()
{
- Object object = getModelObject();
+ Object object = getDefaultModelObject();
boolean supportsMultiple = object instanceof Collection;
Object converted = getConvertedInput();
@@ -187,11 +187,11 @@
}
modelChanged();
// force notify of model update via setObject()
- getModel().setObject(modelCollection);
+ getDefaultModel().setObject(modelCollection);
}
else
{
- setModelObject(converted);
+ setDefaultModelObject(converted);
}
}
@@ -221,8 +221,8 @@
}
else
{
- Object selected = getModelObject();
- Object value = option.getModelObject();
+ Object selected = getDefaultModelObject();
+ Object value = option.getDefaultModelObject();
if (selected != null && selected instanceof Collection)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java Wed Jun 18 09:21:33 2008
@@ -99,7 +99,7 @@
// populate this repeating view with SelectOption components
removeAll();
- Collection<? extends T> modelObject = getModelObject();
+ Collection<? extends T> modelObject = getDefaultModelObject();
if (modelObject != null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java Wed Jun 18 09:21:33 2008
@@ -183,8 +183,8 @@
Item<ICellPopulator<T>> cellItem = newCellItem(cells.newChildId(), i, populatorModel);
cells.add(cellItem);
- ICellPopulator<T> populator = cellItem.getModelObject();
- populator.populateItem(cellItem, CELL_ITEM_ID, item.getModel());
+ ICellPopulator<T> populator = cellItem.getDefaultModelObject();
+ populator.populateItem(cellItem, CELL_ITEM_ID, item.getDefaultModel());
if (cellItem.get("cell") == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java Wed Jun 18 09:21:33 2008
@@ -66,12 +66,12 @@
protected IModel<Object> getStateModel()
{
- return form.getModel();
+ return form.getDefaultModel();
}
protected Object getState()
{
- return form.getModelObject();
+ return form.getDefaultModelObject();
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java Wed Jun 18 09:21:33 2008
@@ -106,7 +106,7 @@
*/
protected IModel<T> getFilterModel(FilterForm form)
{
- return new PropertyModel<T>(form.getModel(), getPropertyExpression());
+ return new PropertyModel<T>(form.getDefaultModel(), getPropertyExpression());
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java Wed Jun 18 09:21:33 2008
@@ -70,7 +70,7 @@
{
super(id, goModel);
- originalState = Objects.cloneModel(form.getModelObject());
+ originalState = Objects.cloneModel(form.getDefaultModelObject());
clear = new Button<String>("clear", clearModel)
{
@@ -107,7 +107,7 @@
protected void onClearSubmit(Button<String> button)
{
Form<Object> form = (Form<Object>)button.getForm();
- form.setModelObject(Objects.cloneModel(originalState));
+ form.setDefaultModelObject(Objects.cloneModel(originalState));
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java Wed Jun 18 09:21:33 2008
@@ -74,7 +74,7 @@
*/
protected IModel<T> getFilterModel(FilterForm form)
{
- return new PropertyModel<T>(form.getModel(), getPropertyExpression());
+ return new PropertyModel<T>(form.getDefaultModel(), getPropertyExpression());
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java Wed Jun 18 09:21:33 2008
@@ -346,7 +346,7 @@
throw new IndexOutOfBoundsException();
}
- setModelObject(new Integer(index));
+ setDefaultModelObject(new Integer(index));
final Component<?> component;
@@ -387,7 +387,7 @@
*/
public final int getSelectedTab()
{
- return (getModelObject()).intValue();
+ return (getDefaultModelObject()).intValue();
}
private boolean isTabVisible(int tabIndex)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java Wed Jun 18 09:21:33 2008
@@ -84,9 +84,9 @@
@Override
protected void populateTreeItem(WebMarkupContainer item, int level)
{
- final TreeNode node = (TreeNode)item.getModelObject();
+ final TreeNode node = (TreeNode)item.getDefaultModelObject();
- item.add(newIndentation(item, "indent", (TreeNode)item.getModelObject(), level));
+ item.add(newIndentation(item, "indent", (TreeNode)item.getDefaultModelObject(), level));
item.add(newJunctionLink(item, "link", "image", node));
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java Wed Jun 18 09:21:33 2008
@@ -303,7 +303,7 @@
@Override
protected void populateTreeItem(WebMarkupContainer item, int level)
{
- final TreeNode node = (TreeNode)item.getModelObject();
+ final TreeNode node = (TreeNode)item.getDefaultModelObject();
// add side columns
SideColumnsView sideColumns = new SideColumnsView("sideColumns", node);
Modified: wicket/sandbox/ivaynberg/generics/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java Wed Jun 18 09:21:33 2008
@@ -223,7 +223,7 @@
if (evaluatedTemplate == null)
{
// Get model as a map
- final Map map = getModelObject();
+ final Map map = getDefaultModelObject();
// create a Velocity context object using the model if set
final VelocityContext ctx = new VelocityContext(map);