svn commit: r526723 - /incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java

[jcompagner]

Author: jcompagner
Date: Mon Apr  9 05:09:31 2007
New Revision: 526723

URL: http://svn.apache.org/viewvc?view=rev&rev=526723
Log:
fix for detaching inheritable models (we have to set a flag) 
(reorded the flags a bit, it was a bit messy)
AjaxEditLabel initialization fixed

Modified:
    
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/AjaxEditableLabel.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=526723&r1=526722&r2=526723
==============================================================================
--- 
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 Apr  9 05:09:31 2007
@@ -72,9 +72,6 @@
 {
        private static final long serialVersionUID = 1L;
 
-       /** temporary model to lazily initialize the label and editor. */
-       private transient IModel tempModel;
-
        /** editor component. */
        private FormComponent editor;
 
@@ -166,8 +163,6 @@
        {
                super(id);
                setOutputMarkupId(true);
-               IModel model = getParentModel();
-               this.tempModel = model;
        }
 
        /**
@@ -180,11 +175,10 @@
        {
                super(id, model);
                setOutputMarkupId(true);
-               if (model == null)
+               if (model != null)
                {
-                       model = getParentModel();
+                       initLabelAndEditor(model);
                }
-               this.tempModel = model;
        }
 
        /**
@@ -311,7 +305,7 @@
        {
                if (editor == null)
                {
-                       initLabelAndEditor();
+                       initLabelAndEditor(getParentModel());
                }
                return editor;
        }
@@ -334,9 +328,9 @@
                super.onAttach();
                // if tempModel - set on construction - is not-null, the label 
and
                // editor components have not yet been set.
-               if (tempModel != null)
+               if (editor == null)
                {
-                       initLabelAndEditor();
+                       initLabelAndEditor(getParentModel());
                }
        }
 
@@ -414,14 +408,14 @@
        /**
         * Lazy initialization of the label and editor components and set 
tempModel
         * to null.
+        * @param model The model for the label and editor
         */
-       private void initLabelAndEditor()
+       private void initLabelAndEditor(IModel model)
        {
-               editor = newEditor(this, "editor", tempModel);
-               label = newLabel(this, "label", tempModel);
+               editor = newEditor(this, "editor", model);
+               label = newLabel(this, "label", model);
                add(label);
                add(editor);
-               this.tempModel = null;
        }
        
        /**