svn commit: r379566 - /cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/Upload.java

[br...@apache.org]

Author: bruno
Date: Tue Feb 21 12:03:01 2006
New Revision: 379566

URL: http://svn.apache.org/viewcvs?rev=379566&view=rev
Log:
Fix COCOON-1780 (the "..." button on uploads does not work)
Caused by the change of order of readFromRequest and submitWidget assignment.

Modified:
    cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/Upload.java

Modified: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/Upload.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/Upload.java?rev=379566&r1=379565&r2=379566&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/Upload.java (original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/Upload.java Tue Feb 21 12:03:01 2006
@@ -34,6 +34,7 @@
 
 import org.apache.cocoon.xml.AttributesImpl;
 import org.apache.cocoon.xml.XMLUtils;
+import org.apache.cocoon.environment.Request;
 
 import org.apache.commons.lang.ObjectUtils;
 
@@ -98,7 +99,16 @@
             return;
         }
 
-        Object obj = formContext.getRequest().get(getRequestParameterName());
+        Form form = getForm();
+        Request request = formContext.getRequest();
+        String fullId = getRequestParameterName();
+
+        Object obj = request.get(fullId);
+
+        if (obj != null || fullId.equals(request.getParameter(Form.SUBMIT_ID_PARAMETER))) {
+           form.setSubmitWidget(this);
+        }
+
 
         // If the request object is a Part, keep it
         if (obj instanceof Part) {
@@ -119,7 +129,7 @@
 
         // If it's not a part and not null, clear any existing value
         // We also check if we're the submit widget, as a result of clicking the "..." button
-        } else if (obj != null || getForm().getSubmitWidget() == this){
+        } else if (obj != null || form.getSubmitWidget() == this){
             // Clear the part, if any
             if (this.part != null) {
                 this.part.dispose();