You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/15 23:23:31 UTC
svn commit: r584925 [6/34] - in /wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/ajax/form/
main/java/org/apache/wicket/ajax/mar...
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java Mon Oct 15 14:21:25 2007
@@ -23,8 +23,8 @@
/**
- * Essentially a drop down choice that doesn't drop down. Instead, it scrolls
- * and displays a given number of rows.
+ * Essentially a drop down choice that doesn't drop down. Instead, it scrolls and displays a given
+ * number of rows.
*
* @author Jonathan Locke
* @author Johan Compagner
@@ -70,8 +70,7 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * List)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, List)
*/
public ListChoice(final String id, final List choices)
{
@@ -162,8 +161,7 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
public ListChoice(String id, IModel choices)
{
@@ -171,8 +169,7 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel,IModel)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,IModel)
*/
public ListChoice(String id, IModel model, IModel choices)
{
@@ -190,8 +187,8 @@
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel, IModel,IChoiceRenderer)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
+ * IModel,IChoiceRenderer)
*/
public ListChoice(String id, IModel model, IModel choices, IChoiceRenderer renderer)
{
@@ -199,8 +196,8 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel, IModel,IChoiceRenderer)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
+ * IModel,IChoiceRenderer)
*/
public ListChoice(String id, IModel model, IModel choices, IChoiceRenderer renderer, int maxRows)
{
@@ -237,7 +234,8 @@
protected final void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
- if (!tag.getAttributes().containsKey("size")) {
+ if (!tag.getAttributes().containsKey("size"))
+ {
tag.put("size", maxRows);
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java Mon Oct 15 14:21:25 2007
@@ -78,8 +78,7 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * List)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, List)
*/
public ListMultipleChoice(final String id, final List choices)
{
@@ -95,8 +94,7 @@
* list of choices
* @param maxRows
* the maximum number of visible rows.
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * List)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, List)
*/
public ListMultipleChoice(final String id, final List choices, final int maxRows)
{
@@ -114,8 +112,7 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel, List)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel, List)
*/
public ListMultipleChoice(final String id, IModel object, final List choices)
{
@@ -123,8 +120,8 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel, List,IChoiceRenderer)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
+ * List,IChoiceRenderer)
*/
public ListMultipleChoice(final String id, IModel object, final List choices,
final IChoiceRenderer renderer)
@@ -133,8 +130,7 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
public ListMultipleChoice(String id, IModel choices)
{
@@ -142,8 +138,7 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel,IModel)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,IModel)
*/
public ListMultipleChoice(String id, IModel model, IModel choices)
{
@@ -161,8 +156,8 @@
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel, IModel,IChoiceRenderer)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
+ * IModel,IChoiceRenderer)
*/
public ListMultipleChoice(String id, IModel model, IModel choices, IChoiceRenderer renderer)
{
@@ -193,8 +188,8 @@
if (modelObject != null && !(modelObject instanceof Collection))
{
throw new WicketRuntimeException(
- "Model object for a ListMultipleChoice must be a Collection (found "
- + modelObject.getClass() + ")");
+ "Model object for a ListMultipleChoice must be a Collection (found " +
+ modelObject.getClass() + ")");
}
final Collection selectedValues = (Collection)modelObject;
final AppendingStringBuffer buffer = new AppendingStringBuffer();
@@ -214,8 +209,7 @@
}
/**
- * @see org.apache.wicket.markup.html.form.AbstractChoice#isSelected(Object,int,
- * String)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#isSelected(Object,int, String)
*/
protected final boolean isSelected(Object choice, int index, String selected)
{
@@ -270,8 +264,7 @@
* Converts submitted choice ids to choice objects.
*
* @param ids
- * choice ids. this array is nonnull and always contains at least
- * one id.
+ * choice ids. this array is nonnull and always contains at least one id.
* @return list of choices.
*/
protected List convertChoiceIdsToChoices(String[] ids)
@@ -304,11 +297,10 @@
}
/**
- * If the model object exists, it is assumed to be a Collection, and it is
- * modified in-place. Then {@link Model#setObject(Object)} is called with
- * the same instance: it allows the Model to be notified of changes even
- * when {@link Model#getObject()} returns a different {@link Collection} at
- * every invocation.
+ * If the model object exists, it is assumed to be a Collection, and it is modified in-place.
+ * Then {@link Model#setObject(Object)} is called with the same instance: it allows the Model to
+ * be notified of changes even when {@link Model#getObject()} returns a different
+ * {@link Collection} at every invocation.
*
* @see FormComponent#updateModel()
* @throws UnsupportedOperationException
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java Mon Oct 15 14:21:25 2007
@@ -23,12 +23,11 @@
/**
- * A password text field component. As you type, characters show up as asterisks
- * or some other such character so that nobody can look over your shoulder and
- * read your password.
+ * A password text field component. As you type, characters show up as asterisks or some other such
+ * character so that nobody can look over your shoulder and read your password.
* <p>
- * By default this text field is required. If it is not, call
- * {@link #setRequired(boolean)} with value of <code>false</code>.
+ * By default this text field is required. If it is not, call {@link #setRequired(boolean)} with
+ * value of <code>false</code>.
*
* @author Jonathan Locke
*/
@@ -40,12 +39,11 @@
private static final Logger log = LoggerFactory.getLogger(PasswordTextField.class);
/**
- * Flag indicating whether the contents of the field should be reset each
- * time it is rendered. If <code>true</code>, the contents are emptied
- * when the field is rendered. This is useful for login forms. If
- * <code>false</code>, the contents of the model are put into the field.
- * This is useful for entry forms where the contents of the model should be
- * editable, or resubmitted.
+ * Flag indicating whether the contents of the field should be reset each time it is rendered.
+ * If <code>true</code>, the contents are emptied when the field is rendered. This is useful
+ * for login forms. If <code>false</code>, the contents of the model are put into the field.
+ * This is useful for entry forms where the contents of the model should be editable, or
+ * resubmitted.
*/
private boolean resetPassword = true;
@@ -67,12 +65,11 @@
}
/**
- * Flag indicating whether the contents of the field should be reset each
- * time it is rendered. If <code>true</code>, the contents are emptied
- * when the field is rendered. This is useful for login forms. If
- * <code>false</code>, the contents of the model are put into the field.
- * This is useful for entry forms where the contents of the model should be
- * editable, or resubmitted.
+ * Flag indicating whether the contents of the field should be reset each time it is rendered.
+ * If <code>true</code>, the contents are emptied when the field is rendered. This is useful
+ * for login forms. If <code>false</code>, the contents of the model are put into the field.
+ * This is useful for entry forms where the contents of the model should be editable, or
+ * resubmitted.
*
* @return Returns the resetPassword.
*/
@@ -82,12 +79,11 @@
}
/**
- * Flag indicating whether the contents of the field should be reset each
- * time it is rendered. If <code>true</code>, the contents are emptied
- * when the field is rendered. This is useful for login forms. If
- * <code>false</code>, the contents of the model are put into the field.
- * This is useful for entry forms where the contents of the model should be
- * editable, or resubmitted.
+ * Flag indicating whether the contents of the field should be reset each time it is rendered.
+ * If <code>true</code>, the contents are emptied when the field is rendered. This is useful
+ * for login forms. If <code>false</code>, the contents of the model are put into the field.
+ * This is useful for entry forms where the contents of the model should be editable, or
+ * resubmitted.
*
* @param resetPassword
* The resetPassword to set.
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java Mon Oct 15 14:21:25 2007
@@ -26,8 +26,7 @@
import org.apache.wicket.util.lang.Objects;
/**
- * Component representing a single radio choice in a
- * org.apache.wicket.markup.html.form.RadioGroup.
+ * Component representing a single radio choice in a org.apache.wicket.markup.html.form.RadioGroup.
*
* Must be attached to an <input type="radio" ... > markup.
*
@@ -43,8 +42,8 @@
private static final String ATTR_DISABLED = "disabled";
/**
- * page-scoped uuid of this check. this property must not be accessed
- * directly, instead {@link #getValue()} must be used
+ * page-scoped uuid of this check. this property must not be accessed directly, instead
+ * {@link #getValue()} must be used
*/
private short uuid = -1;
@@ -66,9 +65,8 @@
/**
- * Form submission value used for this radio component. This string will
- * appear as the value of the <code>value</code> html attribute for the
- * <code>input</code> tag.
+ * Form submission value used for this radio component. This string will appear as the value of
+ * the <code>value</code> html attribute for the <code>input</code> tag.
*
* @return form submission value
*/
@@ -102,9 +100,9 @@
if (group == null)
{
throw new WicketRuntimeException(
- "Radio component ["
- + getPath()
- + "] cannot find its parent RadioGroup. All Radio components must be a child of or below in the hierarchy of a RadioGroup component.");
+ "Radio component [" +
+ getPath() +
+ "] cannot find its parent RadioGroup. All Radio components must be a child of or below in the hierarchy of a RadioGroup component.");
}
@@ -138,19 +136,22 @@
RequestContext rc = RequestContext.get();
if (rc.isPortletRequest())
{
- // restore url back to real wicket path as its going to be interpreted by the form itself
+ // restore url back to real wicket path as its going to be interpreted by the
+ // form itself
url = ((PortletRequestContext)rc).getLastEncodedPath();
- }
+ }
tag.put("onclick", form.getJsForInterfaceUrl(url));
}
else
{
- // TODO: following doesn't work with portlets, should be posted to a dynamic hidden form
+ // TODO: following doesn't work with portlets, should be posted to a dynamic hidden
+ // form
// with an ActionURL or something
// NOTE: do not encode the url as that would give invalid
// JavaScript
- tag.put("onclick", "window.location.href='" + url + (url.toString().indexOf('?')>-1 ? "&" : "?") + group.getInputName()
- + "=' + this.value;");
+ tag.put("onclick", "window.location.href='" + url +
+ (url.toString().indexOf('?') > -1 ? "&" : "?") + group.getInputName() +
+ "=' + this.value;");
}
}
@@ -160,10 +161,10 @@
tag.put(ATTR_DISABLED, ATTR_DISABLED);
}
}
-
+
/**
- * The value will be made available to the validator property by means of
- * ${label}. It does not have any specific meaning to Radio itself.
+ * The value will be made available to the validator property by means of ${label}. It does not
+ * have any specific meaning to Radio itself.
*
* @param labelModel
* @return this for chaining
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java Mon Oct 15 14:21:25 2007
@@ -33,31 +33,30 @@
* A choice subclass that shows choices in radio style.
* <p>
* Java:
- *
+ *
* <pre>
* List SITES = Arrays.asList(new String[] { "The Server Side", "Java Lobby", "Java.Net" });
* // Add a radio choice component that uses Input's 'site' property to designate the
* // current selection, and that uses the SITES list for the available options.
* form.add(new RadioChoice("site", SITES));
* </pre>
- *
+ *
* HTML:
- *
+ *
* <pre>
* <span valign="top" wicket:id="site">
* <input type="radio">site 1</input>
* <input type="radio">site 2</input>
* </span>
* </pre>
- *
+ *
* </p>
- *
+ *
* <p>
- * You can can extend this class and override method
- * wantOnSelectionChangedNotifications() to force server roundtrips on each
- * selection change.
+ * You can can extend this class and override method wantOnSelectionChangedNotifications() to force
+ * server roundtrips on each selection change.
* </p>
- *
+ *
* @author Jonathan Locke
* @author Igor Vaynberg (ivaynberg)
*/
@@ -105,7 +104,7 @@
/**
* Construct.
- *
+ *
* @param prevSuffix
*/
PrefixChange(String prevSuffix)
@@ -136,7 +135,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @see org.apache.wicket.Component#Component(String)
@@ -149,7 +148,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param choices
@@ -164,7 +163,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param renderer
@@ -182,7 +181,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param model
@@ -190,8 +189,7 @@
* @param choices
* The collection of choices in the radio choice
* @see org.apache.wicket.Component#Component(String, IModel)
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel, List)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel, List)
*/
public RadioChoice(final String id, IModel model, final List choices)
{
@@ -200,7 +198,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param model
@@ -210,8 +208,8 @@
* @param renderer
* The rendering engine
* @see org.apache.wicket.Component#Component(String, IModel)
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel, List,IChoiceRenderer)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
+ * List,IChoiceRenderer)
*/
public RadioChoice(final String id, IModel model, final List choices,
final IChoiceRenderer renderer)
@@ -221,14 +219,13 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param choices
* The collection of choices in the radio choice
* @see org.apache.wicket.Component#Component(String)
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
public RadioChoice(String id, IModel choices)
{
@@ -237,16 +234,14 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param model
- * The model that is updated with changes in this component. See
- * Component
+ * The model that is updated with changes in this component. See Component
* @param choices
* The collection of choices in the radio choice
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel,IModel)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,IModel)
* @see org.apache.wicket.Component#Component(String, IModel)
*/
public RadioChoice(String id, IModel model, IModel choices)
@@ -256,7 +251,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param choices
@@ -275,19 +270,18 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param model
- * The model that is updated with changes in this component. See
- * Component
+ * The model that is updated with changes in this component. See Component
* @param choices
* The collection of choices in the radio choice
* @param renderer
* The rendering engine
* @see org.apache.wicket.Component#Component(String, IModel)
- * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
- * IModel, IModel,IChoiceRenderer)
+ * @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
+ * IModel,IChoiceRenderer)
*/
public RadioChoice(String id, IModel model, IModel choices, IChoiceRenderer renderer)
{
@@ -316,32 +310,28 @@
}
/**
- * Template method that can be overridden by clients that implement
- * IOnChangeListener to be notified by onChange events of a select element.
- * This method does nothing by default.
+ * Template method that can be overridden by clients that implement IOnChangeListener to be
+ * notified by onChange events of a select element. This method does nothing by default.
* <p>
- * Called when a option is selected of a dropdown list that wants to be
- * notified of this event. This method is to be implemented by clients that
- * want to be notified of selection events.
- *
+ * Called when a option is selected of a dropdown list that wants to be notified of this event.
+ * This method is to be implemented by clients that want to be notified of selection events.
+ *
* @param newSelection
- * The newly selected object of the backing model NOTE this is
- * the same as you would get by calling getModelObject() if the
- * new selection were current
+ * The newly selected object of the backing model NOTE this is the same as you would
+ * get by calling getModelObject() if the new selection were current
*/
protected void onSelectionChanged(Object newSelection)
{
}
/**
- * Whether this component's onSelectionChanged event handler should called
- * using javascript if the selection changes. If true, a roundtrip will be
- * generated with each selection change, resulting in the model being
- * updated (of just this component) and onSelectionChanged being called.
- * This method returns false by default.
- *
- * @return True if this component's onSelectionChanged event handler should
- * called using javascript if the selection changes
+ * Whether this component's onSelectionChanged event handler should called using javascript if
+ * the selection changes. If true, a roundtrip will be generated with each selection change,
+ * resulting in the model being updated (of just this component) and onSelectionChanged being
+ * called. This method returns false by default.
+ *
+ * @return True if this component's onSelectionChanged event handler should called using
+ * javascript if the selection changes
*/
protected boolean wantOnSelectionChangedNotifications()
{
@@ -470,7 +460,8 @@
RequestContext rc = RequestContext.get();
if (rc.isPortletRequest())
{
- // restore url back to real wicket path as its going to be interpreted by the form itself
+ // restore url back to real wicket path as its going to be interpreted
+ // by the form itself
url = ((PortletRequestContext)rc).getLastEncodedPath();
}
buffer.append(" onclick=\"").append(form.getJsForInterfaceUrl(url)).append(
@@ -478,12 +469,16 @@
}
else
{
- // TODO: following doesn't work with portlets, should be posted to a dynamic hidden form
+ // TODO: following doesn't work with portlets, should be posted to a dynamic
+ // hidden form
// with an ActionURL or something
// NOTE: do not encode the url as that would give
// invalid JavaScript
- buffer.append(" onclick=\"window.location.href='").append(url).append(
- (url.toString().indexOf('?')>-1 ? "&" : "?") + getInputName()).append("=").append(id).append("';\"");
+ buffer.append(" onclick=\"window.location.href='").append(url)
+ .append(
+ (url.toString().indexOf('?') > -1 ? "&" : "?") +
+ getInputName()).append("=").append(id).append(
+ "';\"");
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java Mon Oct 15 14:21:25 2007
@@ -24,13 +24,12 @@
import org.apache.wicket.util.convert.ConversionException;
/**
- * Component used to connect instances of Radio components into a group.
- * Instances of Radio have to be in the component hierarchy somewhere below the
- * group component. The model object of the group is set to the model object of
- * the selected radio component or null if none selected.
- *
+ * Component used to connect instances of Radio components into a group. Instances of Radio have to
+ * be in the component hierarchy somewhere below the group component. The model object of the group
+ * is set to the model object of the selected radio component or null if none selected.
+ *
* ie
- *
+ *
* <pre>
* <span wicket:id="radiochoicegroup">
* ...
@@ -40,10 +39,10 @@
* ...
* </span>
* </pre>
- *
+ *
* @author Igor Vaynberg
* @author Sven Meier (svenmeier)
- *
+ *
*/
public class RadioGroup extends FormComponent implements IOnChangeListener
{
@@ -116,12 +115,12 @@
if (choice == null)
{
throw new WicketRuntimeException(
- "submitted http post value ["
- + value
- + "] for RadioGroup component ["
- + getPath()
- + "] is illegal because it does not contain relative path to a Radio componnet. "
- + "Due to this the RadioGroup component cannot resolve the selected Radio component pointed to by the illegal value. A possible reason is that componment hierarchy changed between rendering and form submission.");
+ "submitted http post value [" +
+ value +
+ "] for RadioGroup component [" +
+ getPath() +
+ "] is illegal because it does not contain relative path to a Radio componnet. " +
+ "Due to this the RadioGroup component cannot resolve the selected Radio component pointed to by the illegal value. A possible reason is that componment hierarchy changed between rendering and form submission.");
}
@@ -153,18 +152,15 @@
}
/**
- * Template method that can be overridsen by clients that implement
- * IOnChangeListener to be notified by onChange events of a select element.
- * This method does nothing by default.
+ * Template method that can be overridsen by clients that implement IOnChangeListener to be
+ * notified by onChange events of a select element. This method does nothing by default.
* <p>
- * Called when a option is selected of a dropdown list that wants to be
- * notified of this event. This method is to be implemented by clients that
- * want to be notified of selection events.
- *
+ * Called when a option is selected of a dropdown list that wants to be notified of this event.
+ * This method is to be implemented by clients that want to be notified of selection events.
+ *
* @param newSelection
- * The newly selected object of the backing model NOTE this is
- * the same as you would get by calling getModelObject() if the
- * new selection were current
+ * The newly selected object of the backing model NOTE this is the same as you would
+ * get by calling getModelObject() if the new selection were current
*/
protected void onSelectionChanged(final Object newSelection)
{
@@ -172,7 +168,7 @@
/**
* Radio group does not support persistence through cookies
- *
+ *
* @see org.apache.wicket.markup.html.form.FormComponent#supportsPersistence()
*/
protected final boolean supportsPersistence()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RequiredTextField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RequiredTextField.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RequiredTextField.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RequiredTextField.java Mon Oct 15 14:21:25 2007
@@ -19,15 +19,15 @@
import org.apache.wicket.model.IModel;
/**
- * A text field which automatically adds a Required. This is mainly for
- * convenience, since you can always add(new Required()) manually.
+ * A text field which automatically adds a Required. This is mainly for convenience, since you can
+ * always add(new Required()) manually.
*
* @author Jonathan Locke
*/
public class RequiredTextField extends TextField
{
private static final long serialVersionUID = 1L;
-
+
/**
* @see org.apache.wicket.Component#Component(String)
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java Mon Oct 15 14:21:25 2007
@@ -20,16 +20,16 @@
import org.apache.wicket.model.IModel;
/**
- * A link which can be used exactly like a Button to submit a Form. The href of
- * the link will use JavaScript to submit the form.
+ * A link which can be used exactly like a Button to submit a Form. The href of the link will use
+ * JavaScript to submit the form.
*
* <p>
- * You can use this class 2 ways. First with the constructor without a Form
- * object then this Link must be inside a Form so that it knows what form to
- * submit to. Second way is to use the Form constructor then that form will be
- * used to submit to.
+ * You can use this class 2 ways. First with the constructor without a Form object then this Link
+ * must be inside a Form so that it knows what form to submit to. Second way is to use the Form
+ * constructor then that form will be used to submit to.
* </p>
* <p>
+ *
* <pre>
* Form f = new Form("linkForm", new CompoundPropertyModel(mod));
* f.add(new TextField("value1"));
@@ -53,11 +53,12 @@
* </form>
* <a wicket:id="link2">Press link 2 to submit</a>
* </pre>
+ *
* </p>
* <p>
- * If this link is not placed in a form or given a form to cooperate with, it will
- * fall back to a normal link behavior, meaning that {@link #onSubmit()} will be called
- * without any other consequences.
+ * If this link is not placed in a form or given a form to cooperate with, it will fall back to a
+ * normal link behavior, meaning that {@link #onSubmit()} will be called without any other
+ * consequences.
* </p>
*
* @author chris
@@ -81,14 +82,12 @@
}
/**
- * With this constructor the SubmitLink will submit the {@link Form} that is
- * given when the link is clicked on.
+ * With this constructor the SubmitLink will submit the {@link Form} that is given when the link
+ * is clicked on.
*
- * The SubmitLink doesn't have to be in inside the {@link Form}. But
- * currently if it is outside the {@link Form} and the SubmitLink will be
- * rendered first. Then the {@link Form} will have a generated
- * javascript/css id. The markup javascript/css id that can exist will be
- * overridden.
+ * The SubmitLink doesn't have to be in inside the {@link Form}. But currently if it is outside
+ * the {@link Form} and the SubmitLink will be rendered first. Then the {@link Form} will have a
+ * generated javascript/css id. The markup javascript/css id that can exist will be overridden.
*
* @param id
* The id of the submitlink.
@@ -107,8 +106,8 @@
* @param id
* The id of the submitlink.
* @param model
- * The model for this submitlink, It won't be used by the submit
- * link itself, but it can be used for keeping state
+ * The model for this submitlink, It won't be used by the submit link itself, but it
+ * can be used for keeping state
*/
public SubmitLink(String id, IModel model)
{
@@ -116,20 +115,18 @@
}
/**
- * With this constructor the SubmitLink will submit the {@link Form} that is
- * given when the link is clicked on.
+ * With this constructor the SubmitLink will submit the {@link Form} that is given when the link
+ * is clicked on.
*
- * The SubmitLink doesn't have to be in inside the {@link Form}. But
- * currently if it is outside the {@link Form} and the SubmitLink will be
- * rendered first. Then the {@link Form} will have a generated
- * javascript/css id. The markup javascript/css id that can exist will be
- * overridden.
+ * The SubmitLink doesn't have to be in inside the {@link Form}. But currently if it is outside
+ * the {@link Form} and the SubmitLink will be rendered first. Then the {@link Form} will have a
+ * generated javascript/css id. The markup javascript/css id that can exist will be overridden.
*
* @param id
* The id of the submitlink.
* @param model
- * The model for this submitlink, It won't be used by the submit
- * link itself, but it can be used for keeping state
+ * The model for this submitlink, It won't be used by the submit link itself, but it
+ * can be used for keeping state
* @param form
* The form which this submitlink must submit.
*/
@@ -139,9 +136,9 @@
}
/**
- * This method is here as a means to fall back on normal link
- * behavior when this link is not nested in a form. Not intended
- * to be called by clients directly.
+ * This method is here as a means to fall back on normal link behavior when this link is not
+ * nested in a form. Not intended to be called by clients directly.
+ *
* @see org.apache.wicket.markup.html.link.ILinkListener#onLinkClicked()
*/
public final void onLinkClicked()
@@ -172,11 +169,10 @@
}
/**
- * Controls whether or not clicking on this link will invoke form's
- * javascript onsubmit handler. True by default.
+ * Controls whether or not clicking on this link will invoke form's javascript onsubmit handler.
+ * True by default.
*
- * @return true if form's javascript onsubmit handler should be invoked,
- * false otherwise
+ * @return true if form's javascript onsubmit handler should be invoked, false otherwise
*/
protected boolean shouldInvokeJavascriptFormOnsubmit()
{
@@ -190,7 +186,8 @@
*/
protected final String getTriggerJavaScript()
{
- if (getForm() != null) {
+ if (getForm() != null)
+ {
// find the root form - the one we are really going to submit
Form root = getForm().getRootForm();
StringBuffer sb = new StringBuffer(100);
@@ -198,7 +195,7 @@
sb.append(root.getHiddenFieldId());
sb.append("'); e.name=\'");
sb.append(getInputName());
- sb.append("'; e.value='x';");
+ sb.append("'; e.value='x';");
sb.append("var f=document.getElementById('");
sb.append(root.getMarkupId());
sb.append("');");
@@ -214,15 +211,18 @@
{
sb.append("var ff=f;");
}
- sb.append("if (ff.onsubmit != undefined) { if (ff.onsubmit()==false) return false; }");
+ sb
+ .append("if (ff.onsubmit != undefined) { if (ff.onsubmit()==false) return false; }");
}
sb.append("f.submit();e.value='';e.name='';return false;");
return sb.toString();
- } else {
+ }
+ else
+ {
return null;
}
- }
-
+ }
+
/**
* @see org.apache.wicket.markup.html.form.IFormSubmittingComponent#onSubmit()
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java Mon Oct 15 14:21:25 2007
@@ -28,7 +28,7 @@
public class TextArea extends AbstractTextComponent
{
private static final long serialVersionUID = 1L;
-
+
/**
* @see org.apache.wicket.Component#Component(String)
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/TextField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/TextField.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/TextField.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/TextField.java Mon Oct 15 14:21:25 2007
@@ -21,7 +21,7 @@
/**
* A simple text field.
- *
+ *
* @author Jonathan Locke
*/
public class TextField extends AbstractTextComponent
@@ -73,7 +73,7 @@
/**
* Processes the component tag.
- *
+ *
* @param tag
* Tag to modify
* @see org.apache.wicket.Component#onComponentTag(ComponentTag)
@@ -106,7 +106,7 @@
/**
* Subclass should override this method if this textfield is mapped on a different input type as
* text. Like PasswordField or HiddenField.
- *
+ *
* @return The input type of this textfield, default is null
*/
protected String getInputType()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java Mon Oct 15 14:21:25 2007
@@ -24,12 +24,10 @@
/**
- * This class is the parameter to {@link Component#error(Serializable)} instead
- * of the generated error string itself (when
- * {@link FormComponent#error(IValidationError)} is called). The advantage is
- * that a custom feedback panel would still have access to the underlying
- * {@link IValidationError} that generated the error message - providing much
- * more context.
+ * This class is the parameter to {@link Component#error(Serializable)} instead of the generated
+ * error string itself (when {@link FormComponent#error(IValidationError)} is called). The advantage
+ * is that a custom feedback panel would still have access to the underlying
+ * {@link IValidationError} that generated the error message - providing much more context.
*
* @author Igor Vaynberg (ivaynberg)
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,8 @@
import org.apache.wicket.IClusterable;
/**
- * This class provides default values that are used by the CookieValuePersister
- * class when it creates cookies.
+ * This class provides default values that are used by the CookieValuePersister class when it
+ * creates cookies.
*
* @author Juergen Donnerstag
*/
@@ -107,8 +107,8 @@
}
/**
- * Returns true if the browser is sending cookies only over a secure
- * protocol, or false if the browser can send cookies using any protocol.
+ * Returns true if the browser is sending cookies only over a secure protocol, or false if the
+ * browser can send cookies using any protocol.
*
* @return whether this cookie is secure
*/
@@ -118,13 +118,12 @@
}
/**
- * Indicates to the browser whether the cookie should only be sent using a
- * secure protocol, such as HTTPS or SSL.
+ * Indicates to the browser whether the cookie should only be sent using a secure protocol, such
+ * as HTTPS or SSL.
*
* @param secure
- * if true, sends the cookie from the browser to the server using
- * only when using a secure protocol; if false, sent on any
- * protocol
+ * if true, sends the cookie from the browser to the server using only when using a
+ * secure protocol; if false, sent on any protocol
*/
public void setSecure(boolean secure)
{
@@ -132,13 +131,12 @@
}
/**
- * Returns the version of the protocol this cookie complies with. Version 1
- * complies with RFC 2109, and version 0 complies with the original cookie
- * specification drafted by Netscape. Cookies provided by a browser use and
- * identify the browser's cookie version.
+ * Returns the version of the protocol this cookie complies with. Version 1 complies with RFC
+ * 2109, and version 0 complies with the original cookie specification drafted by Netscape.
+ * Cookies provided by a browser use and identify the browser's cookie version.
*
- * @return 0 if the cookie complies with the original Netscape
- * specification; 1 if the cookie complies with RFC 2109
+ * @return 0 if the cookie complies with the original Netscape specification; 1 if the cookie
+ * complies with RFC 2109
*/
public int getVersion()
{
@@ -146,20 +144,17 @@
}
/**
- * Sets the version of the cookie protocol this cookie complies with.
- * Version 0 complies with the original Netscape cookie specification.
- * Version 1 complies with RFC 2109. <br/>Since RFC 2109 is still somewhat
- * new, consider version 1 as experimental; do not use it yet on production
- * sites.
+ * Sets the version of the cookie protocol this cookie complies with. Version 0 complies with
+ * the original Netscape cookie specification. Version 1 complies with RFC 2109. <br/>Since RFC
+ * 2109 is still somewhat new, consider version 1 as experimental; do not use it yet on
+ * production sites.
*
* @param version
- * 0 if the cookie should comply with the original Netscape
- * specification; 1 if the cookie should comply with RFC 2109
+ * 0 if the cookie should comply with the original Netscape specification; 1 if the
+ * cookie should comply with RFC 2109
*/
public void setVersion(int version)
{
this.version = version;
}
}
-
-
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java Mon Oct 15 14:21:25 2007
@@ -20,13 +20,12 @@
import org.apache.wicket.markup.html.form.FormComponent;
/**
- * Wicket users and developers should not need to care about where or how form
- * values are saved. An implementer of IValuePersister persister is responsible
- * for storing and retrieving FormComponent values. Different means of storing
- * values for form components may be implemented. CookieValuePersister, for
- * example, uses an HTTP cookie to persist the value of a form component. Other
- * implementations may instead persist form values to server-side storage for
- * security reasons.
+ * Wicket users and developers should not need to care about where or how form values are saved. An
+ * implementer of IValuePersister persister is responsible for storing and retrieving FormComponent
+ * values. Different means of storing values for form components may be implemented.
+ * CookieValuePersister, for example, uses an HTTP cookie to persist the value of a form component.
+ * Other implementations may instead persist form values to server-side storage for security
+ * reasons.
*
* @author Juergen Donnerstag
* @author Jonathan Locke
@@ -57,4 +56,3 @@
*/
void clear(FormComponent component);
}
-
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java Mon Oct 15 14:21:25 2007
@@ -26,10 +26,10 @@
import org.apache.wicket.util.upload.FileItem;
/**
- * Form component that corresponds to a <input type="file">.
- * When a FileInput component is nested in a
- * {@link org.apache.wicket.markup.html.form.Form}, that has multipart == true, its model
- * is updated with the {@link org.apache.wicket.util.upload.FileItem}for this component.
+ * Form component that corresponds to a <input type="file">. When a FileInput
+ * component is nested in a {@link org.apache.wicket.markup.html.form.Form}, that has multipart ==
+ * true, its model is updated with the {@link org.apache.wicket.util.upload.FileItem}for this
+ * component.
*
* @author Eelco Hillenius
*/
@@ -160,8 +160,8 @@
}
/**
- * Clean up at the end of the request. This means closing all inputstreams
- * which might have been opened from the fileUpload.
+ * Clean up at the end of the request. This means closing all inputstreams which might have been
+ * opened from the fileUpload.
*
* @see org.apache.wicket.Component#onDetach()
*/
@@ -174,12 +174,11 @@
}
super.onDetach();
}
-
+
/**
- * The FileUploadField will close any input streams you have opened in its
- * FileUpload by default. If you wish to manage the stream yourself (e.g.
- * you want to use it in another thread) then you can override this method
- * to prevent this behavior.
+ * The FileUploadField will close any input streams you have opened in its FileUpload by
+ * default. If you wish to manage the stream yourself (e.g. you want to use it in another
+ * thread) then you can override this method to prevent this behavior.
*
* @return
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java Mon Oct 15 14:21:25 2007
@@ -44,20 +44,19 @@
/**
- * Form component that allows the user to select multiple files to upload via a
- * single <input type="file"/> field.
- *
- * Notice that this component clears its model at the end of the request, so the
- * uploaded files MUST be processed within the request they were uploaded.
- *
+ * Form component that allows the user to select multiple files to upload via a single <input
+ * type="file"/> field.
+ *
+ * Notice that this component clears its model at the end of the request, so the uploaded files MUST
+ * be processed within the request they were uploaded.
+ *
* Uses javascript implementation from
* http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
- *
- * For customizing caption text see {@link #RESOURCE_LIMITED} and
- * {@link #RESOURCE_UNLIMITED}
- *
+ *
+ * For customizing caption text see {@link #RESOURCE_LIMITED} and {@link #RESOURCE_UNLIMITED}
+ *
* For an example of styling using CSS see the upload example in wicket-examples
- *
+ *
* @author Igor Vaynberg (ivaynberg)
*/
public class MultiFileUploadField extends FormComponentPanel implements IHeaderContributor
@@ -70,18 +69,17 @@
public static final int UNLIMITED = 1;
/**
- * Resource key used to retrieve caption message for when a limit on the
- * number of uploads is specified. The limit is represented via ${max}
- * variable.
- *
+ * Resource key used to retrieve caption message for when a limit on the number of uploads is
+ * specified. The limit is represented via ${max} variable.
+ *
* Example: org.apache.wicket.mfu.caption.limited=Files (maximum ${max}):
*/
public static final String RESOURCE_LIMITED = "org.apache.wicket.mfu.caption.limited";
/**
- * Resource key used to retrieve caption message for when no limit on the
- * number of uploads is specified.
- *
+ * Resource key used to retrieve caption message for when no limit on the number of uploads is
+ * specified.
+ *
* Example: org.apache.wicket.mfu.caption.unlimited=Files:
*/
public static final String RESOURCE_UNLIMITED = "org.apache.wicket.mfu.caption.unlimited";
@@ -105,7 +103,7 @@
/**
* Constructor
- *
+ *
* @param id
*/
public MultiFileUploadField(String id)
@@ -115,7 +113,7 @@
/**
* Constructor
- *
+ *
* @param id
* @param max
* max number of files a user can upload
@@ -127,7 +125,7 @@
/**
* Constructor
- *
+ *
* @param id
* @param model
*/
@@ -138,12 +136,12 @@
/**
* Constructor
- *
+ *
* @param id
* @param model
* @param max
* max number of files a user can upload
- *
+ *
*/
public MultiFileUploadField(String id, IModel model, int max)
{
@@ -356,7 +354,7 @@
/**
* Model that will construct the caption string
- *
+ *
* @author ivaynberg
*/
private class CaptionModel extends AbstractReadOnlyModel
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java Mon Oct 15 14:21:25 2007
@@ -28,26 +28,26 @@
/**
* Base class for {@link org.apache.wicket.markup.html.form.validation.IFormValidator}s.
- *
+ *
* @author Igor Vaynberg (ivaynberg)
*/
public abstract class AbstractFormValidator implements IFormValidator
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
/**
* DEPRECATED/UNSUPPORTED
- *
+ *
* Gets the default variables for interpolation.
- *
+ *
* @return a map with the variables for interpolation
- *
+ *
* @deprecated use {@link #variablesMap()} instead
* @throws UnsupportedOperationException
- *
+ *
* FIXME 2.0: remove asap
*/
protected final Map messageModel()
@@ -57,13 +57,12 @@
/**
- * Reports an error against validatable using the map returned by
- * {@link #variablesMap()}for variable interpolations and
- * message key returned by {@link #resourceKey()}.
- *
+ * Reports an error against validatable using the map returned by {@link #variablesMap()}for
+ * variable interpolations and message key returned by {@link #resourceKey()}.
+ *
* @param fc
* form component against which the error is reported
- *
+ *
*/
public void error(FormComponent fc)
{
@@ -72,7 +71,7 @@
/**
* Reports an error against the validatable using the given resource key
- *
+ *
* @param fc
* form component against which the error is reported
* @param resourceKey
@@ -88,10 +87,9 @@
}
/**
- * Reports an error against the validatable using the given map for variable
- * interpolations and message resource key provided by
- * {@link #resourceKey()}
- *
+ * Reports an error against the validatable using the given map for variable interpolations and
+ * message resource key provided by {@link #resourceKey()}
+ *
* @param fc
* form component against which the error is reported
* @param vars
@@ -107,9 +105,8 @@
}
/**
- * Reports an error against the validatable using the specified resource key
- * and variable map
- *
+ * Reports an error against the validatable using the specified resource key and variable map
+ *
* @param fc
* form component against which the error is reported
* @param resourceKey
@@ -145,16 +142,14 @@
}
/**
- * Gets the default variables for interpolation. These are for every
- * component:
+ * Gets the default variables for interpolation. These are for every component:
* <ul>
* <li>${input(n)}: the user's input</li>
* <li>${name(n)}: the name of the component</li>
- * <li>${label(n)}: the label of the component - either comes from
- * FormComponent.labelModel or resource key [form-id].[form-component-id] in
- * that order</li>
+ * <li>${label(n)}: the label of the component - either comes from FormComponent.labelModel or
+ * resource key [form-id].[form-component-id] in that order</li>
* </ul>
- *
+ *
* @return a map with the variables for interpolation
*/
protected Map variablesMap()
@@ -192,9 +187,8 @@
}
/**
- * Gets the resource key for validator's error message from the
- * ApplicationSettings class.
- *
+ * Gets the resource key for validator's error message from the ApplicationSettings class.
+ *
* @return the resource key based on the form component
*/
protected String resourceKey()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java Mon Oct 15 14:21:25 2007
@@ -21,15 +21,13 @@
import org.apache.wicket.util.lang.Objects;
/**
- * Validates that the input of two form components is identical. Errors are
- * reported on the second form component with key 'EqualInputValidator' and
- * the variables:
+ * Validates that the input of two form components is identical. Errors are reported on the second
+ * form component with key 'EqualInputValidator' and the variables:
* <ul>
* <li>${input(n)}: the user's input</li>
* <li>${name}: the name of the component</li>
- * <li>${label(n)}: the label of the component - either comes from
- * FormComponent.labelModel or resource key [form-id].[form-component-id] in
- * that order</li>
+ * <li>${label(n)}: the label of the component - either comes from FormComponent.labelModel or
+ * resource key [form-id].[form-component-id] in that order</li>
* </ul>
*
* @author Igor Vaynberg (ivaynberg)
@@ -88,5 +86,5 @@
error(formComponent2);
}
}
-
+
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java Mon Oct 15 14:21:25 2007
@@ -19,15 +19,13 @@
import org.apache.wicket.markup.html.form.FormComponent;
/**
- * Validates that the input of two form components is identical. Errors are
- * reported on the second form component with key 'EqualInputValidator' and the
- * variables:
+ * Validates that the input of two form components is identical. Errors are reported on the second
+ * form component with key 'EqualInputValidator' and the variables:
* <ul>
* <li>${input(n)}: the user's input</li>
* <li>${name}: the name of the component</li>
- * <li>${label(n)}: the label of the component - either comes from
- * FormComponent.labelModel or resource key [form-id].[form-component-id] in
- * that order</li>
+ * <li>${label(n)}: the label of the component - either comes from FormComponent.labelModel or
+ * resource key [form-id].[form-component-id] in that order</li>
* </ul>
*
* @author Igor Vaynberg (ivaynberg)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java Mon Oct 15 14:21:25 2007
@@ -24,14 +24,14 @@
import org.apache.wicket.markup.html.border.Border;
/**
- * A border that can be placed around a form component to indicate when the
- * bordered child/children has a validation error. A child of the border named
- * "errorIndicator" will be shown and hidden depending on whether the child has
- * an error. A typical error indicator might be a little red asterisk.
+ * A border that can be placed around a form component to indicate when the bordered child/children
+ * has a validation error. A child of the border named "errorIndicator" will be shown and hidden
+ * depending on whether the child has an error. A typical error indicator might be a little red
+ * asterisk.
* <p>
* <strong>Note: </strong> Since this border checks its children do not use
* setTransparentResolver(true) and add the children directly into the border
- *
+ *
* @author Jonathan Locke
* @author Eelco Hillenius
*/
@@ -43,8 +43,8 @@
private boolean visible;
/**
- * Error indicator that will be shown whenever there is an error-level
- * message for the collecting component.
+ * Error indicator that will be shown whenever there is an error-level message for the
+ * collecting component.
*/
private final class ErrorIndicator extends WebMarkupContainer
{
@@ -52,7 +52,7 @@
/**
* Construct.
- *
+ *
* @param id
* component id
*/
@@ -72,7 +72,7 @@
/**
* Constructor.
- *
+ *
* @param id
* See Component
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java Mon Oct 15 14:21:25 2007
@@ -25,13 +25,12 @@
import org.apache.wicket.model.IModel;
/**
- * A panel that hides or shows itself depending on whether there are feedback
- * messages for a given message filter. If a component is set using
- * setIndicatorFor(Component), then the indicator is visible when the given
- * component has an error. The default content for this indicator is a red star,
- * but you can subclass this panel and provide your own markup to give any
- * custom look you desire.
- *
+ * A panel that hides or shows itself depending on whether there are feedback messages for a given
+ * message filter. If a component is set using setIndicatorFor(Component), then the indicator is
+ * visible when the given component has an error. The default content for this indicator is a red
+ * star, but you can subclass this panel and provide your own markup to give any custom look you
+ * desire.
+ *
* @author Jonathan Locke
*/
public class FormComponentFeedbackIndicator extends Panel implements IFeedback
@@ -43,7 +42,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java Mon Oct 15 14:21:25 2007
@@ -21,14 +21,14 @@
import org.apache.wicket.markup.html.form.FormComponent;
/**
- * Interface that represents validators that check multiple components. These
- * validators are added to the form and only executed if all form components
- * returned by {@link IFormValidator#getDependentFormComponents()} have been
- * successfully validated before this validator runs.
+ * Interface that represents validators that check multiple components. These validators are added
+ * to the form and only executed if all form components returned by
+ * {@link IFormValidator#getDependentFormComponents()} have been successfully validated before this
+ * validator runs.
*
- * TODO post 1.3: remove validate(form) *make IFormValidator extends IValidator
- * where IValidatable's value is form.modelobject and error reports on form -
- * that way IBehaviorProvider can extend IValidator
+ * TODO post 1.3: remove validate(form) *make IFormValidator extends IValidator where IValidatable's
+ * value is form.modelobject and error reports on form - that way IBehaviorProvider can extend
+ * IValidator
*
* @author Igor Vaynberg (ivaynberg)
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextImage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextImage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextImage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextImage.java Mon Oct 15 14:21:25 2007
@@ -24,9 +24,8 @@
/**
* Provides a context-relative image.
* <p>
- * Provide a String in this component's model which will be prefixed such that
- * the image is relative to the context root, no matter what URL the page the
- * ContextImage is on is rendered at.
+ * Provide a String in this component's model which will be prefixed such that the image is relative
+ * to the context root, no matter what URL the page the ContextImage is on is rendered at.
*
* @author Alastair Maw
*/
@@ -57,6 +56,8 @@
{
checkComponentTag(tag, "img");
super.onComponentTag(tag);
- tag.put("src", getRequest().getRelativePathPrefixToContextRoot() + getModelObjectAsString());
+ tag
+ .put("src", getRequest().getRelativePathPrefixToContextRoot() +
+ getModelObjectAsString());
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java Mon Oct 15 14:21:25 2007
@@ -23,8 +23,8 @@
import org.apache.wicket.util.value.ValueMap;
/**
- * A subclass of {@link Image} that adds random noise to the url every request
- * to prevent the browser from caching the image.
+ * A subclass of {@link Image} that adds random noise to the url every request to prevent the
+ * browser from caching the image.
*
* @author Igor Vaynberg (ivaynberg)
*/
@@ -125,7 +125,7 @@
String url = tag.getAttributes().getString("src");
url = url + ((url.indexOf("?") >= 0) ? "&" : "?");
url = url + "wicket:antiCache=" + System.currentTimeMillis();
-
+
tag.put("src", url);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java Mon Oct 15 14:21:25 2007
@@ -28,52 +28,54 @@
/**
- * An ImageResource subclass for dynamic images that come from database BLOB
- * fields. Subclasses override getBlob() to provide the image data to send back
- * to the user. A given subclass may decide how to produce this data and
- * whether/how to buffer it.
+ * An ImageResource subclass for dynamic images that come from database BLOB fields. Subclasses
+ * override getBlob() to provide the image data to send back to the user. A given subclass may
+ * decide how to produce this data and whether/how to buffer it.
*
* @author Eelco Hillenius
*/
public abstract class BlobImageResource extends DynamicImageResource
{
- /**
+ /**
*
*/
private static final long serialVersionUID = 1L;
-/**
- * Construct.
- * @param locale
- */
- public BlobImageResource(Locale locale)
- {
- super(locale);
- }
-
- /**
- * Construct.
- * @param format
- * @param locale
- */
- public BlobImageResource(String format, Locale locale)
- {
- super(format, locale);
- }
-
- /**
- * Construct.
- * @param format
- */
- public BlobImageResource(String format)
- {
- super(format);
- }
-
- /**
- * Construct.
- */
- public BlobImageResource()
+ /**
+ * Construct.
+ *
+ * @param locale
+ */
+ public BlobImageResource(Locale locale)
+ {
+ super(locale);
+ }
+
+ /**
+ * Construct.
+ *
+ * @param format
+ * @param locale
+ */
+ public BlobImageResource(String format, Locale locale)
+ {
+ super(format, locale);
+ }
+
+ /**
+ * Construct.
+ *
+ * @param format
+ */
+ public BlobImageResource(String format)
+ {
+ super(format);
+ }
+
+ /**
+ * Construct.
+ */
+ public BlobImageResource()
{
}
@@ -103,11 +105,11 @@
throw new WicketRuntimeException("Error while reading image data", e);
}
}
-
- /**
- * Gets the BLOB (Binary Large OBject) that holds the raw image data.
- *
- * @return the BLOB
- */
- protected abstract Blob getBlob();
+
+ /**
+ * Gets the BLOB (Binary Large OBject) that holds the raw image data.
+ *
+ * @return the BLOB
+ */
+ protected abstract Blob getBlob();
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/BufferedDynamicImageResource.java Mon Oct 15 14:21:25 2007
@@ -20,73 +20,75 @@
import java.util.Locale;
/**
- * A DynamicImageResource subclass that holds a BufferedImage generated by code
- * elsewhere. The image is held in a non-transient field, and so if this
- * resource is clustered, the entire image will be serialized and copied. If you
- * can regenerate your image by drawing on a Graphics2D, you should prefer the
- * RenderedDynamicImageResource class instead since its image data is transient
- * and therefore it is very lightweight when clustered.
+ * A DynamicImageResource subclass that holds a BufferedImage generated by code elsewhere. The image
+ * is held in a non-transient field, and so if this resource is clustered, the entire image will be
+ * serialized and copied. If you can regenerate your image by drawing on a Graphics2D, you should
+ * prefer the RenderedDynamicImageResource class instead since its image data is transient and
+ * therefore it is very lightweight when clustered.
* <p>
- * The format of the image (and therefore the resource's extension) can be
- * specified with setFormat(String). The default format is "PNG" because JPEG is
- * lossy and makes generated images look bad and GIF has patent issues.
- *
+ * The format of the image (and therefore the resource's extension) can be specified with
+ * setFormat(String). The default format is "PNG" because JPEG is lossy and makes generated images
+ * look bad and GIF has patent issues.
+ *
* @see org.apache.wicket.markup.html.image.resource.RenderedDynamicImageResource
* @author Jonathan Locke
*/
public class BufferedDynamicImageResource extends DynamicImageResource
{
- private static final long serialVersionUID = 1L;
-
- /** The byte array holding the contents of the dynamic image */
- private byte[] imageData;
-
- /**
- * Construct.
- */
- public BufferedDynamicImageResource()
- {
- }
-
- /**
- * Construct.
- * @param locale
- */
- public BufferedDynamicImageResource(Locale locale)
- {
- super(locale);
- }
-
- /**
- * Construct.
- * @param format
- * @param locale
- */
- public BufferedDynamicImageResource(String format, Locale locale)
- {
- super(format, locale);
- }
-
- /**
- * Construct.
- * @param format
- */
- public BufferedDynamicImageResource(String format)
- {
- super(format);
- }
-
- /**
- * @param image
- * The image to set
- */
- public synchronized void setImage(final BufferedImage image)
- {
- imageData = toImageData(image);
- }
-
- protected byte[] getImageData()
- {
- return imageData;
- }
+ private static final long serialVersionUID = 1L;
+
+ /** The byte array holding the contents of the dynamic image */
+ private byte[] imageData;
+
+ /**
+ * Construct.
+ */
+ public BufferedDynamicImageResource()
+ {
+ }
+
+ /**
+ * Construct.
+ *
+ * @param locale
+ */
+ public BufferedDynamicImageResource(Locale locale)
+ {
+ super(locale);
+ }
+
+ /**
+ * Construct.
+ *
+ * @param format
+ * @param locale
+ */
+ public BufferedDynamicImageResource(String format, Locale locale)
+ {
+ super(format, locale);
+ }
+
+ /**
+ * Construct.
+ *
+ * @param format
+ */
+ public BufferedDynamicImageResource(String format)
+ {
+ super(format);
+ }
+
+ /**
+ * @param image
+ * The image to set
+ */
+ public synchronized void setImage(final BufferedImage image)
+ {
+ imageData = toImageData(image);
+ }
+
+ protected byte[] getImageData()
+ {
+ return imageData;
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResourceFactory.java Mon Oct 15 14:21:25 2007
@@ -36,18 +36,22 @@
public class DefaultButtonImageResourceFactory implements IResourceFactory
{
/**
- * @see org.apache.wicket.IResourceFactory#newResource(java.lang.String, java.util.Locale, java.lang.String)
+ * @see org.apache.wicket.IResourceFactory#newResource(java.lang.String, java.util.Locale,
+ * java.lang.String)
*/
public Resource newResource(final String specification, final Locale locale, final String style)
{
final Parser parser = new Parser(specification);
if (parser.matches())
{
- return new DefaultButtonImageResource(parser.getWidth(), parser.getHeight(), parser.getLabel());
+ return new DefaultButtonImageResource(parser.getWidth(), parser.getHeight(), parser
+ .getLabel());
}
else
{
- throw new WicketRuntimeException("DefaultButtonImageResourceFactory does not recognized the specification " + specification);
+ throw new WicketRuntimeException(
+ "DefaultButtonImageResourceFactory does not recognized the specification " +
+ specification);
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java Mon Oct 15 14:21:25 2007
@@ -29,186 +29,183 @@
/**
- * An ImageResource subclass for dynamic images (images created
- * programmatically). Subclasses override getImageData() to provide the image
- * data to send back to the user. A given subclass may decide how to produce
- * this data and whether/how to buffer it.
+ * An ImageResource subclass for dynamic images (images created programmatically). Subclasses
+ * override getImageData() to provide the image data to send back to the user. A given subclass may
+ * decide how to produce this data and whether/how to buffer it.
* <p>
- * The RenderedDynamicImageResource subclass is designed for images that can be
- * regenerated when the component is deserialized (the image data is transient).
- * A good example of a RenderedDynamicImageResource is the
- * DefaultButtonImageResource class, which can regenerate a given button image
- * at any time. This makes it very lightweight when clustered. The
- * BufferedDynamicImageResource class, on the other hand, is designed for images
- * that cannot be regenerated on demand. It buffers its image data in a
- * non-transient way, which means that the entire image will be serialized and
- * copied when the resource is replicated in a cluster!
+ * The RenderedDynamicImageResource subclass is designed for images that can be regenerated when the
+ * component is deserialized (the image data is transient). A good example of a
+ * RenderedDynamicImageResource is the DefaultButtonImageResource class, which can regenerate a
+ * given button image at any time. This makes it very lightweight when clustered. The
+ * BufferedDynamicImageResource class, on the other hand, is designed for images that cannot be
+ * regenerated on demand. It buffers its image data in a non-transient way, which means that the
+ * entire image will be serialized and copied when the resource is replicated in a cluster!
* <p>
- * The helper method toImageData(BufferedImage) is provided so that subclasses
- * can easily turn a BufferedImage into a suitable return value when
- * implementing getImageData().
+ * The helper method toImageData(BufferedImage) is provided so that subclasses can easily turn a
+ * BufferedImage into a suitable return value when implementing getImageData().
* <p>
- * The format of the image (and therefore the resource's extension) can be
- * specified with setFormat(String). The default format is "PNG" because JPEG is
- * lossy and makes generated images look bad and GIF has patent issues.
- *
+ * The format of the image (and therefore the resource's extension) can be specified with
+ * setFormat(String). The default format is "PNG" because JPEG is lossy and makes generated images
+ * look bad and GIF has patent issues.
+ *
* @author Jonathan Locke
* @author Gili Tzabari
* @author Johan Compagner
*/
public abstract class DynamicImageResource extends DynamicWebResource
{
- /**
+ /**
*
*/
private static final long serialVersionUID = 1L;
-/** The image type */
- private String format = "png";
-
- /** The last modified time of this resource */
- private Time lastModifiedTime;
-
- /**
- * Creates a dynamic image resource.
- */
- public DynamicImageResource()
- {}
-
- /**
- * Creates a dynamic resource from for the given locale
- *
- * @param locale
- * The locale of this resource
- */
- public DynamicImageResource(Locale locale)
- {
- super(locale);
- }
-
- /**
- * Creates a dynamic resource from for the given locale
- *
- * @param format
- * The image format ("png", "jpeg", etc)
- */
- public DynamicImageResource(String format)
- {
- setFormat(format);
- }
-
- /**
- * Creates a dynamic resource from for the given locale
- *
- * @param format
- * The image format ("png", "jpeg", etc)
- * @param locale
- * The locale of this resource
- */
- public DynamicImageResource(String format, Locale locale)
- {
- super(locale);
- setFormat(format);
- }
-
- /**
- * @return Returns the image format.
- */
- public synchronized final String getFormat()
- {
- return format;
- }
-
- /**
- * Sets the format of this resource
- *
- * @param format
- * The format (jpg, png or gif..)
- */
- public synchronized final void setFormat(String format)
- {
- this.format = format;
- }
-
- /**
- * set the last modified time for this resource.
- *
- * @param time
- */
- protected synchronized void setLastModifiedTime(Time time)
- {
- lastModifiedTime = time;
- }
-
- /**
- * @param image
- * The image to turn into data
- * @return The image data for this dynamic image
- */
- protected byte[] toImageData(final BufferedImage image)
- {
- try
- {
- // Create output stream
- final ByteArrayOutputStream out = new ByteArrayOutputStream();
-
- // Write image using any matching ImageWriter
- ImageIO.write(image, format, out);
-
- // Return the image data
- return out.toByteArray();
- }
- catch (IOException e)
- {
- throw new WicketRuntimeException("Unable to convert dynamic image to stream", e);
- }
- }
-
- /**
- * @see DynamicWebResource#getResourceState()
- */
- protected synchronized ResourceState getResourceState()
- {
- return new ResourceState()
- {
- private byte[] imageData;
- private final String contentType = "image/" + format;
-
- public Time lastModifiedTime()
- {
- if (lastModifiedTime == null)
- {
- lastModifiedTime = DynamicImageResource.this.lastModifiedTime;
- if (lastModifiedTime == null)
+ /** The image type */
+ private String format = "png";
+
+ /** The last modified time of this resource */
+ private Time lastModifiedTime;
+
+ /**
+ * Creates a dynamic image resource.
+ */
+ public DynamicImageResource()
+ {
+ }
+
+ /**
+ * Creates a dynamic resource from for the given locale
+ *
+ * @param locale
+ * The locale of this resource
+ */
+ public DynamicImageResource(Locale locale)
+ {
+ super(locale);
+ }
+
+ /**
+ * Creates a dynamic resource from for the given locale
+ *
+ * @param format
+ * The image format ("png", "jpeg", etc)
+ */
+ public DynamicImageResource(String format)
+ {
+ setFormat(format);
+ }
+
+ /**
+ * Creates a dynamic resource from for the given locale
+ *
+ * @param format
+ * The image format ("png", "jpeg", etc)
+ * @param locale
+ * The locale of this resource
+ */
+ public DynamicImageResource(String format, Locale locale)
+ {
+ super(locale);
+ setFormat(format);
+ }
+
+ /**
+ * @return Returns the image format.
+ */
+ public synchronized final String getFormat()
+ {
+ return format;
+ }
+
+ /**
+ * Sets the format of this resource
+ *
+ * @param format
+ * The format (jpg, png or gif..)
+ */
+ public synchronized final void setFormat(String format)
+ {
+ this.format = format;
+ }
+
+ /**
+ * set the last modified time for this resource.
+ *
+ * @param time
+ */
+ protected synchronized void setLastModifiedTime(Time time)
+ {
+ lastModifiedTime = time;
+ }
+
+ /**
+ * @param image
+ * The image to turn into data
+ * @return The image data for this dynamic image
+ */
+ protected byte[] toImageData(final BufferedImage image)
+ {
+ try
{
- lastModifiedTime = Time.now();
+ // Create output stream
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+ // Write image using any matching ImageWriter
+ ImageIO.write(image, format, out);
+
+ // Return the image data
+ return out.toByteArray();
}
- }
- return lastModifiedTime;
- }
-
- public byte[] getData()
- {
- if (imageData==null)
+ catch (IOException e)
{
- imageData = getImageData();
+ throw new WicketRuntimeException("Unable to convert dynamic image to stream", e);
}
- return imageData;
- }
-
- public String getContentType()
- {
- return contentType;
- }
- };
- }
-
- /**
- * Get image data for our dynamic image resource. If the subclass
- * regenerates the data, it should set the lastModifiedTime when it does so.
- * This ensures that image caching works correctly.
- *
- * @return The image data for this dynamic image
- */
- protected abstract byte[] getImageData();
+ }
+
+ /**
+ * @see DynamicWebResource#getResourceState()
+ */
+ protected synchronized ResourceState getResourceState()
+ {
+ return new ResourceState()
+ {
+ private byte[] imageData;
+ private final String contentType = "image/" + format;
+
+ public Time lastModifiedTime()
+ {
+ if (lastModifiedTime == null)
+ {
+ lastModifiedTime = DynamicImageResource.this.lastModifiedTime;
+ if (lastModifiedTime == null)
+ {
+ lastModifiedTime = Time.now();
+ }
+ }
+ return lastModifiedTime;
+ }
+
+ public byte[] getData()
+ {
+ if (imageData == null)
+ {
+ imageData = getImageData();
+ }
+ return imageData;
+ }
+
+ public String getContentType()
+ {
+ return contentType;
+ }
+ };
+ }
+
+ /**
+ * Get image data for our dynamic image resource. If the subclass regenerates the data, it
+ * should set the lastModifiedTime when it does so. This ensures that image caching works
+ * correctly.
+ *
+ * @return The image data for this dynamic image
+ */
+ protected abstract byte[] getImageData();
}