Author: ehillenius
Date: Tue Jan 30 12:31:11 2007
New Revision: 501544

URL: http://svn.apache.org/viewvc?view=rev&rev=501544
Log:
model fix

Modified:
    
incubator/wicket/trunk/wicket-spring-examples/src/main/java/wicket/spring/common/web/ContactDetachableModel.java

Modified: 
incubator/wicket/trunk/wicket-spring-examples/src/main/java/wicket/spring/common/web/ContactDetachableModel.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-spring-examples/src/main/java/wicket/spring/common/web/ContactDetachableModel.java?view=diff&rev=501544&r1=501543&r2=501544
==============================================================================
--- 
incubator/wicket/trunk/wicket-spring-examples/src/main/java/wicket/spring/common/web/ContactDetachableModel.java
 (original)
+++ 
incubator/wicket/trunk/wicket-spring-examples/src/main/java/wicket/spring/common/web/ContactDetachableModel.java
 Tue Jan 30 12:31:11 2007
@@ -18,8 +18,7 @@
  */
 package wicket.spring.common.web;
 
-import wicket.model.AbstractDetachableModel;
-import wicket.model.IModel;
+import wicket.model.LoadableDetachableModel;
 import wicket.spring.common.Contact;
 import wicket.spring.common.ContactDao;
 
@@ -31,37 +30,20 @@
  * @author Igor Vaynberg (ivaynberg)
  * 
  */
-public abstract class ContactDetachableModel extends AbstractDetachableModel {
+public abstract class ContactDetachableModel extends
+               LoadableDetachableModel<Contact> {
 
        private long id;
 
-       private transient Contact contact;
-
        public ContactDetachableModel(Contact contact) {
+               super(contact);
                this.id = contact.getId();
-               this.contact = contact;
-       }
-
-       public IModel getNestedModel() {
-               return null;
-       }
-
-       protected final void onAttach() {
-               contact = getContactDao().get(id);
-       }
-
-       protected void onDetach() {
-               contact = null;
-       }
-
-       protected Object onGetObject() {
-               return contact;
-       }
-
-       protected void onSetObject(Object object) {
-               throw new UnsupportedOperationException();
        }
 
        protected abstract ContactDao getContactDao();
 
+       @Override
+       protected Contact load() {
+               return getContactDao().get(id);
+       }
 }


Reply via email to