svn commit: r594820 - in /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model: AbstractWrapModel.java ComponentPropertyModel.java ResourceModel.java

[jcompagner]

Author: jcompagner
Date: Wed Nov 14 02:11:51 2007
New Revision: 594820

URL: http://svn.apache.org/viewvc?rev=594820&view=rev
Log:
detach of the IWrapModel should be implemented, see WICKET-1159 

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java?rev=594820&r1=594819&r2=594820&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java
 Wed Nov 14 02:11:51 2007
@@ -44,12 +44,4 @@
        public void setObject(Object object)
        {
        }
-
-       /**
-        * @see org.apache.wicket.model.IDetachable#detach()
-        */
-       public void detach()
-       {
-       }
-
 }

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java?rev=594820&r1=594819&r2=594820&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
 Wed Nov 14 02:11:51 2007
@@ -26,8 +26,8 @@
  * @author Jonathan Locke
  */
 public class ComponentPropertyModel extends AbstractReadOnlyModel
-               implements
-                       IComponentAssignedModel
+       implements
+               IComponentAssignedModel
 {
        private static final long serialVersionUID = 1L;
 
@@ -94,7 +94,14 @@
                public Object getObject()
                {
                        return PropertyResolver.getValue(propertyName, 
component.getParent()
-                                       .getInnermostModel().getObject());
+                               .getInnermostModel()
+                               .getObject());
+               }
+
+               public void detach()
+               {
+                       super.detach();
+                       ComponentPropertyModel.this.detach();
                }
        }
 }

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java?rev=594820&r1=594819&r2=594820&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java
 Wed Nov 14 02:11:51 2007
@@ -71,7 +71,7 @@
        {
                // this shouldn't be called always wrapped!
                return 
Application.get().getResourceSettings().getLocalizer().getString(resourceKey,
-                               (Component)null, defaultValue);
+                       (Component)null, defaultValue);
        }
 
 
@@ -119,7 +119,14 @@
                public Object getObject()
                {
                        return 
Application.get().getResourceSettings().getLocalizer().getString(resourceKey,
-                                       component, defaultValue);
+                               component, defaultValue);
                }
+
+               public void detach()
+               {
+                       super.detach();
+                       ResourceModel.this.detach();
+               }
+
        }
 }