You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2011/09/28 21:37:58 UTC
svn commit: r1177028 - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/
tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/
tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/compone...
Author: hlship
Date: Wed Sep 28 19:37:57 2011
New Revision: 1177028
URL: http://svn.apache.org/viewvc?rev=1177028&view=rev
Log:
Rename the elementName parameter of AbstractField.processSubmission() to be controlName, for consistency
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java Wed Sep 28 19:37:57 2011
@@ -16,7 +16,6 @@ package org.apache.tapestry5.corelib.bas
import org.apache.tapestry5.*;
import org.apache.tapestry5.annotations.*;
-import org.apache.tapestry5.corelib.internal.InternalMessages;
import org.apache.tapestry5.corelib.mixins.DiscardBody;
import org.apache.tapestry5.corelib.mixins.RenderDisabled;
import org.apache.tapestry5.corelib.mixins.RenderInformals;
@@ -196,13 +195,12 @@ public abstract class AbstractField impl
/**
* Method implemented by subclasses to actually do the work of processing the submission of the form. The element's
- * elementName property will already have been set. This method is only invoked if the field is <strong>not
+ * controlName property will already have been set. This method is only invoked if the field is <strong>not
* {@link #isDisabled() disabled}</strong>.
- *
- * @param elementName
- * the name of the element (used to find the correct parameter in the request)
+ *
+ * @param controlName the control name of the rendered element (used to find the correct parameter in the request)
*/
- protected abstract void processSubmission(String elementName);
+ protected abstract void processSubmission(String controlName);
/**
* Allows the validation decorator to write markup before the field itself writes markup.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java Wed Sep 28 19:37:57 2011
@@ -44,7 +44,7 @@ import java.util.Locale;
* event handler may also throw {@link org.apache.tapestry5.ValidationException}.
*/
@Events(
-{ EventConstants.TO_CLIENT, EventConstants.VALIDATE, EventConstants.PARSE_CLIENT })
+ {EventConstants.TO_CLIENT, EventConstants.VALIDATE, EventConstants.PARSE_CLIENT})
public abstract class AbstractTextField extends AbstractField
{
/**
@@ -74,7 +74,7 @@ public abstract class AbstractTextField
/**
* Provider of annotations used for some defaults. Annotation are usually provided in terms of the value parameter
* (i.e., from the getter and/or setter bound to the value parameter).
- *
+ *
* @see org.apache.tapestry5.beaneditor.Width
*/
@Parameter
@@ -141,7 +141,7 @@ public abstract class AbstractTextField
}
@SuppressWarnings(
- { "unchecked" })
+ {"unchecked"})
@BeginRender
void begin(MarkupWriter writer)
{
@@ -180,20 +180,18 @@ public abstract class AbstractTextField
* <p/>
* Generally, the subclass will invoke {@link MarkupWriter#element(String, Object[])}, and will be responsible for
* including an {@link AfterRender} phase method to invoke {@link MarkupWriter#end()}.
- *
- * @param writer
- * markup write to send output to
- * @param value
- * the value (either obtained and translated from the value parameter, or obtained from the tracker)
+ *
+ * @param writer markup write to send output to
+ * @param value the value (either obtained and translated from the value parameter, or obtained from the tracker)
*/
protected abstract void writeFieldTag(MarkupWriter writer, String value);
@SuppressWarnings(
- { "unchecked" })
+ {"unchecked"})
@Override
- protected void processSubmission(String elementName)
+ protected void processSubmission(String controlName)
{
- String rawValue = request.getParameter(elementName);
+ String rawValue = request.getParameter(controlName);
tracker.recordInput(this, rawValue);
@@ -210,8 +208,7 @@ public abstract class AbstractTextField
if (!(ignoreBlankInput() && InternalUtils.isBlank(rawValue)))
value = translated;
- }
- catch (ValidationException ex)
+ } catch (ValidationException ex)
{
tracker.recordError(this, ex.getMessage());
}
@@ -237,7 +234,7 @@ public abstract class AbstractTextField
/**
* Looks for a {@link org.apache.tapestry5.beaneditor.Width} annotation and, if present, returns its value as a
* string.
- *
+ *
* @return the indicated width, or null if the annotation is not present
*/
protected final String getWidth()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java Wed Sep 28 19:37:57 2011
@@ -25,7 +25,7 @@ import org.apache.tapestry5.services.Req
/**
* A Checkbox component is simply a <input type="checkbox">.
- *
+ *
* @tapestrydoc
*/
public class Checkbox extends AbstractField
@@ -59,11 +59,11 @@ public class Checkbox extends AbstractFi
writer.element("input", "type", "checkbox",
- "name", getControlName(),
+ "name", getControlName(),
- "id", getClientId(),
+ "id", getClientId(),
- "checked", checked ? "checked" : null);
+ "checked", checked ? "checked" : null);
resources.renderInformalParameters(writer);
@@ -77,9 +77,9 @@ public class Checkbox extends AbstractFi
}
@Override
- protected void processSubmission(String elementName)
+ protected void processSubmission(String controlName)
{
- String postedValue = request.getParameter(elementName);
+ String postedValue = request.getParameter(controlName);
// record as "true" or "false"
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java Wed Sep 28 19:37:57 2011
@@ -30,16 +30,15 @@ import java.util.List;
import java.util.Set;
/**
- * A list of checkboxes, allowing selection of multiple items in a list.
+ * A list of checkboxes, allowing selection of multiple items in a list.
* <p/>
* For an alternative component that can be used for similar purposes, see
* {@link Palette}.
- *
- * @since 5.3
- *
+ *
+ * @tapestrydoc
* @see Form
* @see Palette
- * @tapestrydoc
+ * @since 5.3
*/
public class Checklist extends AbstractField
{
@@ -152,10 +151,10 @@ public class Checklist extends AbstractF
}
@Override
- protected void processSubmission(final String elementName)
+ protected void processSubmission(final String controlName)
{
- final String[] parameters = request.getParameters(elementName);
+ final String[] parameters = request.getParameters(controlName);
List<Object> selected = this.selected;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java Wed Sep 28 19:37:57 2011
@@ -14,18 +14,8 @@
package org.apache.tapestry5.corelib.components;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
import org.apache.tapestry5.*;
-import org.apache.tapestry5.annotations.Environmental;
-import org.apache.tapestry5.annotations.Events;
-import org.apache.tapestry5.annotations.Import;
-import org.apache.tapestry5.annotations.Parameter;
-import org.apache.tapestry5.annotations.RequestParameter;
+import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.corelib.base.AbstractField;
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
@@ -35,6 +25,12 @@ import org.apache.tapestry5.services.Com
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.javascript.JavaScriptSupport;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
/**
* A component used to collect a provided date from the user using a client-side JavaScript calendar. Non-JavaScript
* clients can simply type into a text field.
@@ -45,7 +41,7 @@ import org.apache.tapestry5.services.jav
* <p/>
* Tapestry's DateField component is a wrapper around <a
* href="http://webfx.eae.net/dhtml/datepicker/datepicker.html">WebFX DatePicker</a>.
- *
+ *
* @tapestrydoc
* @see Form
* @see TextField
@@ -89,7 +85,7 @@ public class DateField extends AbstractF
/**
* Used to override the component's message catalog.
- *
+ *
* @since 5.2.0.0
*/
@Parameter("componentResources.messages")
@@ -154,7 +150,7 @@ public class DateField extends AbstractF
* not formatted correct.
*/
JSONObject onParse(@RequestParameter(INPUT_PARAMETER)
- String input)
+ String input)
{
JSONObject response = new JSONObject();
@@ -163,8 +159,7 @@ public class DateField extends AbstractF
Date date = format.parse(input);
response.put(RESULT, date.getTime());
- }
- catch (ParseException ex)
+ } catch (ParseException ex)
{
response.put(ERROR, ex.getMessage());
}
@@ -178,7 +173,7 @@ public class DateField extends AbstractF
* the result.
*/
JSONObject onFormat(@RequestParameter(INPUT_PARAMETER)
- String input)
+ String input)
{
JSONObject response = new JSONObject();
@@ -189,8 +184,7 @@ public class DateField extends AbstractF
Date date = new Date(millis);
response.put(RESULT, format.format(date));
- }
- catch (NumberFormatException ex)
+ } catch (NumberFormatException ex)
{
response.put(ERROR, ex.getMessage());
}
@@ -210,13 +204,13 @@ public class DateField extends AbstractF
writer.element("input",
- "type", hideTextField ? "hidden" : "text",
+ "type", hideTextField ? "hidden" : "text",
- "name", getControlName(),
+ "name", getControlName(),
- "id", clientId,
+ "id", clientId,
- "value", value);
+ "value", value);
writeDisabled(writer);
@@ -236,13 +230,13 @@ public class DateField extends AbstractF
writer.element("img",
- "id", triggerId,
+ "id", triggerId,
- "class", "t-calendar-trigger",
+ "class", "t-calendar-trigger",
- "src", icon.toClientURL(),
+ "src", icon.toClientURL(),
- "alt", "[Show]");
+ "alt", "[Show]");
writer.end(); // img
JSONObject spec = new JSONObject();
@@ -269,9 +263,9 @@ public class DateField extends AbstractF
}
@Override
- protected void processSubmission(String elementName)
+ protected void processSubmission(String controlName)
{
- String value = request.getParameter(elementName);
+ String value = request.getParameter(controlName);
tracker.recordInput(this, value);
@@ -281,8 +275,7 @@ public class DateField extends AbstractF
{
if (InternalUtils.isNonBlank(value))
parsedValue = format.parse(value);
- }
- catch (ParseException ex)
+ } catch (ParseException ex)
{
tracker.recordError(this, messages.format("date-value-not-parseable", value));
return;
@@ -294,8 +287,7 @@ public class DateField extends AbstractF
fieldValidationSupport.validate(parsedValue, resources, validate);
this.value = parsedValue;
- }
- catch (ValidationException ex)
+ } catch (ValidationException ex)
{
tracker.recordError(this, ex.getMessage());
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java Wed Sep 28 19:37:57 2011
@@ -14,14 +14,6 @@
package org.apache.tapestry5.corelib.components;
-import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newSet;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.tapestry5.*;
import org.apache.tapestry5.annotations.Environmental;
import org.apache.tapestry5.annotations.Import;
@@ -37,6 +29,14 @@ import org.apache.tapestry5.services.Com
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.javascript.JavaScriptSupport;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newSet;
+
/**
* Multiple selection component. Generates a UI consisting of two <select> elements configured for multiple
* selection; the one on the left is the list of "available" elements, the one on the right is "selected". Elements can
@@ -56,7 +56,7 @@ import org.apache.tapestry5.services.jav
* Much of the look and feel is driven by CSS, the default Tapestry CSS is used to set up the columns, etc. By default,
* the <select> element's widths are 200px, and it is common to override this to a specific value:
* <p/>
- *
+ * <p/>
* <pre>
* <style>
* DIV.t-palette SELECT { width: 300px; }
@@ -71,10 +71,10 @@ import org.apache.tapestry5.services.jav
* <p/>
* For an alternative component that can be used for similar purposes, see
* {@link Checklist}.
- *
+ *
+ * @tapestrydoc
* @see Form
* @see Select
- * @tapestrydoc
*/
@Import(library = "palette.js")
public class Palette extends AbstractField
@@ -291,7 +291,7 @@ public class Palette extends AbstractFie
/**
* The object that will perform input validation. The validate binding prefix is generally used to provide
* this object in a declarative fashion.
- *
+ *
* @since 5.2.0
*/
@Parameter(defaultPrefix = BindingConstants.VALIDATE)
@@ -318,9 +318,9 @@ public class Palette extends AbstractFie
}
@Override
- protected void processSubmission(String elementName)
+ protected void processSubmission(String controlName)
{
- String parameterValue = request.getParameter(elementName + "-values");
+ String parameterValue = request.getParameter(controlName + "-values");
this.tracker.recordInput(this, parameterValue);
@@ -354,8 +354,7 @@ public class Palette extends AbstractFie
this.fieldValidationSupport.validate(selected, this.componentResources, this.validate);
this.selected = selected;
- }
- catch (final ValidationException e)
+ } catch (final ValidationException e)
{
this.tracker.recordError(this, e.getMessage());
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java Wed Sep 28 19:37:57 2011
@@ -15,12 +15,7 @@
package org.apache.tapestry5.corelib.components;
import org.apache.tapestry5.*;
-import org.apache.tapestry5.annotations.BeforeRenderTemplate;
-import org.apache.tapestry5.annotations.Environmental;
-import org.apache.tapestry5.annotations.Events;
-import org.apache.tapestry5.annotations.Mixin;
-import org.apache.tapestry5.annotations.Parameter;
-import org.apache.tapestry5.annotations.RequestParameter;
+import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.corelib.base.AbstractField;
import org.apache.tapestry5.corelib.data.BlankOption;
import org.apache.tapestry5.corelib.mixins.RenderDisabled;
@@ -31,12 +26,7 @@ import org.apache.tapestry5.ioc.Messages
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.json.JSONObject;
-import org.apache.tapestry5.services.ComponentDefaultProvider;
-import org.apache.tapestry5.services.FieldValidatorDefaultSource;
-import org.apache.tapestry5.services.FormSupport;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.ValueEncoderFactory;
-import org.apache.tapestry5.services.ValueEncoderSource;
+import org.apache.tapestry5.services.*;
import org.apache.tapestry5.services.javascript.JavaScriptSupport;
import org.apache.tapestry5.util.EnumSelectModel;
@@ -49,11 +39,11 @@ import org.apache.tapestry5.util.EnumSel
* the type of the value parameter. The {@link ValueEncoderSource} service provides an encoder in these situations; it
* can be overriden by binding the encoder parameter, or extended by contributing a {@link ValueEncoderFactory} into the
* service's configuration.
- *
+ *
* @tapestrydoc
*/
@Events(
-{ EventConstants.VALIDATE, EventConstants.VALUE_CHANGED + " when 'zone' parameter is bound" })
+ {EventConstants.VALIDATE, EventConstants.VALUE_CHANGED + " when 'zone' parameter is bound"})
public class Select extends AbstractField
{
public static final String CHANGE_EVENT = "change";
@@ -78,8 +68,8 @@ public class Select extends AbstractFiel
* "value" parameter into a unique client-side string (typically an ID) and
* back. Note: this parameter may be OMITTED if Tapestry is configured to
* provide a ValueEncoder automatically for the type of property bound to
- * the "value" parameter.
- *
+ * the "value" parameter.
+ *
* @see ValueEncoderSource
*/
@Parameter
@@ -137,7 +127,7 @@ public class Select extends AbstractFiel
* the
* indicated zone. The component will trigger the event {@link EventConstants#VALUE_CHANGED} to inform its
* container that Select's value has changed.
- *
+ *
* @since 5.2.0
*/
@Parameter(defaultPrefix = BindingConstants.LITERAL)
@@ -164,11 +154,11 @@ public class Select extends AbstractFiel
}
@SuppressWarnings(
- { "unchecked" })
+ {"unchecked"})
@Override
- protected void processSubmission(String elementName)
+ protected void processSubmission(String controlName)
{
- String submittedValue = request.getParameter(elementName);
+ String submittedValue = request.getParameter(controlName);
tracker.recordInput(this, submittedValue);
@@ -181,8 +171,7 @@ public class Select extends AbstractFiel
fieldValidationSupport.validate(selectedValue, resources, validate);
value = selectedValue;
- }
- catch (ValidationException ex)
+ } catch (ValidationException ex)
{
tracker.recordError(this, ex.getMessage());
}
@@ -206,7 +195,7 @@ public class Select extends AbstractFiel
removePropertyNameFromBeanValidationContext();
resources.renderInformalParameters(writer);
-
+
decorateInsideField();
// Disabled is via a mixin
@@ -222,14 +211,14 @@ public class Select extends AbstractFiel
}
Object onChange(@RequestParameter(value = "t:selectvalue", allowBlank = true)
- final String selectValue)
+ final String selectValue)
{
final Object newValue = toValue(selectValue);
CaptureResultCallback<Object> callback = new CaptureResultCallback<Object>();
this.resources.triggerEvent(EventConstants.VALUE_CHANGED, new Object[]
- { newValue }, callback);
+ {newValue}, callback);
this.value = newValue;
Modified: tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java Wed Sep 28 19:37:57 2011
@@ -14,16 +14,8 @@
package org.apache.tapestry5.kaptcha.components;
-import org.apache.tapestry5.BindingConstants;
-import org.apache.tapestry5.ComponentResources;
-import org.apache.tapestry5.FieldValidator;
-import org.apache.tapestry5.MarkupWriter;
-import org.apache.tapestry5.ValidationTracker;
-import org.apache.tapestry5.annotations.BeginRender;
-import org.apache.tapestry5.annotations.Environmental;
-import org.apache.tapestry5.annotations.Import;
-import org.apache.tapestry5.annotations.Parameter;
-import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.corelib.base.AbstractField;
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.ioc.Messages;
@@ -71,9 +63,9 @@ public class KaptchaField extends Abstra
}
@Override
- protected void processSubmission(String elementName)
+ protected void processSubmission(String controlName)
{
- String userValue = request.getParameter(elementName);
+ String userValue = request.getParameter(controlName);
if (TapestryInternalUtils.isEqual(image.getCaptchaText(), userValue))
return;
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java?rev=1177028&r1=1177027&r2=1177028&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java Wed Sep 28 19:37:57 2011
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2007, 2008, 2009, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import java.util.Locale;
/**
* A component to upload a file.
*/
-@SuppressWarnings({ "UnusedDeclaration" })
+@SuppressWarnings({"UnusedDeclaration"})
@Events(EventConstants.VALIDATE)
public class Upload extends AbstractField
{
@@ -112,11 +112,11 @@ public class Upload extends AbstractFiel
this.fieldValidationSupport = fieldValidationSupport;
}
- @SuppressWarnings({ "unchecked" })
+ @SuppressWarnings({"unchecked"})
@Override
- protected void processSubmission(String elementName)
+ protected void processSubmission(String controlName)
{
- UploadedFile uploaded = decoder.getFileUpload(elementName);
+ UploadedFile uploaded = decoder.getFileUpload(controlName);
if (uploaded != null)
{
@@ -126,8 +126,7 @@ public class Upload extends AbstractFiel
try
{
fieldValidationSupport.validate(uploaded, resources, validate);
- }
- catch (ValidationException ex)
+ } catch (ValidationException ex)
{
tracker.recordError(this, ex.getMessage());
}