svn commit: r1207437 - /wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java

[pe...@apache.org]

Author: pedro
Date: Mon Nov 28 16:56:58 2011
New Revision: 1207437

URL: http://svn.apache.org/viewvc?rev=1207437&view=rev
Log:
code cleanup, removing unnecessary private method
Issue: WICKET-2459

Modified:
    wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java

Modified: wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=1207437&r1=1207436&r2=1207437&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Mon Nov 28 16:56:58 2011
@@ -30,6 +30,7 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.IObjectClassAwareModel;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.util.convert.IConverter;
 import org.apache.wicket.util.string.JavaScriptUtils;
@@ -390,7 +391,7 @@ public class AjaxEditableLabel<T> extend
 	{
 		if (editor == null)
 		{
-			initLabelAndEditor(getDelegatingParentModel());
+			initLabelAndEditor(new WrapperModel());
 		}
 		return editor;
 	}
@@ -404,7 +405,7 @@ public class AjaxEditableLabel<T> extend
 	{
 		if (label == null)
 		{
-			initLabelAndEditor(getDelegatingParentModel());
+			initLabelAndEditor(new WrapperModel());
 		}
 		return label;
 	}
@@ -419,7 +420,7 @@ public class AjaxEditableLabel<T> extend
 		// lazily add label and editor
 		if (editor == null)
 		{
-			initLabelAndEditor(getDelegatingParentModel());
+			initLabelAndEditor(new WrapperModel());
 		}
 		// obsolete with WICKET-1919
 		// label.setEnabled(isEnabledInHierarchy());
@@ -509,35 +510,41 @@ public class AjaxEditableLabel<T> extend
 	}
 
 	/**
-	 * get a model that accesses the parent model lazily. this is required since we eventually
-	 * request the parents model before the component is added to the parent.
-	 * 
-	 * @return model
+	 * Model that accesses the parent model lazily. this is required since we eventually request the
+	 * parents model before the component is added to the parent.
 	 */
-	private IModel<T> getDelegatingParentModel()
+	private class WrapperModel implements IModel<T>, IObjectClassAwareModel<T>
 	{
-		return new IModel<T>()
+
+		public T getObject()
 		{
-			private static final long serialVersionUID = 1L;
+			return getParentModel().getObject();
+		}
 
-			public T getObject()
-			{
-				return getParentModel().getObject();
-			}
+		public void setObject(final T object)
+		{
+			getParentModel().setObject(object);
+		}
+
+		public void detach()
+		{
+			getParentModel().detach();
+
+		}
 
-			public void setObject(final T object)
+		public Class<T> getObjectClass()
+		{
+			if (getParentModel() instanceof IObjectClassAwareModel)
 			{
-				getParentModel().setObject(object);
+				return ((IObjectClassAwareModel)getParentModel()).getObjectClass();
 			}
-
-			public void detach()
+			else
 			{
-				getParentModel().detach();
+				return null;
 			}
-		};
+		}
 	}
 
-
 	/**
 	 * @return Gets the parent model in case no explicit model was specified.
 	 */