You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2007/03/19 17:34:46 UTC
svn commit: r520006 - in
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src:
main/java/wicket/extensions/ajax/markup/html/
main/java/wicket/extensions/markup/html/form/
main/java/wicket/extensions/markup/html/form/palette/ main/java/wi...
Author: jcompagner
Date: Mon Mar 19 09:34:44 2007
New Revision: 520006
URL: http://svn.apache.org/viewvc?view=rev&rev=520006
Log:
model and validators backmerge from 2.0
Please test if everything works like it should..
Added:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/validation/
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/validation/validator/
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/test/java/wicket/extensions/validation/
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/test/java/wicket/extensions/validation/validator/
Removed:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/validation/RfcCompliantEmailAddressPatternValidator.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/test/java/wicket/extensions/markup/html/form/validation/RfcCompliantEmailValidatorTest.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/DateTextField.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/palette/Palette.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/select/Select.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tabs/TabbedPanel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/Tree.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/TreeTable.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/model/AbstractCheckBoxModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/rating/RatingPanel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/util/resource/TextTemplateHeaderContributor.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/StaticContentStep.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/WizardStep.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Mon Mar 19 09:34:44 2007
@@ -16,6 +16,8 @@
*/
package wicket.extensions.ajax.markup.html;
+import java.io.Serializable;
+
import wicket.Component;
import wicket.MarkupContainer;
import wicket.RequestCycle;
@@ -27,11 +29,10 @@
import wicket.markup.html.basic.Label;
import wicket.markup.html.form.FormComponent;
import wicket.markup.html.form.TextField;
-import wicket.markup.html.form.validation.IValidator;
import wicket.markup.html.panel.Panel;
-import wicket.model.AbstractModel;
import wicket.model.IModel;
import wicket.util.string.JavascriptUtils;
+import wicket.validation.IValidator;
/**
* An implementation of ajaxified edit-in-place component using a
@@ -157,32 +158,6 @@
}
/**
- * Model that allows other components to benefit of the compound model that
- * AjaxEditableLabel inherits.
- */
- private final class PassThroughModel extends AbstractModel
- {
- private static final long serialVersionUID = 1L;
-
- /**
- * @see wicket.model.IModel#getObject(wicket.Component)
- */
- public Object getObject(Component component)
- {
- return getModel().getObject(AjaxEditableLabel.this);
- }
-
- /**
- * @see wicket.model.IModel#setObject(wicket.Component,
- * java.lang.Object)
- */
- public void setObject(Component component, Object object)
- {
- getModel().setObject(AjaxEditableLabel.this, object);
- }
- }
-
- /**
* Constructor
*
* @param id
@@ -191,7 +166,8 @@
{
super(id);
setOutputMarkupId(true);
- this.tempModel = new PassThroughModel();
+ IModel model = getParentModel();
+ this.tempModel = model;
}
/**
@@ -204,7 +180,11 @@
{
super(id, model);
setOutputMarkupId(true);
- this.tempModel = (model != null) ? model : new PassThroughModel();
+ if (model == null)
+ {
+ model = getParentModel();
+ }
+ this.tempModel = model;
}
/**
@@ -401,10 +381,10 @@
*/
protected void onError(AjaxRequestTarget target)
{
- String errorMessage = editor.getFeedbackMessage().getMessage();
- if (errorMessage != null)
+ Serializable errorMessage = editor.getFeedbackMessage().getMessage();
+ if (errorMessage instanceof String)
{
- target.appendJavascript("window.status='" + JavascriptUtils.escapeQuotes(errorMessage)
+ target.appendJavascript("window.status='" + JavascriptUtils.escapeQuotes((String)errorMessage)
+ "';");
}
String editorMarkupId = editor.getMarkupId();
@@ -441,6 +421,27 @@
add(label);
add(editor);
this.tempModel = null;
+ }
+
+ /**
+ * @return Gets the parent model in case no explicit model was specified.
+ */
+ private IModel getParentModel()
+ {
+ // the #getModel() call below will resolve and assign any inheritable
+ // 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 m = getModel();
+
+ // check that a model was found
+ if (m == null)
+ {
+ throw new IllegalStateException(
+ "No model found for this component, either pass one explicitly or "
+ + "make sure an inheritable model is available");
+ }
+ return m;
}
/**
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Mon Mar 19 09:34:44 2007
@@ -103,7 +103,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject(Component c)
+ public Object getObject()
{
return new Integer(rows);
}
@@ -112,7 +112,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject(Component c)
+ public Object getObject()
{
return new Integer(cols);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/DateTextField.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/DateTextField.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/DateTextField.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/DateTextField.java Mon Mar 19 09:34:44 2007
@@ -25,7 +25,6 @@
import wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider;
import wicket.model.IModel;
import wicket.util.convert.IConverter;
-import wicket.util.convert.converters.AbstractConverter;
import wicket.util.convert.converters.DateConverter;
/**
@@ -137,6 +136,8 @@
/**
* Returns the default converter if created without pattern; otherwise it
* returns a pattern-specific converter.
+ *
+ * @param type The type for which the convertor should work
*
* @return A pattern-specific converter
*
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/palette/Palette.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/palette/Palette.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/palette/Palette.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/palette/Palette.java Mon Mar 19 09:34:44 2007
@@ -401,7 +401,7 @@
*/
public Collection getChoices()
{
- return (Collection)choicesModel.getObject(this);
+ return (Collection)choicesModel.getObject();
}
/**
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/select/Select.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/select/Select.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/select/Select.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/form/select/Select.java Mon Mar 19 09:34:44 2007
@@ -83,7 +83,7 @@
}
else
{
- getModel().setObject(this, null);
+ getModel().setObject(null);
}
/*
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java Mon Mar 19 09:34:44 2007
@@ -20,8 +20,7 @@
import wicket.Component;
import wicket.IClusterable;
import wicket.markup.html.link.Link;
-import wicket.model.AbstractModel;
-import wicket.model.IModel;
+import wicket.model.Model;
import wicket.util.lang.Objects;
import wicket.version.undo.Change;
@@ -192,23 +191,18 @@
*/
public CssModifier(final OrderByLink link, final ICssProvider provider)
{
- super("class", true, new AbstractModel()
+ super("class", true, new Model()
{
private static final long serialVersionUID = 1L;
- public IModel getNestedModel()
- {
- return null;
- }
-
- public Object getObject(Component component)
+ public Object getObject()
{
final ISortState sortState = link.stateLocator.getSortState();
return provider.getClassAttributeValue(sortState, link.property);
}
- public void setObject(Component component, Object object)
+ public void setObject(Object object)
{
throw new UnsupportedOperationException();
}
@@ -221,7 +215,7 @@
*/
public boolean isEnabled(Component component)
{
- return getReplaceModel().getObject(null) != null;
+ return getReplaceModel().getObject() != null;
}
};
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java Mon Mar 19 09:34:44 2007
@@ -17,7 +17,6 @@
package wicket.extensions.markup.html.repeater.data.table;
-import wicket.Component;
import wicket.markup.html.basic.Label;
import wicket.model.AbstractReadOnlyModel;
@@ -44,7 +43,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject(Component component)
+ public Object getObject()
{
int of = table.getRowCount();
int from = table.getCurrentPage() * table.getRowsPerPage();
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java Mon Mar 19 09:34:44 2007
@@ -17,12 +17,11 @@
package wicket.extensions.markup.html.repeater.data.table;
import wicket.AttributeModifier;
-import wicket.Component;
import wicket.markup.html.WebMarkupContainer;
import wicket.markup.html.basic.Label;
-import wicket.model.AbstractReadOnlyModel;
import wicket.model.IModel;
import wicket.model.Model;
+import wicket.model.ResourceModel;
/**
* A toolbar that displays a "no records found" message when the data table
@@ -40,17 +39,8 @@
{
private static final long serialVersionUID = 1L;
- private static final IModel DEFAULT_MESSAGE_MODEL = new AbstractReadOnlyModel()
- {
- private static final long serialVersionUID = 1L;
-
- public Object getObject(Component component)
- {
- return component.getLocalizer().getString("datatable.no-records-found", component,
- "No Records Found");
- }
- };
-
+ private static final IModel DEFAULT_MESSAGE_MODEL = new ResourceModel(
+ "datatable.no-records-found", "No Records Found");
/**
* Constructor
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Mon Mar 19 09:34:44 2007
@@ -22,8 +22,6 @@
import wicket.markup.html.form.Form;
import wicket.markup.html.form.FormComponent;
import wicket.markup.html.form.HiddenField;
-import wicket.model.AbstractModel;
-import wicket.model.IModel;
import wicket.model.Model;
/**
@@ -133,7 +131,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
- private static class FilterStateModel extends AbstractModel
+ private static class FilterStateModel extends Model
{
private static final long serialVersionUID = 1L;
@@ -156,26 +154,17 @@
}
/**
- * @see wicket.model.IModel#getNestedModel()
+ * @see wicket.model.IModel#getObject()
*/
- public IModel getNestedModel()
- {
- return null;
- }
-
- /**
- * @see wicket.model.IModel#getObject(wicket.Component)
- */
- public Object getObject(Component component)
+ public Object getObject()
{
return locator.getFilterState();
}
/**
- * @see wicket.model.IModel#setObject(wicket.Component,
- * java.lang.Object)
+ * @see wicket.model.IModel#setObject(java.lang.Object)
*/
- public void setObject(Component component, Object object)
+ public void setObject(Object object)
{
locator.setFilterState(object);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java Mon Mar 19 09:34:44 2007
@@ -16,9 +16,7 @@
*/
package wicket.extensions.markup.html.repeater.data.table.filter;
-import wicket.Component;
-import wicket.model.AbstractModel;
-import wicket.model.IModel;
+import wicket.model.Model;
/**
* Model that wraps filter state locator to make its use transparent to wicket
@@ -37,7 +35,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-class FilterStateModel extends AbstractModel
+class FilterStateModel extends Model
{
private static final long serialVersionUID = 1L;
@@ -56,25 +54,17 @@
}
/**
- * @see wicket.model.IModel#getNestedModel()
+ * @see wicket.model.IModel#getObject()
*/
- public IModel getNestedModel()
- {
- return null;
- }
-
- /**
- * @see wicket.model.IModel#getObject(wicket.Component)
- */
- public Object getObject(Component component)
+ public Object getObject()
{
return locator.getFilterState();
}
/**
- * @see wicket.model.IModel#setObject(wicket.Component, java.lang.Object)
+ * @see wicket.model.IModel#setObject(java.lang.Object)
*/
- public void setObject(Component component, Object object)
+ public void setObject(Object object)
{
locator.setFilterState(object);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tabs/TabbedPanel.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tabs/TabbedPanel.java Mon Mar 19 09:34:44 2007
@@ -119,7 +119,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject(Component component)
+ public Object getObject()
{
return new Integer(TabbedPanel.this.tabs.size());
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/Tree.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/Tree.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/Tree.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/Tree.java Mon Mar 19 09:34:44 2007
@@ -99,7 +99,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject(Component c)
+ public Object getObject()
{
return renderNode(node);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/TreeTable.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/TreeTable.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/TreeTable.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/TreeTable.java Mon Mar 19 09:34:44 2007
@@ -97,9 +97,9 @@
private static final long serialVersionUID = 1L;
/**
- * @see wicket.model.AbstractReadOnlyModel#getObject(wicket.Component)
+ * @see wicket.model.AbstractReadOnlyModel#getObject()
*/
- public Object getObject(Component c)
+ public Object getObject()
{
return renderNodeCallback.renderNode(node);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/model/AbstractCheckBoxModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/model/AbstractCheckBoxModel.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/model/AbstractCheckBoxModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/model/AbstractCheckBoxModel.java Mon Mar 19 09:34:44 2007
@@ -16,7 +16,6 @@
*/
package wicket.extensions.model;
-import wicket.Component;
import wicket.model.IModel;
/**
@@ -30,52 +29,44 @@
private static final long serialVersionUID = 1L;
/**
- * @see wicket.model.IDetachable#detach()
+ * @return true to indicate the checkbox should be selected, false otherwise
*/
- public void detach()
- {
- }
+ public abstract boolean isSelected();
/**
- * @see wicket.model.IModel#getNestedModel()
+ * Called when checkbox has been selected
+ *
*/
- public IModel getNestedModel()
- {
- return null;
- }
+ public abstract void select();
/**
- * @see wicket.model.IModel#getObject(wicket.Component)
+ * Called when checkbox is unselected
+ *
*/
- public Object getObject(Component component)
- {
- return isSelected(component) ? Boolean.TRUE : Boolean.FALSE;
- }
+ public abstract void unselect();
/**
- * Returns model's value
*
- * @param component
- * @return true to indicate the checkbox should be selected, false otherwise
+ * @see wicket.model.IModel#getObject()
*/
- public abstract boolean isSelected(Component component);
+ public final Object getObject()
+ {
+ return Boolean.valueOf(isSelected());
+ }
/**
- * @see wicket.model.IModel#setObject(wicket.Component, java.lang.Object)
+ * @see wicket.model.IModel#setObject(java.lang.Object)
*/
- public void setObject(Component component, Object object)
+ public final void setObject(Object object)
{
- boolean sel = Boolean.TRUE.equals(object);
- setSelected(component, sel);
-
+ if (Boolean.TRUE.equals(object))
+ {
+ select();
+ }
+ else
+ {
+ unselect();
+ }
}
- /**
- * Callback for setting the model's value to true or false
- *
- * @param component
- * @param sel
- * true if the checkbox is selected, false otherwise
- */
- public abstract void setSelected(Component component, boolean sel);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/rating/RatingPanel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/rating/RatingPanel.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/rating/RatingPanel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/rating/RatingPanel.java Mon Mar 19 09:34:44 2007
@@ -135,7 +135,7 @@
public boolean isEnabled()
{
- return !((Boolean)hasVoted.getObject(RatingPanel.this)).booleanValue();
+ return !((Boolean)hasVoted.getObject()).booleanValue();
}
};
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/util/resource/TextTemplateHeaderContributor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/util/resource/TextTemplateHeaderContributor.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/util/resource/TextTemplateHeaderContributor.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/util/resource/TextTemplateHeaderContributor.java Mon Mar 19 09:34:44 2007
@@ -18,10 +18,9 @@
import java.util.Map;
-import wicket.Component;
import wicket.behavior.StringHeaderContributor;
-import wicket.model.AbstractReadOnlyDetachableModel;
import wicket.model.IModel;
+import wicket.model.LoadableDetachableModel;
/**
* A header contributor that will contribute the contents of the given template
@@ -37,7 +36,7 @@
* This model holds the template and returns the interpolation of the
* template with of any of the
*/
- private static final class TemplateModel extends AbstractReadOnlyDetachableModel
+ private static final class TemplateModel extends LoadableDetachableModel
{
private static final long serialVersionUID = 1L;
@@ -71,41 +70,23 @@
this.template = template;
this.variablesModel = variablesModel;
}
-
/**
- * @see wicket.model.AbstractDetachableModel#getNestedModel()
+ * @see wicket.model.IModel#detach()
*/
- public IModel getNestedModel()
- {
- return null;
- }
-
- /**
- * @see wicket.model.AbstractDetachableModel#onAttach()
- */
- protected void onAttach()
- {
- }
-
- /**
- * @see wicket.model.AbstractDetachableModel#onDetach()
- */
- protected void onDetach()
+ public void detach()
{
if (variablesModel != null)
{
variablesModel.detach();
}
+ super.detach();
}
- /**
- * @see wicket.model.AbstractDetachableModel#onGetObject(wicket.Component)
- */
- protected Object onGetObject(Component component)
+ protected Object load()
{
if (variablesModel != null)
{
- Map variables = (Map)variablesModel.getObject(component);
+ Map variables = (Map)variablesModel.getObject();
if (variables != null)
{
return template.asString(variables);
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/StaticContentStep.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/StaticContentStep.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/StaticContentStep.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/StaticContentStep.java Mon Mar 19 09:34:44 2007
@@ -144,7 +144,7 @@
*/
public final String getContent()
{
- return (content != null) ? (String)content.getObject(this) : null;
+ return (content != null) ? (String)content.getObject() : null;
}
/**
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/WizardStep.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/WizardStep.java?view=diff&rev=520006&r1=520005&r2=520006
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/WizardStep.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/wizard/WizardStep.java Mon Mar 19 09:34:44 2007
@@ -191,7 +191,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject(Component component)
+ public Object getObject()
{
return getTitle();
}
@@ -200,7 +200,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject(Component component)
+ public Object getObject()
{
return getSummary();
}
@@ -351,7 +351,7 @@
*/
public String getSummary()
{
- return (summary != null) ? (String)summary.getObject(this) : (String)null;
+ return (summary != null) ? (String)summary.getObject() : (String)null;
}
/**
@@ -361,7 +361,7 @@
*/
public String getTitle()
{
- return (title != null) ? (String)title.getObject(this) : (String)null;
+ return (title != null) ? (String)title.getObject() : (String)null;
}
/**