svn commit: r1037583 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java

[iv...@apache.org]

Author: ivaynberg
Date: Mon Nov 22 01:19:14 2010
New Revision: 1037583

URL: http://svn.apache.org/viewvc?rev=1037583&view=rev
Log:

Issue: WICKET-3181

Modified:
    wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java

Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=1037583&r1=1037582&r2=1037583&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Mon Nov 22 01:19:14 2010
@@ -82,6 +82,13 @@ public class UploadProgressBar extends P
 
 	private final Form<?> form;
 
+	private final WebMarkupContainer statusDiv;
+
+	private final WebMarkupContainer barDiv;
+
+	private final FileUploadField uploadField;
+
+
 	/**
 	 * Constructor that will display the upload progress bar for every submit of the given form.
 	 * 
@@ -111,6 +118,7 @@ public class UploadProgressBar extends P
 	public UploadProgressBar(String id, final Form<?> form, FileUploadField fileUploadField)
 	{
 		super(id);
+		uploadField = fileUploadField;
 		this.form = form;
 		form.setOutputMarkupId(true);
 		if (fileUploadField != null)
@@ -119,11 +127,11 @@ public class UploadProgressBar extends P
 		}
 		setRenderBodyOnly(true);
 
-		final WebMarkupContainer barDiv = new WebMarkupContainer("bar");
+		barDiv = new WebMarkupContainer("bar");
 		barDiv.setOutputMarkupId(true);
 		add(barDiv);
 
-		final WebMarkupContainer statusDiv = new WebMarkupContainer("status");
+		statusDiv = new WebMarkupContainer("status");
 		statusDiv.setOutputMarkupId(true);
 		add(statusDiv);
 
@@ -132,8 +140,13 @@ public class UploadProgressBar extends P
 		{
 			log.warn("UploadProgressBar will not work without an UploadWebRequest. See the javadoc for details.");
 		}
+	}
 
-		form.add(new FormEnabler(this, statusDiv, barDiv, fileUploadField));
+	@Override
+	protected void onInitialize()
+	{
+		super.onInitialize();
+		form.getRootForm().add(new FormEnabler(this, statusDiv, barDiv, uploadField));
 	}
 
 	/**