You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2007/12/16 20:04:29 UTC

svn commit: r604671 - /wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java

Author: jcompagner
Date: Sun Dec 16 11:04:26 2007
New Revision: 604671

URL: http://svn.apache.org/viewvc?rev=604671&view=rev
Log:
deleted the newLabel method so that it defaults to the AjaxEditableLabel

Modified:
    wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java

Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=604671&r1=604670&r2=604671&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Sun Dec 16 11:04:26 2007
@@ -19,10 +19,8 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.basic.MultiLineLabel;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
@@ -152,28 +150,6 @@
 		this(id, model, new Model((Serializable)choices), renderer);
 	}
 
-	/**
-	 * @see org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#newLabel(org.apache.wicket.MarkupContainer,
-	 *      java.lang.String, org.apache.wicket.model.IModel)
-	 */
-	protected Component newLabel(MarkupContainer parent, String componentId, IModel model)
-	{
-		MultiLineLabel label = new MultiLineLabel(componentId, model);
-		label.setOutputMarkupId(true);
-		label.add(new LabelAjaxBehavior(getLabelAjaxEvent()));
-		return label;
-	}
-
-	/**
-	 * By default this returns "onclick" uses can overwrite this on which event the label behavior
-	 * should be triggered
-	 * 
-	 * @return The event name
-	 */
-	protected String getLabelAjaxEvent()
-	{
-		return "onclick";
-	}
 
 	/**
 	 * @see org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#newEditor(org.apache.wicket.MarkupContainer,