Author: ehillenius
Date: Tue Jan 30 12:33:55 2007
New Revision: 501547
URL: http://svn.apache.org/viewvc?view=rev&rev=501547
Log:
fixes
Modified:
incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/DetachableContactModel.java
incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/Home.java
Modified:
incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/DetachableContactModel.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/DetachableContactModel.java?view=diff&rev=501547&r1=501546&r2=501547
==============================================================================
---
incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/DetachableContactModel.java
(original)
+++
incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/DetachableContactModel.java
Tue Jan 30 12:33:55 2007
@@ -1,6 +1,7 @@
/*
- * $Id: DetachableContactModel.java 5394 2006-04-16 06:36:52 -0700 (Sun, 16
Apr 2006) jdonnerstag $
- * $Revision: 5394 $ $Date: 2006-04-16 06:36:52 -0700 (Sun, 16 Apr 2006) $
+ * $Id: DetachableContactModel.java 5832 2006-05-24 05:36:28 +0000 (Wed, 24 May
+ * 2006) ivaynberg $ $Revision: 501283 $ $Date: 2006-05-24 05:36:28 +0000 (Wed,
+ * 24 May 2006) $
*
* ====================================================================
Licensed
* under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -18,8 +19,7 @@
package wicket.threadtest.apps.app1;
import wicket.markup.repeater.IItemReuseStrategy;
-import wicket.markup.repeater.ReuseIfModelsEqualStrategy;
-import wicket.model.AbstractReadOnlyDetachableModel;
+import wicket.model.LoadableDetachableModel;
/**
* detachable model for an instance of contact
@@ -27,23 +27,26 @@
* @author igor
*
*/
-public class DetachableContactModel extends
AbstractReadOnlyDetachableModel<Contact> {
- private transient Contact contact;
-
+public class DetachableContactModel extends LoadableDetachableModel<Contact> {
private long id;
/**
* @param c
*/
- public DetachableContactModel(Contact c) {
- this(c.getId());
- contact = c;
+ public DetachableContactModel(final Contact c) {
+ super(c);
+ if (c == null) {
+ throw new IllegalArgumentException();
+
+ }
+ id = c.getId();
+
}
/**
* @param id
*/
- public DetachableContactModel(long id) {
+ public DetachableContactModel(final long id) {
if (id == 0) {
throw new IllegalArgumentException();
}
@@ -53,13 +56,17 @@
/**
* used for dataview with ReuseIfModelsEqualStrategy item reuse strategy
*
- * @see AbstractPageableView#setItemReuseStrategy(IItemReuseStrategy)
- * @see ReuseIfModelsEqualStrategy
+ * @see
wicket.markup.repeater.PageableRefreshingView#setItemReuseStrategy(IItemReuseStrategy)
+ * @see wicket.markup.repeater.ReuseIfModelsEqualStrategy
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
- public boolean equals(Object obj) {
- if (obj instanceof DetachableContactModel) {
+ public boolean equals(final Object obj) {
+ if (obj == this) {
+ return true;
+ } else if (obj == null) {
+ return false;
+ } else if (obj instanceof DetachableContactModel) {
DetachableContactModel other = (DetachableContactModel)
obj;
return other.id == this.id;
}
@@ -78,20 +85,12 @@
return DatabaseLocator.getDatabase();
}
+ /**
+ * @see wicket.model.LoadableDetachableModel#load()
+ */
@Override
- protected void onAttach() {
- if (contact == null) {
- contact = getContactsDB().get(id);
- }
- }
-
- @Override
- protected void onDetach() {
- contact = null;
- }
-
- @Override
- protected Contact onGetObject() {
- return contact;
+ protected Contact load() {
+ // loads contact from the database
+ return getContactsDB().get(id);
}
-}
\ No newline at end of file
+}
Modified:
incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/Home.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/Home.java?view=diff&rev=501547&r1=501546&r2=501547
==============================================================================
---
incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/Home.java
(original)
+++
incubator/wicket/trunk/wicket-threadtest/src/main/java/wicket/threadtest/apps/app1/Home.java
Tue Jan 30 12:33:55 2007
@@ -112,7 +112,8 @@
};
new TextField<String>(this,
"stringProperty").setRequired(true).setLabel(new Model<String>("String"));
- new TextField<Integer>(this, "integerProperty",
Integer.class).setRequired(true).add(NumberValidator.POSITIVE);
+ new TextField<Integer>(this, "integerProperty",
Integer.class).setRequired(true).add(
+ NumberValidator.POSITIVE);
new TextField<Double>(this, "doubleProperty",
Double.class).setRequired(true);
// we have a component attached to the label here, as
we want to
// synchronize the
@@ -122,8 +123,8 @@
WebMarkupContainer dateLabel = new
WebMarkupContainer(this, "dateLabel");
TextField datePropertyTextField = new
TextField<Date>(this, "dateProperty", Date.class);
new DatePicker(this, "datePicker", dateLabel,
datePropertyTextField);
- new TextField<Integer>(this, "integerInRangeProperty",
Integer.class).add(NumberValidator.range(0,
- 100)).setRequired(true);
+ new TextField<Integer>(this, "integerInRangeProperty",
Integer.class).add(NumberValidator.range(0, 100))
+ .setRequired(true);
new CheckBox(this, "booleanProperty");
RadioChoice<String> rc = new RadioChoice<String>(this,
"numberRadioChoice", NUMBERS).setSuffix("");
rc.setLabel(new Model<String>("number"));
@@ -286,7 +287,7 @@
* @see
wicket.markup.html.form.DropDownChoice#onSelectionChanged(java.lang.Object)
*/
@Override
- public void onSelectionChanged(Object newSelection) {
+ public void onSelectionChanged(Locale newSelection) {
// note that we don't have to do anything here, as our
property
// model allready calls FormInput.setLocale when the
model is
// updated
