You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/09/04 17:03:39 UTC

svn commit: r692084 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java

Author: ivaynberg
Date: Thu Sep  4 08:03:38 2008
New Revision: 692084

URL: http://svn.apache.org/viewvc?rev=692084&view=rev
Log:
fileuploadfield should always use a model

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java?rev=692084&r1=692083&r2=692084&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java Thu Sep  4 08:03:38 2008
@@ -39,9 +39,6 @@
 {
 	private static final long serialVersionUID = 1L;
 
-	/** True if a model has been set explicitly */
-	private boolean hasExplicitModel;
-
 	private transient FileUpload fileUpload;
 
 	/**
@@ -61,7 +58,6 @@
 	public FileUploadField(final String id, IModel<FileUpload> model)
 	{
 		super(id, model);
-		hasExplicitModel = true;
 	}
 
 	/**
@@ -99,25 +95,10 @@
 	@Override
 	public FileUploadField setDefaultModel(IModel<?> model)
 	{
-		hasExplicitModel = true;
 		return (FileUploadField)super.setDefaultModel(model);
 	}
 
 	/**
-	 * @see org.apache.wicket.markup.html.form.FormComponent#updateModel()
-	 */
-	@Override
-	public void updateModel()
-	{
-		// Only update the model if one was passed in
-		if (hasExplicitModel)
-		{
-			setDefaultModelObject(getConvertedInput());
-		}
-	}
-
-
-	/**
 	 * @see org.apache.wicket.markup.html.form.FormComponent#getInputAsArray()
 	 */
 	@Override