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 [2/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...
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java Wed Jun 18 09:21:33 2008
@@ -83,10 +83,10 @@
* <li><b>Construction </b>- A Component is constructed with the Java language new operator.
* Children may be added during construction if the Component is a MarkupContainer.
*
- * <li><b>Request Handling </b>- An incoming request is processed by a protocol request handler
- * such as WicketServlet. An associated Application object creates Session, Request and Response
- * objects for use by a given Component in updating its model and rendering a response. These
- * objects are stored inside a container called {@link RequestCycle} which is accessible via
+ * <li><b>Request Handling </b>- An incoming request is processed by a protocol request handler such
+ * as WicketServlet. An associated Application object creates Session, Request and Response objects
+ * for use by a given Component in updating its model and rendering a response. These objects are
+ * stored inside a container called {@link RequestCycle} which is accessible via
* {@link Component#getRequestCycle()}. The convenience methods {@link Component#getRequest()},
* {@link Component#getResponse()} and {@link Component#getSession()} provide easy access to the
* contents of this container.
@@ -123,21 +123,21 @@
*
* <li><b>Component Models </b>- The primary responsibility of a component is to use its model (an
* object that implements IModel), which can be set via {@link Component#setModel(IModel model)} and
- * retrieved via {@link Component#getModel()}, to render a response in an appropriate markup
+ * retrieved via {@link Component#getDefaultModel()}, to render a response in an appropriate markup
* language, such as HTML. In addition, form components know how to update their models based on
* request information. Since the IModel interface is a wrapper around an actual model object, a
- * convenience method {@link Component#getModelObject()} is provided to retrieve the model Object
- * from its IModel wrapper. A further convenience method, {@link Component#getModelObjectAsString()},
- * is provided for the very common operation of converting the wrapped model Object to a String.
+ * convenience method {@link Component#getDefaultModelObject()} is provided to retrieve the model
+ * Object from its IModel wrapper. A further convenience method,
+ * {@link Component#getModelObjectAsString()} , is provided for the very common operation of
+ * converting the wrapped model Object to a String.
*
* <li><b>Visibility </b>- Components which have setVisible(false) will return false from
* isVisible() and will not render a response (nor will their children).
*
* <li><b>Page </b>- The Page containing any given Component can be retrieved by calling
- * {@link Component#getPage()}. If the Component is not attached to a Page, an
- * IllegalStateException will be thrown. An equivalent method, {@link Component#findPage()} is
- * available for special circumstances where it might be desirable to get a null reference back
- * instead.
+ * {@link Component#getPage()}. If the Component is not attached to a Page, an IllegalStateException
+ * will be thrown. An equivalent method, {@link Component#findPage()} is available for special
+ * circumstances where it might be desirable to get a null reference back instead.
*
* <li><b>Session </b>- The Page for a Component points back to the Session that contains the Page.
* The Session for a component can be accessed with the convenience method getSession(), which
@@ -153,12 +153,12 @@
* Application Localizer for easy access in Components.
*
* <li><b>Style </b>- The style ("skin") for a component is available through
- * {@link Component#getStyle()}, which is equivalent to getSession().getStyle(). Styles are
- * intended to give a particular look to a Component or Resource that is independent of its Locale.
- * For example, a style might be a set of resources, including images and markup files, which gives
- * the design look of "ocean" to the user. If the Session's style is set to "ocean" and these
- * resources are given names suffixed with "_ocean", Wicket's resource management logic will prefer
- * these resources to other resources, such as default resources, which are not as good of a match.
+ * {@link Component#getStyle()}, which is equivalent to getSession().getStyle(). Styles are intended
+ * to give a particular look to a Component or Resource that is independent of its Locale. For
+ * example, a style might be a set of resources, including images and markup files, which gives the
+ * design look of "ocean" to the user. If the Session's style is set to "ocean" and these resources
+ * are given names suffixed with "_ocean", Wicket's resource management logic will prefer these
+ * resources to other resources, such as default resources, which are not as good of a match.
*
* <li><b>Variation </b>- Whereas Styles are Session (user) specific, variations are component
* specific. E.g. if the Style is "ocean" and the Variation is "NorthSea", than the resources are
@@ -189,8 +189,8 @@
* {@link Component#setVersioned(boolean)} method. The versioning participation of a given Component
* can be retrieved with {@link Component#isVersioned()}.
*
- * <li><b>AJAX support</b>- Components can be re-rendered after the whole Page has been rendered
- * at least once by calling doRender().
+ * <li><b>AJAX support</b>- Components can be re-rendered after the whole Page has been rendered at
+ * least once by calling doRender().
*
* @author Jonathan Locke
* @author Chris Turner
@@ -473,8 +473,9 @@
* safe, as constructs like:
*
* <pre>
- * User u = (User)getModelObject();
- * u.setName("got you there!");
+ *
+ * User u = (User)getModelObject(); u.setName("got you there!");
+ *
* </pre>
*
* can't be prevented. Indeed it can be argued that any model protection is best dealt with in
@@ -495,12 +496,11 @@
* <li>The 'normal' use is for controlling whether a component is rendered without having any
* effect on the rest of the processing. If a strategy lets this method return 'false', then the
* target component and its children will not be rendered, in the same fashion as if that
- * component had visibility property 'false'.</li>
- * <li>The other use is when a component should block the rendering of the whole page. So
- * instead of 'hiding' a component, what we generally want to achieve here is that we force the
- * user to logon/give-credentials for a higher level of authorization. For this functionality,
- * the strategy implementation should throw a {@link AuthorizationException}, which will then
- * be handled further by the framework.</li>
+ * component had visibility property 'false'.</li> <li>The other use is when a component should
+ * block the rendering of the whole page. So instead of 'hiding' a component, what we generally
+ * want to achieve here is that we force the user to logon/give-credentials for a higher level
+ * of authorization. For this functionality, the strategy implementation should throw a
+ * {@link AuthorizationException}, which will then be handled further by the framework.</li>
* </ul>
* </p>
*/
@@ -525,7 +525,7 @@
public boolean compare(Component<Object> component, Object b)
{
- final Object a = component.getModelObject();
+ final Object a = component.getDefaultModelObject();
if (a == null && b == null)
{
return true;
@@ -703,10 +703,10 @@
* What's stored here depends on what attributes are set on component. Data can contains
* combination of following attributes:
* <ul>
- * <li>Model (indicated by {@link #FLAG_MODEL_SET})
- * <li>MetaDataEntry (optionally {@link MetaDataEntry}[] if more metadata entries are present) *
- * <li>{@link IBehavior}(s) added to component. The behaviors are not stored in separate
- * array, they are part of the {@link #data} array
+ * <li>Model (indicated by {@link #FLAG_MODEL_SET}) <li>MetaDataEntry (optionally
+ * {@link MetaDataEntry}[] if more metadata entries are present) * <li>{@link IBehavior}(s)
+ * added to component. The behaviors are not stored in separate array, they are part of the
+ * {@link #data} array
* </ul>
* If there is only one attribute set (i.e. model or MetaDataEntry([]) or one behavior), the
* #data object points directly to value of that attribute. Otherwise the data is of type
@@ -1358,7 +1358,7 @@
*/
public final IModel<?> getInnermostModel()
{
- return getInnermostModel(getModel());
+ return getInnermostModel(getDefaultModel());
}
/**
@@ -1437,9 +1437,9 @@
* attribute set explicitly via a call to {@link #setMarkupId(String)}, id attribute defined in
* the markup, or an automatically generated id - in that order.
* <p>
- * If no id is set and <code>createIfDoesNotExist</code> is false, this method will return
- * null. Otherwise it will generate an id value that will be unique in the page. This is the
- * preferred way as there is no chance of id collision.
+ * If no id is set and <code>createIfDoesNotExist</code> is false, this method will return null.
+ * Otherwise it will generate an id value that will be unique in the page. This is the preferred
+ * way as there is no chance of id collision.
* <p>
* Note: This method should only be called after the component or its parent have been added to
* the page.
@@ -1572,7 +1572,7 @@
*
* @return The model
*/
- public final IModel<T> getModel()
+ public final IModel<T> getDefaultModel()
{
IModel<T> model = getModelImpl();
// If model is null
@@ -1591,9 +1591,9 @@
*
* @return The backing model object
*/
- public final T getModelObject()
+ public final T getDefaultModelObject()
{
- final IModel<T> model = getModel();
+ final IModel<T> model = getDefaultModel();
if (model != null)
{
// Get model value for this component.
@@ -1619,7 +1619,7 @@
*/
public final String getModelObjectAsString()
{
- return getModelObjectAsString(getModelObject());
+ return getModelObjectAsString(getDefaultModelObject());
}
/**
@@ -2626,9 +2626,8 @@
/**
* Replaces this component with another. The replacing component must have the same component id
- * as this component. This method serves as a shortcut to
- * <code>this.getParent().replace(replacement)</code> and provides a better context for
- * errors.
+ * as this component. This method serves as a shortcut to <code>
+ * this.getParent().replace(replacement)</code> and provides a better context for errors.
*
* @since 1.2.1
*
@@ -2662,7 +2661,7 @@
*/
public final boolean sameInnermostModel(final Component<?> component)
{
- return sameInnermostModel(component.getModel());
+ return sameInnermostModel(component.getDefaultModel());
}
/**
@@ -2673,7 +2672,7 @@
public final boolean sameInnermostModel(final IModel<?> model)
{
// Get the two models
- IModel<?> thisModel = getModel();
+ IModel<?> thisModel = getDefaultModel();
IModel<?> thatModel = model;
// If both models are non-null they could be the same
@@ -2930,9 +2929,9 @@
* The object to set
* @return This
*/
- public final Component<T> setModelObject(final T object)
+ public final Component<T> setDefaultModelObject(final T object)
{
- final IModel<T> model = getModel();
+ final IModel<T> model = getDefaultModel();
// Check whether anything can be set at all
if (model == null)
@@ -4283,8 +4282,7 @@
* Determines whether or not a component should be visible, taking into account all the factors:
* {@link #isVisible()}, {@link #isVisibilityAllowed()}, {@link #isRenderAllowed()}
*
- * @return <code>true</code> if the component should be visible, <code>false</code>
- * otherwise
+ * @return <code>true</code> if the component should be visible, <code>false</code> otherwise
*/
public final boolean determineVisibility()
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java Wed Jun 18 09:21:33 2008
@@ -739,7 +739,7 @@
{
public Object component(Component<?> component)
{
- IModel<?> compModel = component.getModel();
+ IModel<?> compModel = component.getDefaultModel();
if (compModel instanceof IWrapModel)
{
compModel = ((IWrapModel<?>)compModel).getWrappedModel();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java Wed Jun 18 09:21:33 2008
@@ -127,7 +127,7 @@
@Override
protected void populateItem(final ListItem<ComponentData> listItem)
{
- final ComponentData componentData = listItem.getModelObject();
+ final ComponentData componentData = listItem.getDefaultModelObject();
listItem.add(new Label<String>("row", Integer.toString(listItem.getIndex() + 1)));
listItem.add(new Label<String>("path", componentData.path));
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java Wed Jun 18 09:21:33 2008
@@ -141,7 +141,7 @@
@Override
public String getModelValue()
{
- final T object = getModelObject();
+ final T object = getDefaultModelObject();
if (object != null)
{
int index = getChoices().indexOf(object);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java Wed Jun 18 09:21:33 2008
@@ -140,7 +140,7 @@
{
// Set the type, but only if it's not a String (see WICKET-606).
// Otherwise, getConvertEmptyInputStringToNull() won't work.
- Class<?> type = getModelType(getModel());
+ Class<?> type = getModelType(getDefaultModel());
if (!String.class.equals(type))
{
setType(type);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java Wed Jun 18 09:21:33 2008
@@ -116,7 +116,7 @@
// check if the model collection of the group contains the model object.
// if it does check the check box.
- Collection<?> collection = group.getModelObject();
+ Collection<?> collection = group.getDefaultModelObject();
// check for npe in group's model object
if (collection == null)
@@ -140,7 +140,7 @@
}
}
}
- else if (collection.contains(getModelObject()))
+ else if (collection.contains(getDefaultModelObject()))
{
tag.put("checked", "checked");
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java Wed Jun 18 09:21:33 2008
@@ -77,7 +77,7 @@
{
convertInput();
updateModel();
- onSelectionChanged(getModelObject());
+ onSelectionChanged(getDefaultModelObject());
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java Wed Jun 18 09:21:33 2008
@@ -144,7 +144,7 @@
}
// assign the value of the group's model
- collection.add(checkbox.getModelObject());
+ collection.add(checkbox.getDefaultModelObject());
}
}
}
@@ -157,11 +157,11 @@
@Override
public void updateModel()
{
- Collection<T> collection = getModelObject();
+ Collection<T> collection = getDefaultModelObject();
if (collection == null)
{
collection = getConvertedInput();
- setModelObject(collection);
+ setDefaultModelObject(collection);
}
else
{
@@ -203,7 +203,7 @@
{
convertInput();
updateModel();
- onSelectionChanged(getModelObject());
+ onSelectionChanged(getDefaultModelObject());
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java Wed Jun 18 09:21:33 2008
@@ -155,7 +155,7 @@
{
convertInput();
updateModel();
- onSelectionChanged(getModelObject());
+ onSelectionChanged(getDefaultModelObject());
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java Wed Jun 18 09:21:33 2008
@@ -1081,7 +1081,7 @@
*/
public void updateModel()
{
- setModelObject(getConvertedInput());
+ setDefaultModelObject(getConvertedInput());
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java Wed Jun 18 09:21:33 2008
@@ -195,7 +195,7 @@
@Override
public final String getModelValue()
{
- final Collection<T> selectedValues = getModelObject();
+ final Collection<T> selectedValues = getDefaultModelObject();
final AppendingStringBuffer buffer = new AppendingStringBuffer();
if (selectedValues != null)
{
@@ -313,10 +313,10 @@
@Override
public void updateModel()
{
- Collection<T> selectedValues = getModelObject();
+ Collection<T> selectedValues = getDefaultModelObject();
if (selectedValues != null)
{
- if (getModelObject() != selectedValues)
+ if (getDefaultModelObject() != selectedValues)
{
throw new WicketRuntimeException(
"Updating a ListMultipleChoice works by modifying the underlying model object in-place, so please make sure that getObject() always returns the same Collection instance!");
@@ -329,7 +329,7 @@
// call model.setObject()
try
{
- getModel().setObject(selectedValues);
+ getDefaultModel().setObject(selectedValues);
}
catch (Exception e)
{
@@ -341,7 +341,7 @@
else
{
selectedValues = getConvertedInput();
- setModelObject(selectedValues);
+ setDefaultModelObject(selectedValues);
}
}
}
\ No newline at end of file
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java Wed Jun 18 09:21:33 2008
@@ -123,7 +123,7 @@
tag.put("checked", "checked");
}
}
- else if (Objects.equal(group.getModelObject(), getModelObject()))
+ else if (Objects.equal(group.getDefaultModelObject(), getDefaultModelObject()))
{
tag.put("checked", "checked");
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java Wed Jun 18 09:21:33 2008
@@ -315,7 +315,7 @@
{
convertInput();
updateModel();
- onSelectionChanged(getModelObject());
+ onSelectionChanged(getDefaultModelObject());
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java Wed Jun 18 09:21:33 2008
@@ -126,7 +126,7 @@
// assign the value of the group's model
- return choice.getModelObject();
+ return choice.getDefaultModelObject();
}
return null;
}
@@ -150,7 +150,7 @@
{
convertInput();
updateModel();
- onSelectionChanged(getModelObject());
+ onSelectionChanged(getDefaultModelObject());
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java Wed Jun 18 09:21:33 2008
@@ -112,7 +112,7 @@
// Only update the model if one was passed in
if (hasExplicitModel)
{
- setModelObject(getConvertedInput());
+ setDefaultModelObject(getConvertedInput());
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java Wed Jun 18 09:21:33 2008
@@ -294,14 +294,14 @@
@Override
public void updateModel()
{
- final Collection<FileUpload> collection = getModelObject();
+ final Collection<FileUpload> collection = getDefaultModelObject();
// figure out if there is an existing model object collection for us to
// reuse
if (collection == null)
{
// no existing collection, push the one we created
- setModelObject(getConvertedInput());
+ setDefaultModelObject(getConvertedInput());
}
else
{
@@ -314,7 +314,7 @@
// push the collection in case the model is listening to
// setobject calls
- setModelObject(collection);
+ setDefaultModelObject(collection);
}
}
@@ -340,7 +340,7 @@
inputArrayCache = null;
// clean up the model because we don't want FileUpload objects in session
- Collection<FileUpload> modelObject = getModelObject();
+ Collection<FileUpload> modelObject = getDefaultModelObject();
if (modelObject != null)
{
modelObject.clear();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Wed Jun 18 09:21:33 2008
@@ -280,7 +280,7 @@
// check if the model contains a resource, if so, load the resource from
// the model.
- Object modelObject = component.getModelObject();
+ Object modelObject = component.getDefaultModelObject();
if (modelObject instanceof ResourceReference)
{
resourceReference = (ResourceReference)modelObject;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java Wed Jun 18 09:21:33 2008
@@ -134,7 +134,7 @@
@Override
public void onClick()
{
- final File file = getModelObject();
+ final File file = getDefaultModelObject();
if (file == null)
{
throw new IllegalStateException(getClass().getName() +
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java Wed Jun 18 09:21:33 2008
@@ -148,9 +148,9 @@
{
disableLink(tag);
}
- else if (getModel() != null)
+ else if (getDefaultModel() != null)
{
- Object hrefValue = getModelObject();
+ Object hrefValue = getDefaultModelObject();
if (hrefValue != null)
{
String url = hrefValue.toString();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java Wed Jun 18 09:21:33 2008
@@ -54,7 +54,7 @@
*/
public T getObject()
{
- return listView.getModelObject().get(index);
+ return listView.getDefaultModelObject().get(index);
}
/**
@@ -62,7 +62,7 @@
*/
public void setObject(T object)
{
- listView.getModelObject().set(index, object);
+ listView.getDefaultModelObject().set(index, object);
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java Wed Jun 18 09:21:33 2008
@@ -173,7 +173,7 @@
*/
public final List<T> getList()
{
- final List<T> list = getModelObject();
+ final List<T> list = getDefaultModelObject();
if (list == null)
{
return Collections.emptyList();
@@ -217,7 +217,7 @@
{
int size = viewSize;
- final Object modelObject = getModelObject();
+ final Object modelObject = getDefaultModelObject();
if (modelObject == null)
{
return size == Integer.MAX_VALUE ? 0 : size;
@@ -268,7 +268,7 @@
@Override
public void onClick()
{
- final int index = getList().indexOf(item.getModelObject());
+ final int index = getList().indexOf(item.getDefaultModelObject());
if (index != -1)
{
addStateChange(new Change()
@@ -299,7 +299,7 @@
{
super.onBeforeRender();
setAutoEnable(false);
- if (getList().indexOf(item.getModelObject()) == (getList().size() - 1))
+ if (getList().indexOf(item.getDefaultModelObject()) == (getList().size() - 1))
{
setEnabled(false);
}
@@ -330,7 +330,7 @@
@Override
public void onClick()
{
- final int index = getList().indexOf(item.getModelObject());
+ final int index = getList().indexOf(item.getDefaultModelObject());
if (index != -1)
{
@@ -362,7 +362,7 @@
{
super.onBeforeRender();
setAutoEnable(false);
- if (getList().indexOf(item.getModelObject()) == 0)
+ if (getList().indexOf(item.getDefaultModelObject()) == 0)
{
setEnabled(false);
}
@@ -397,8 +397,8 @@
{
private static final long serialVersionUID = 1L;
- final int oldIndex = getList().indexOf(item.getModelObject());
- final T removedObject = item.getModelObject();
+ final int oldIndex = getList().indexOf(item.getDefaultModelObject());
+ final T removedObject = item.getDefaultModelObject();
@Override
public void undo()
@@ -411,7 +411,7 @@
item.modelChanging();
// Remove item and invalidate listView
- getList().remove(item.getModelObject());
+ getList().remove(item.getDefaultModelObject());
ListView.this.modelChanged();
ListView.this.removeAll();
@@ -518,7 +518,7 @@
*/
protected ListItem<T> newItem(final int index)
{
- return new ListItem<T>(index, getListItemModel(getModel(), index));
+ return new ListItem<T>(index, getListItemModel(getDefaultModel(), index));
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java Wed Jun 18 09:21:33 2008
@@ -110,7 +110,7 @@
*/
public final int getIterations()
{
- return (getModelObject()).intValue();
+ return (getDefaultModelObject()).intValue();
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java Wed Jun 18 09:21:33 2008
@@ -138,7 +138,7 @@
@Override
public int getViewSize()
{
- if (getModelObject() != null)
+ if (getDefaultModelObject() != null)
{
super.setStartIndex(getCurrentPage() * getRowsPerPage());
super.setViewSize(getRowsPerPage());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java Wed Jun 18 09:21:33 2008
@@ -424,6 +424,6 @@
*/
private void setIterations(int i)
{
- setModelObject(new Integer(i));
+ setDefaultModelObject(new Integer(i));
}
}
\ No newline at end of file
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java Wed Jun 18 09:21:33 2008
@@ -60,7 +60,7 @@
@Override
protected void onSubmit()
{
- ClientPropertiesBean propertiesBean = getModelObject();
+ ClientPropertiesBean propertiesBean = getDefaultModelObject();
WebRequestCycle requestCycle = (WebRequestCycle)getRequestCycle();
WebSession session = (WebSession)getSession();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java Wed Jun 18 09:21:33 2008
@@ -69,7 +69,7 @@
@Override
protected void populateItem(final ListItem<FeedbackMessage> listItem)
{
- final FeedbackMessage message = listItem.getModelObject();
+ final FeedbackMessage message = listItem.getDefaultModelObject();
message.markRendered();
final IModel<String> replacementModel = new Model<String>()
{
@@ -202,7 +202,7 @@
*/
public final FeedbackMessagesModel getFeedbackMessagesModel()
{
- return (FeedbackMessagesModel)messageListView.getModel();
+ return (FeedbackMessagesModel)messageListView.getDefaultModel();
}
/**
@@ -295,7 +295,7 @@
*/
protected final List<FeedbackMessage> getCurrentMessages()
{
- final List<FeedbackMessage> messages = messageListView.getModelObject();
+ final List<FeedbackMessage> messages = messageListView.getDefaultModelObject();
return Collections.unmodifiableList(messages);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Wed Jun 18 09:21:33 2008
@@ -276,7 +276,7 @@
protected void onDetach()
{
super.onDetach();
- Object object = getModelObject();
+ Object object = getDefaultModelObject();
if (object instanceof IDetachable)
{
((IDetachable)object).detach();
@@ -364,7 +364,7 @@
// nodeToItemMAp
if (component instanceof TreeItem)
{
- nodeToItemMap.remove(((TreeItem)component).getModelObject());
+ nodeToItemMap.remove(((TreeItem)component).getDefaultModelObject());
}
super.remove(component);
}
@@ -555,7 +555,7 @@
// has been called
if (rootItem == null)
{
- Object rootNode = ((TreeModel)getModelObject()).getRoot();
+ Object rootNode = ((TreeModel)getDefaultModelObject()).getRoot();
if (rootNode != null)
{
if (isRootLess())
@@ -689,9 +689,9 @@
// if the tree is in rootless mode, make sure the root node is
// expanded
- if (rootLess == true && getModelObject() != null)
+ if (rootLess == true && getDefaultModelObject() != null)
{
- getTreeState().expandNode(((TreeModel)getModelObject()).getRoot());
+ getTreeState().expandNode(((TreeModel)getDefaultModelObject()).getRoot());
}
}
}
@@ -706,7 +706,7 @@
{
if (rootItem != null)
{
- invalidateNode(rootItem.getModelObject(), true);
+ invalidateNode(rootItem.getDefaultModelObject(), true);
}
}
else
@@ -750,7 +750,7 @@
// invalidate the node and it's children, so that they are
// redrawn
- invalidateNodeWithChildren(item.getModelObject());
+ invalidateNodeWithChildren(item.getDefaultModelObject());
}
}
@@ -823,7 +823,7 @@
removeItem(item);
// deselect the node
- getTreeState().selectNode(item.getModelObject(), false);
+ getTreeState().selectNode(item.getDefaultModelObject(), false);
}
});
@@ -1012,7 +1012,7 @@
protected final boolean isNodeExpanded(Object node)
{
// In root less mode the root node is always expanded
- if (isRootLess() && rootItem != null && rootItem.getModelObject().equals(node))
+ if (isRootLess() && rootItem != null && rootItem.getDefaultModelObject().equals(node))
{
return true;
}
@@ -1066,10 +1066,10 @@
List<TreeItem> items;
// if the node is expanded
- if (isNodeExpanded(item.getModelObject()))
+ if (isNodeExpanded(item.getDefaultModelObject()))
{
// build the items for children of the items' treenode.
- items = buildTreeItems(item, nodeChildren(item.getModelObject()), item.getLevel() + 1);
+ items = buildTreeItems(item, nodeChildren(item.getDefaultModelObject()), item.getLevel() + 1);
}
else
{
@@ -1118,7 +1118,7 @@
private final void checkModel()
{
// find out whether the model object (the TreeModel) has been changed
- TreeModel model = (TreeModel)getModelObject();
+ TreeModel model = (TreeModel)getDefaultModelObject();
if (model != previousModel)
{
if (previousModel != null)
@@ -1376,7 +1376,7 @@
else
{
TreeItem parent = item.getParentItem();
- return parent == null ? null : parent.getModelObject();
+ return parent == null ? null : parent.getDefaultModelObject();
}
}
@@ -1448,7 +1448,7 @@
private TreeModel getTreeModel()
{
- return (TreeModel)getModelObject();
+ return (TreeModel)getDefaultModelObject();
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Wed Jun 18 09:21:33 2008
@@ -100,13 +100,13 @@
protected void populateTreeItem(WebMarkupContainer item, int level)
{
// add junction link
- Object node = item.getModelObject();
+ Object node = item.getDefaultModelObject();
Component junctionLink = newJunctionLink(item, JUNCTION_LINK_ID, node);
junctionLink.setComponentBorder(new JunctionBorder(node, level));
item.add(junctionLink);
// add node component
- Component nodeComponent = newNodeComponent(NODE_COMPONENT_ID, item.getModel());
+ Component nodeComponent = newNodeComponent(NODE_COMPONENT_ID, item.getDefaultModel());
item.add(nodeComponent);
// add behavior that conditionally adds the "selected" CSS class name
@@ -117,7 +117,7 @@
@Override
public void onComponentTag(Component component, ComponentTag tag)
{
- Object node = component.getModelObject();
+ Object node = component.getDefaultModelObject();
String klass = getItemClass(node);
if (!Strings.isEmpty(klass))
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java Wed Jun 18 09:21:33 2008
@@ -110,7 +110,7 @@
*/
protected ResourceReference getImageResourceReference(BaseTree tree, Object node)
{
- TreeModel model = (TreeModel)tree.getModelObject();
+ TreeModel model = (TreeModel)tree.getDefaultModelObject();
if (model.isLeaf(node))
{
return getResourceItemLeaf(node);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java Wed Jun 18 09:21:33 2008
@@ -61,7 +61,7 @@
while (existingItems.hasNext())
{
final Item<T> item = existingItems.next();
- modelToItem.put(item.getModel(), item);
+ modelToItem.put(item.getDefaultModel(), item);
}
return new Iterator<Item<T>>()
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java Wed Jun 18 09:21:33 2008
@@ -262,7 +262,7 @@
if (value == null)
{
value = Strings.toString(PropertyResolver.getValue(variableName,
- getParent().getModelObject()));
+ getParent().getDefaultModelObject()));
}
// If still not found, try the component itself
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java Wed Jun 18 09:21:33 2008
@@ -420,12 +420,12 @@
}
else if (formComponent instanceof CheckGroup)
{
- final Collection<?> checkGroupValues = (Collection<?>)formComponent.getModelObject();
+ final Collection<?> checkGroupValues = (Collection<?>)formComponent.getDefaultModelObject();
formComponent.visitChildren(Check.class, new IVisitor<Component<?>>()
{
public Object component(Component<?> component)
{
- if (checkGroupValues.contains(component.getModelObject()))
+ if (checkGroupValues.contains(component.getDefaultModelObject()))
{
addFormComponentValue(formComponent,
((Check<?>)component).getValue());
@@ -439,14 +439,14 @@
// TODO 1.5: see if all these transformations can be factored out into
// checkgroup/radiogroup by them implementing some sort of interface {
// getValue(); } otherwise all these implementation details leak into the tester
- final Object value = formComponent.getModelObject();
+ final Object value = formComponent.getDefaultModelObject();
if (value != null)
{
formComponent.visitChildren(Radio.class, new IVisitor<Component<?>>()
{
public Object component(Component<?> component)
{
- if (value.equals(component.getModelObject()))
+ if (value.equals(component.getDefaultModelObject()))
{
addFormComponentValue(formComponent,
((Radio<?>)component).getValue());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java Wed Jun 18 09:21:33 2008
@@ -470,7 +470,7 @@
public void assertModelValue(String path, Object expectedValue)
{
Component component = getComponentFromLastRenderedPage(path);
- Assert.assertEquals(expectedValue, component.getModelObject());
+ Assert.assertEquals(expectedValue, component.getDefaultModelObject());
}
/**
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java Wed Jun 18 09:21:33 2008
@@ -65,7 +65,7 @@
this.component = component;
// Get component model
- final IModel<T> model = component.getModel();
+ final IModel<T> model = component.getDefaultModel();
// If the component has a model, it's about to change!
if (model != null)
@@ -79,7 +79,7 @@
if (component instanceof FormComponent)
{
// and it's using the same model as the form
- if (((FormComponent<T>)component).getForm().getModel() == model)
+ if (((FormComponent<T>)component).getForm().getDefaultModel() == model)
{
// we don't need to clone the model, because it will
// be re-initialized using initModel()
@@ -89,7 +89,7 @@
else
{
// If the component is using the same model as the page
- if (component.getPage().getModel() == model)
+ if (component.getPage().getDefaultModel() == model)
{
// we don't need to clone the model, because it will
// be re-initialized using initModel()
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java Wed Jun 18 09:21:33 2008
@@ -64,8 +64,8 @@
AjaxFormSubmitTestPage page = (AjaxFormSubmitTestPage)tester.getLastRenderedPage();
assertFalse((page.getFormSubmitted() & AjaxFormSubmitTestPage.FORM) == AjaxFormSubmitTestPage.FORM);
assertTrue((page.getFormSubmitted() & AjaxFormSubmitTestPage.BUTTON) == AjaxFormSubmitTestPage.BUTTON);
- assertEquals("foo", tester.getComponentFromLastRenderedPage("form:txt1").getModelObject());
- assertEquals("bar", tester.getComponentFromLastRenderedPage("form:txt2").getModelObject());
+ assertEquals("foo", tester.getComponentFromLastRenderedPage("form:txt1").getDefaultModelObject());
+ assertEquals("bar", tester.getComponentFromLastRenderedPage("form:txt2").getDefaultModelObject());
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/MyTable.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/MyTable.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/MyTable.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/MyTable.java Wed Jun 18 09:21:33 2008
@@ -46,7 +46,7 @@
protected void populateItem(ListItem listItem)
{
- String txt = (String)listItem.getModelObject();
+ String txt = (String)listItem.getDefaultModelObject();
listItem.add(new Label("txt", txt));
}
@@ -64,6 +64,6 @@
list.add("row: " + String.valueOf(i));
}
- setModelObject(list);
+ setDefaultModelObject(list);
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java Wed Jun 18 09:21:33 2008
@@ -120,10 +120,10 @@
Model model = new Model((Serializable)list);
final CheckGroup group2 = new CheckGroup("group2", model);
- assertTrue(group2.getModelObject() == list);
+ assertTrue(group2.getDefaultModelObject() == list);
final CheckGroup group3 = new CheckGroup("group3", list);
- assertTrue(group3.getModelObject() == list);
+ assertTrue(group3.getDefaultModelObject() == list);
// set up necessary objects to emulate a form submission
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java Wed Jun 18 09:21:33 2008
@@ -162,15 +162,15 @@
tester.getServletRequest().setParameter(group2.getInputName(), choice3.getValue());
form.onFormSubmitted();
assertEquals("group: running with choice1 selected - model must be set to value of radio1",
- modelObject.getProp1(), choice1.getModelObject());
+ modelObject.getProp1(), choice1.getDefaultModelObject());
assertEquals(
"group2: running with choice3 selected - model must be set to value of radio1",
- model.getObject(), choice3.getModelObject());
+ model.getObject(), choice3.getDefaultModelObject());
tester.getServletRequest().setParameter(group.getInputName(), choice2.getValue());
form.onFormSubmitted();
assertEquals("group: running with choice2 selected - model must be set to value of radio2",
- modelObject.getProp1(), choice2.getModelObject());
+ modelObject.getProp1(), choice2.getDefaultModelObject());
tester.getServletRequest().setParameter(group2.getInputName(), choice1.getValue());
try
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java Wed Jun 18 09:21:33 2008
@@ -134,7 +134,7 @@
// save means: add it to the respone
// load means: take it from request
assertEquals("test", textField.getModelObjectAsString());
- textField.setModelObject("new text");
+ textField.setDefaultModelObject("new text");
assertEquals("new text", textField.getModelObjectAsString());
copyCookieFromResponseToRequest(cycle);
assertEquals(1, getRequestCookies(cycle).length);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java Wed Jun 18 09:21:33 2008
@@ -34,7 +34,7 @@
public boolean isVisible()
{
- return getModelObject() != null;
+ return getDefaultModelObject() != null;
}
});
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java Wed Jun 18 09:21:33 2008
@@ -53,7 +53,7 @@
protected void populateItem(ListItem listItem)
{
- String txt = (String)listItem.getModelObject();
+ String txt = (String)listItem.getDefaultModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java Wed Jun 18 09:21:33 2008
@@ -53,7 +53,7 @@
protected void populateItem(ListItem listItem)
{
- String txt = (String)listItem.getModelObject();
+ String txt = (String)listItem.getDefaultModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java Wed Jun 18 09:21:33 2008
@@ -197,7 +197,7 @@
assertTrue(link.isEnabled());
// add entries to the model list.
- List modelData = (List)page.get("table").getModelObject();
+ List modelData = (List)page.get("table").getDefaultModelObject();
modelData.add("add-1");
modelData.add("add-2");
modelData.add("add-3");
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java Wed Jun 18 09:21:33 2008
@@ -64,7 +64,7 @@
protected void populateItem(ListItem listItem)
{
- String txt = (String)listItem.getModelObject();
+ String txt = (String)listItem.getDefaultModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java Wed Jun 18 09:21:33 2008
@@ -62,7 +62,7 @@
protected void populateItem(ListItem listItem)
{
- String txt = (String)listItem.getModelObject();
+ String txt = (String)listItem.getDefaultModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java Wed Jun 18 09:21:33 2008
@@ -47,7 +47,7 @@
protected void populateItem(ListItem listItem)
{
- String txt = (String)listItem.getModelObject();
+ String txt = (String)listItem.getDefaultModelObject();
listItem.add(new Label("txt", txt));
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java Wed Jun 18 09:21:33 2008
@@ -46,7 +46,7 @@
protected void populateItem(ListItem listItem)
{
- String txt = (String)listItem.getModelObject();
+ String txt = (String)listItem.getDefaultModelObject();
listItem.add(new Label("txt", txt));
}
});
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java Wed Jun 18 09:21:33 2008
@@ -46,7 +46,7 @@
protected void populateItem(ListItem listItem)
{
- String txt = (String)listItem.getModelObject();
+ String txt = (String)listItem.getDefaultModelObject();
listItem.add(new Label("txt", txt));
}
});
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java Wed Jun 18 09:21:33 2008
@@ -66,12 +66,12 @@
parent.add(label);
parent.setModel(new CompoundPropertyModel(data1));
- assertEquals("foo", label.getModelObject());
+ assertEquals("foo", label.getDefaultModelObject());
parent.setModel(new CompoundPropertyModel(data2));
- assertEquals("bar", label.getModelObject());
+ assertEquals("bar", label.getDefaultModelObject());
data2.put("label", "foo");
- assertEquals("foo", label.getModelObject());
+ assertEquals("foo", label.getDefaultModelObject());
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java Wed Jun 18 09:21:33 2008
@@ -70,7 +70,7 @@
*/
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/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java Wed Jun 18 09:21:33 2008
@@ -52,7 +52,7 @@
*/
protected void onSubmit()
{
- info("Submitted text: " + field.getModelObject());
+ info("Submitted text: " + field.getDefaultModelObject());
}
};
statelessForm.add(field);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java Wed Jun 18 09:21:33 2008
@@ -123,7 +123,7 @@
getPage().removePersistedFormData(SignInForm.class, true);
}
- ValueMap values = (ValueMap)getModelObject();
+ ValueMap values = (ValueMap)getDefaultModelObject();
String username = values.getString("username");
String password = values.getString("password");
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java Wed Jun 18 09:21:33 2008
@@ -151,7 +151,7 @@
@Override
protected void populateItem(ListItem<S> item)
{
- item.add(new Check<S>("check", new Model<S>(item.getModelObject())));
+ item.add(new Check<S>("check", new Model<S>(item.getDefaultModelObject())));
}
};
@@ -169,7 +169,7 @@
@Override
protected void populateItem(ListItem<Book> item)
{
- item.add(new Radio<Book>("radio", new Model<Book>(item.getModelObject())));
+ item.add(new Radio<Book>("radio", new Model<Book>(item.getDefaultModelObject())));
}
};
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.java?rev=669210&r1=669209&r2=669210&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/ResultPage.java Wed Jun 18 09:21:33 2008
@@ -42,6 +42,6 @@
{
super(new Model<String>(label));
- add(new Label<String>("label", getModel()));
+ add(new Label<String>("label", getDefaultModel()));
}
}