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 2010/11/22 02:19:24 UTC

svn commit: r1037584 - /wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java

Author: ivaynberg
Date: Mon Nov 22 01:19:24 2010
New Revision: 1037584

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

Issue: WICKET-3181

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

Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=1037584&r1=1037583&r2=1037584&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Mon Nov 22 01:19:24 2010
@@ -81,6 +81,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.
 	 * 
@@ -110,6 +117,7 @@ public class UploadProgressBar extends P
 	public UploadProgressBar(String id, final Form<?> form, FileUploadField fileUploadField)
 	{
 		super(id);
+		uploadField = fileUploadField;
 		this.form = form;
 		setOutputMarkupId(true);
 		form.setOutputMarkupId(true);
@@ -122,11 +130,11 @@ public class UploadProgressBar extends P
 			add(CSSPackageResource.getHeaderContribution(css));
 		}
 
-		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);
 
@@ -135,8 +143,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));
 	}
 
 	/**