Author: jdonnerstag Date: Wed Apr 16 13:58:34 2008 New Revision: 648844 URL: http://svn.apache.org/viewvc?rev=648844&view=rev Log: generics
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java wicket/trunk/wicket/src/main/java/org/apache/wicket/Request.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/BoxBorder.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Wed Apr 16 13:58:34 2008 @@ -2594,7 +2594,7 @@ * @param container * The HtmlHeaderContainer */ - public void renderHead(final HtmlHeaderContainer container) + public void renderHead(final HtmlHeaderContainer< ? > container) { if (isVisible()) { Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Request.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Request.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/Request.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Request.java Wed Apr 16 13:58:34 2008 @@ -88,7 +88,7 @@ * * @return Map of parameters */ - public abstract Map getParameterMap(); + public abstract Map<String, String[]> getParameterMap(); /** * Gets an array of multiple parameters by name. @@ -136,6 +136,7 @@ * @return Request URL * @deprecated Use [EMAIL PROTECTED] #getURL()} instead. */ + @Deprecated public String getRelativeURL() { return getURL(); @@ -161,7 +162,7 @@ if (encoder == null) { throw new WicketRuntimeException("request encoder must be not-null (provided by " + - processor + ")"); + processor + ")"); } // decode the request parameters into a strongly typed parameters @@ -181,7 +182,7 @@ if (requestParameters == null) { throw new WicketRuntimeException("request parameters must be not-null (provided by " + - encoder + ")"); + encoder + ")"); } return requestParameters; } @@ -220,15 +221,16 @@ /** * @see java.lang.Object#toString() */ + @Override public String toString() { return "Request[url=" + getURL() + "]"; } - + /** * Returns the query string (part after ?) of this request. * - * @return request query string + * @return request query string */ - public abstract String getQueryString(); + public abstract String getQueryString(); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java Wed Apr 16 13:58:34 2008 @@ -19,7 +19,6 @@ import java.lang.ref.WeakReference; import java.util.Locale; -import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; /** @@ -32,7 +31,7 @@ */ public class ContainerInfo { - private final WeakReference<Class< ? extends Component>> containerClassRef; + private final WeakReference<Class< ? >> containerClassRef; private final Locale locale; private final String style; private final String variation; @@ -59,11 +58,11 @@ * @param variation * @param fileExtension */ - public ContainerInfo(final Class< ? extends Component> containerClass, final Locale locale, - final String style, final String variation, final String fileExtension) + public ContainerInfo(final Class< ? > containerClass, final Locale locale, final String style, + final String variation, final String fileExtension) { super(); - containerClassRef = new WeakReference<Class< ? extends Component>>(containerClass); + containerClassRef = new WeakReference<Class< ? >>(containerClass); this.locale = locale; this.style = style; this.variation = variation; @@ -74,7 +73,7 @@ * * @return The container class */ - public Class< ? extends Component> getContainerClass() + public Class< ? > getContainerClass() { return containerClassRef.get(); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java Wed Apr 16 13:58:34 2008 @@ -224,14 +224,14 @@ * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer, * org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag) */ - public boolean resolve(final MarkupContainer container, final MarkupStream markupStream, + public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream, final ComponentTag tag) { // In case of nested Borders, the outer border is no longer able to find // its body container easily. Thus we need to help resolve it. // The container is the body component. Get the Border component. - MarkupContainer border = container.getParent(); + MarkupContainer< ? > border = container.getParent(); while ((border != null) && !(border instanceof Border)) { border = border.getParent(); @@ -312,7 +312,7 @@ * @see org.apache.wicket.Component#renderHead(org.apache.wicket.markup.html.internal.HtmlHeaderContainer) */ @Override - public void renderHead(HtmlHeaderContainer container) + public void renderHead(HtmlHeaderContainer< ? > container) { renderHeadFromAssociatedMarkupFile(container); super.renderHead(container); Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/BoxBorder.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/BoxBorder.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/BoxBorder.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/BoxBorder.java Wed Apr 16 13:58:34 2008 @@ -20,8 +20,10 @@ * A very simple border component that draws a thin black line around its children. * * @author Jonathan Locke + * @param <T> + * The model object type */ -public final class BoxBorder extends Border +public final class BoxBorder<T> extends Border<T> { private static final long serialVersionUID = 1L; Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java Wed Apr 16 13:58:34 2008 @@ -62,7 +62,7 @@ * * @see org.apache.wicket.IComponentBorder#renderBefore(org.apache.wicket.Component) */ - public void renderBefore(Component component) + public void renderBefore(Component< ? > component) { final MarkupStream stream = getMarkupStream(component); final Response response = component.getResponse(); @@ -85,9 +85,9 @@ else { throw new WicketRuntimeException( - "Unexpected tag encountered in markup of component border " + - getClass().getName() + ". Tag: " + wt.toString() + - ", expected tag: <wicket:border>"); + "Unexpected tag encountered in markup of component border " + + getClass().getName() + ". Tag: " + wt.toString() + + ", expected tag: <wicket:border>"); } } else @@ -99,9 +99,9 @@ else { throw new WicketRuntimeException( - "Unexpected tag encountered in markup of component border " + - getClass().getName() + ". Tag: " + wt.toString() + - ", expected tag: <wicket:body> or </wicket:body>"); + "Unexpected tag encountered in markup of component border " + + getClass().getName() + ". Tag: " + wt.toString() + + ", expected tag: <wicket:body> or </wicket:body>"); } } } @@ -114,7 +114,7 @@ if (!stream.hasMore()) { throw new WicketRuntimeException("Markup for component border " + getClass().getName() + - " ended prematurely, was expecting </wicket:border>"); + " ended prematurely, was expecting </wicket:border>"); } } @@ -122,7 +122,7 @@ * * @see IComponentBorder#renderAfter(org.apache.wicket.Component) */ - public void renderAfter(Component component) + public void renderAfter(Component< ? > component) { final MarkupStream stream = getMarkupStream(component); final Response response = component.getResponse(); @@ -140,16 +140,21 @@ else { throw new WicketRuntimeException( - "Unexpected tag encountered in markup of component border " + - getClass().getName() + ". Tag: " + wt.toString() + - ", expected tag: </wicket:border>"); + "Unexpected tag encountered in markup of component border " + + getClass().getName() + ". Tag: " + wt.toString() + + ", expected tag: </wicket:border>"); } } response.write(e.toCharSequence()); } } - private MarkupStream getMarkupStream(Component component) + /** + * + * @param component + * @return + */ + private MarkupStream getMarkupStream(Component< ? > component) { if (markupStream == null) { @@ -158,7 +163,12 @@ return markupStream; } - private MarkupStream findMarkupStream(Component owner) + /** + * + * @param owner + * @return + */ + private MarkupStream findMarkupStream(Component< ? > owner) { final String markupType = getMarkupType(owner); @@ -167,28 +177,28 @@ // logic here // Get locator to search for the resource - final IResourceStreamLocator locator = Application.get().getResourceSettings() - .getResourceStreamLocator(); - + final IResourceStreamLocator locator = Application.get() + .getResourceSettings() + .getResourceStreamLocator(); final Session session = Session.get(); final String style = session.getStyle(); final Locale locale = session.getLocale(); MarkupResourceStream markupResourceStream = null; - Class containerClass = getClass(); + Class< ? > containerClass = getClass(); while (!(containerClass.equals(MarkupComponentBorder.class))) { String path = containerClass.getName().replace('.', '/'); IResourceStream resourceStream = locator.locate(containerClass, path, style, locale, - markupType); + markupType); // Did we find it already? if (resourceStream != null) { ContainerInfo ci = new ContainerInfo(containerClass, locale, style, null, - markupType); + markupType); markupResourceStream = new MarkupResourceStream(resourceStream, ci, containerClass); break; } @@ -201,29 +211,37 @@ if (markupResourceStream == null) { throw new WicketRuntimeException("Could not find markup for component border `" + - getClass().getName() + "`"); + getClass().getName() + "`"); } try { - Markup markup = Application.get().getMarkupSettings().getMarkupParserFactory() - .newMarkupParser(markupResourceStream).parse(); + Markup markup = Application.get() + .getMarkupSettings() + .getMarkupParserFactory() + .newMarkupParser(markupResourceStream) + .parse(); return new MarkupStream(markup); } catch (Exception e) { throw new WicketRuntimeException( - "Could not parse markup from markup resource stream: " + - markupResourceStream.toString()); + "Could not parse markup from markup resource stream: " + + markupResourceStream.toString()); } } - private String getMarkupType(Component component) + /** + * + * @param component + * @return + */ + private String getMarkupType(Component< ? > component) { String extension; if (component instanceof MarkupContainer) { - extension = ((MarkupContainer)component).getMarkupType(); + extension = ((MarkupContainer< ? >)component).getMarkupType(); } else { Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java Wed Apr 16 13:58:34 2008 @@ -45,9 +45,7 @@ */ abstract class AbstractChoice<T, E> extends FormComponent<T> { - /** - * - */ + /** */ private static final long serialVersionUID = 1L; /** The list of objects. */ Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java Wed Apr 16 13:58:34 2008 @@ -35,9 +35,7 @@ */ public abstract class AbstractSingleSelectChoice<T> extends AbstractChoice<T, T> { - /** - * - */ + /** */ private static final long serialVersionUID = 1L; /** String to display when the selected value is null and nullValid is false. */ Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java Wed Apr 16 13:58:34 2008 @@ -43,7 +43,7 @@ /** * Target form or null if the form is parent of the link. */ - private Form form; + private Form< ? > form; /** * If false, all standard processing like validating and model updating is skipped. @@ -79,7 +79,7 @@ * @param model * @param form */ - public AbstractSubmitLink(String id, IModel<T> model, Form form) + public AbstractSubmitLink(String id, IModel<T> model, Form< ? > form) { super(id, model); this.form = form; @@ -91,7 +91,7 @@ * @param id * @param form */ - public AbstractSubmitLink(String id, Form form) + public AbstractSubmitLink(String id, Form< ? > form) { super(id); this.form = form; @@ -149,7 +149,7 @@ /** * @see org.apache.wicket.markup.html.form.IFormSubmittingComponent#getForm() */ - public Form getForm() + public Form< ? > getForm() { if (form != null) { @@ -157,7 +157,7 @@ } else { - return (Form)findParent(Form.class); + return (Form< ? >)findParent(Form.class); } } @@ -169,12 +169,13 @@ // TODO: This is a copy & paste from the FormComponent class. String id = getId(); final PrependingStringBuffer inputName = new PrependingStringBuffer(id.length()); - Component c = this; + Component< ? > c = this; while (true) { inputName.prepend(id); c = c.getParent(); - if (c == null || (c instanceof Form && ((Form)c).isRootForm()) || c instanceof Page) + if (c == null || (c instanceof Form && ((Form< ? >)c).isRootForm()) || + c instanceof Page) { break; } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java Wed Apr 16 13:58:34 2008 @@ -43,7 +43,6 @@ /** Log for reporting. */ private static final Logger log = LoggerFactory.getLogger(AbstractTextComponent.class); - /** * */ @@ -57,7 +56,6 @@ */ public static interface ITextFormatProvider { - /** * Gets the pattern for printing output and parsing input. * @@ -79,7 +77,7 @@ /** * @see org.apache.wicket.Component#Component(String, IModel) */ - public AbstractTextComponent(final String id, final IModel model) + public AbstractTextComponent(final String id, final IModel< ? > model) { super(id, model); setConvertEmptyInputStringToNull(true); @@ -108,6 +106,10 @@ return false; } + /** + * + * @see org.apache.wicket.markup.html.form.FormComponent#convertInput() + */ @Override protected void convertInput() { @@ -129,13 +131,16 @@ resolveType(); } + /** + * + */ private void resolveType() { if (!getFlag(TYPE_RESOLVED) && getType() == null) { // Set the type, but only if it's not a String (see WICKET-606). // Otherwise, getConvertEmptyInputStringToNull() won't work. - Class type = getModelType(getModel()); + Class< ? > type = getModelType(getModel()); if (!String.class.equals(type)) { setType(type); @@ -144,11 +149,16 @@ } } - private Class getModelType(IModel model) + /** + * + * @param model + * @return + */ + private Class< ? > getModelType(IModel< ? > model) { if (model instanceof IObjectClassAwareModel) { - Class objectClass = ((IObjectClassAwareModel)model).getObjectClass(); + Class< ? > objectClass = ((IObjectClassAwareModel< ? >)model).getObjectClass(); if (objectClass == null) { log.warn("Couldn't resolve model type of " + model + " for " + this + @@ -169,7 +179,7 @@ * the value to set this flag. * @return this */ - public final FormComponent setConvertEmptyInputStringToNull(boolean flag) + public final FormComponent< ? > setConvertEmptyInputStringToNull(boolean flag) { setFlag(FLAG_CONVERT_EMPTY_INPUT_STRING_TO_NULL, flag); return this; Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java Wed Apr 16 13:58:34 2008 @@ -101,12 +101,17 @@ * @see org.apache.wicket.Component#initModel() */ @Override - protected IModel initModel() + protected IModel<T> initModel() { return null; } - public Form getForm() + /** + * + * @see org.apache.wicket.markup.html.form.FormComponent#getForm() + */ + @Override + public Form< ? > getForm() { try { @@ -142,7 +147,7 @@ * defaultFormProcessing * @return This */ - public final Button setDefaultFormProcessing(boolean defaultFormProcessing) + public final Button< ? > setDefaultFormProcessing(boolean defaultFormProcessing) { if (this.defaultFormProcessing != defaultFormProcessing) { Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java Wed Apr 16 13:58:34 2008 @@ -100,7 +100,7 @@ checkComponentTag(tag, "input"); checkComponentTagAttribute(tag, "type", "checkbox"); - CheckGroup<T> group = (CheckGroup)findParent(CheckGroup.class); + CheckGroup<T> group = (CheckGroup<T>)findParent(CheckGroup.class); if (group == null) { throw new WicketRuntimeException("Check component [" + getPath() + @@ -149,7 +149,7 @@ // url that points to this components IOnChangeListener method CharSequence url = group.urlFor(IOnChangeListener.INTERFACE); - Form form = (Form)group.findParent(Form.class); + Form< ? > form = (Form< ? >)group.findParent(Form.class); if (form != null) { RequestContext rc = RequestContext.get(); @@ -189,7 +189,7 @@ * @param labelModel * @return this for chaining */ - public Check<T> setLabel(IModel labelModel) + public Check<T> setLabel(IModel< ? > labelModel) { setLabelInternal(labelModel); return this; Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java Wed Apr 16 13:58:34 2008 @@ -49,9 +49,6 @@ * </p> * * @author Jonathan Locke - * - * @param <T> - * The model object type */ public class CheckBox extends FormComponent<Boolean> implements IOnChangeListener { @@ -132,7 +129,7 @@ * @see org.apache.wicket.Component#getConverter(java.lang.Class) */ @Override - public IConverter getConverter(Class type) + public <Z> IConverter<Z> getConverter(Class<Z> type) { return BooleanConverter.INSTANCE; } @@ -177,7 +174,7 @@ { CharSequence url = urlFor(IOnChangeListener.INTERFACE); - Form form = (Form)findParent(Form.class); + Form< ? > form = findParent(Form.class); if (form != null) { RequestContext rc = RequestContext.get(); Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java Wed Apr 16 13:58:34 2008 @@ -123,7 +123,6 @@ Check<T> checkbox = (Check<T>)visitChildren(Check.class, new Component.IVisitor<Check<T>>() { - public Object component(Check<T> check) { if (String.valueOf(check.getValue()).equals(value)) @@ -132,7 +131,6 @@ } return CONTINUE_TRAVERSAL; } - }); if (checkbox == null) Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java Wed Apr 16 13:58:34 2008 @@ -32,9 +32,7 @@ */ public class CheckGroupSelector extends LabeledWebMarkupContainer { - /** - * - */ + /** */ private static final long serialVersionUID = 1L; @@ -46,6 +44,10 @@ super(id); } + /** + * + * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag) + */ @Override protected void onComponentTag(ComponentTag tag) { @@ -70,6 +72,4 @@ super.onComponentTag(tag); } - - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java Wed Apr 16 13:58:34 2008 @@ -176,7 +176,7 @@ // url that points to this components IOnChangeListener method CharSequence url = urlFor(IOnChangeListener.INTERFACE); - Form form = (Form)findParent(Form.class); + Form< ? > form = (Form< ? >)findParent(Form.class); if (form != null) { RequestContext rc = RequestContext.get(); Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Wed Apr 16 13:58:34 2008 @@ -51,7 +51,6 @@ import org.apache.wicket.util.string.interpolator.MapVariableInterpolator; import org.apache.wicket.util.upload.FileUploadException; import org.apache.wicket.util.upload.FileUploadBase.SizeLimitExceededException; -import org.apache.wicket.util.value.ValueMap; import org.apache.wicket.validation.IValidatorAddListener; import org.apache.wicket.version.undo.Change; import org.slf4j.Logger; @@ -148,9 +147,9 @@ { if (component instanceof FormComponent) { - FormComponent formComponent = (FormComponent)component; + FormComponent< ? > formComponent = (FormComponent< ? >)component; - Form form = formComponent.getForm(); + Form< ? > form = formComponent.getForm(); if (!form.isEnabled() || !form.isEnableAllowed() || !form.isVisibleInHierarchy()) { // do not validate formComponent or any of formComponent's children @@ -178,7 +177,7 @@ * * @param formComponent */ - public abstract void validate(FormComponent formComponent); + public abstract void validate(FormComponent< ? > formComponent); } /** @@ -186,7 +185,7 @@ */ class FormDispatchRequest extends Request { - private final Map params = new HashMap(); + private final Map<String, String[]> params = new HashMap<String, String[]>(); private final Request realRequest; @@ -222,15 +221,15 @@ @Override public String getParameter(String key) { - String p[] = (String[])params.get(key); - return p != null && p.length > 0 ? p[0] : null; + String p[] = params.get(key); + return p != null && p.length > 0 ? p[0] : null; } /** * @see org.apache.wicket.Request#getParameterMap() */ @Override - public Map getParameterMap() + public Map<String, String[]> getParameterMap() { return params; } @@ -241,10 +240,10 @@ @Override public String[] getParameters(String key) { - String param = (String)params.get(key); + String[] param = params.get(key); if (param != null) { - return new String[] { param }; + return param; } return new String[0]; } @@ -278,7 +277,7 @@ { return url; } - + @Override public String getQueryString() { @@ -503,7 +502,7 @@ visitFormComponentsPostOrder(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { if (formComponent.isVisibleInHierarchy()) { @@ -515,7 +514,7 @@ } /** - * /** Registers an error feedback message for this component + * Registers an error feedback message for this component * * @param error * error message @@ -604,7 +603,7 @@ */ public final CharSequence getJsForInterfaceUrl(CharSequence url) { - Form root = getRootForm(); + Form< ? > root = getRootForm(); return new AppendingStringBuffer("document.getElementById('").append( root.getHiddenFieldId()).append("').value='").append(url).append( "';document.getElementById('").append(root.getJavascriptId()).append("').submit();"); @@ -630,14 +629,14 @@ * * @return root form or this form */ - public Form getRootForm() + public Form< ? > getRootForm() { - Form form; - Form parent = this; + Form< ? > form; + Form< ? > parent = this; do { form = parent; - parent = (Form)form.findParent(Form.class); + parent = (Form< ? >)form.findParent(Form.class); } while (parent != null); @@ -727,7 +726,7 @@ visitFormComponentsPostOrder(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { // Component must implement persister interface and // persistence for that component must be enabled. @@ -783,7 +782,7 @@ else { // this is the root form - Form formToProcess = this; + Form< ? > formToProcess = this; // find out whether it was a nested form that was submitted if (submittingComponent != null) @@ -867,11 +866,11 @@ { onError(); // call onError on nested forms - visitChildren(Form.class, new IVisitor() + visitChildren(Form.class, new IVisitor<Component< ? >>() { - public Object component(Component component) + public Object component(Component< ? > component) { - final Form form = (Form)component; + final Form< ? > form = (Form< ? >)component; if (!form.isEnabled() || !form.isEnableAllowed() || !form.isVisibleInHierarchy()) { return IVisitor.CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER; @@ -893,11 +892,11 @@ { setFlag(FLAG_SUBMITTED, true); - visitChildren(Form.class, new IVisitor() + visitChildren(Form.class, new IVisitor<Component< ? >>() { - public Object component(Component component) + public Object component(Component< ? > component) { - Form form = (Form)component; + Form< ? > form = (Form< ? >)component; if (form.isEnabled() && form.isEnableAllowed() && isVisibleInHierarchy()) { form.setFlag(FLAG_SUBMITTED, true); @@ -928,7 +927,7 @@ visitFormComponentsPostOrder(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { if (formComponent.isVisibleInHierarchy()) { @@ -1002,7 +1001,7 @@ * @see org.apache.wicket.Component#setVersioned(boolean) */ @Override - public final Component setVersioned(final boolean isVersioned) + public final Component<T> setVersioned(final boolean isVersioned) { super.setVersioned(isVersioned); @@ -1010,7 +1009,7 @@ visitFormComponents(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { formComponent.setVersioned(isVersioned); } @@ -1026,11 +1025,11 @@ */ public final void visitFormComponents(final FormComponent.IVisitor visitor) { - visitChildren(FormComponent.class, new IVisitor() + visitChildren(FormComponent.class, new IVisitor<Component< ? >>() { - public Object component(final Component component) + public Object component(final Component< ? > component) { - visitor.formComponent((FormComponent)component); + visitor.formComponent((FormComponent< ? >)component); return CONTINUE_TRAVERSAL; } }); @@ -1066,14 +1065,14 @@ { if (getParent() instanceof Border) { - MarkupContainer border = getParent(); - Iterator iter = border.iterator(); + MarkupContainer< ? > border = getParent(); + Iterator<Component< ? >> iter = border.iterator(); while (iter.hasNext()) { - Component child = (Component)iter.next(); + Component< ? > child = iter.next(); if (child instanceof FormComponent) { - visitor.formComponent((FormComponent)child); + visitor.formComponent((FormComponent< ? >)child); } } } @@ -1086,9 +1085,9 @@ */ private boolean anyFormComponentError() { - final Object value = visitChildren(new IVisitor() + final Object value = visitChildren(new IVisitor<Component< ? >>() { - public Object component(final Component component) + public Object component(final Component< ? > component) { if (component.hasErrorMessage()) { @@ -1212,7 +1211,7 @@ visitFormComponentsPostOrder(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { if (formComponent.isVisibleInHierarchy()) { @@ -1242,7 +1241,7 @@ visitFormComponentsPostOrder(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { if (formComponent.isVisibleInHierarchy()) { @@ -1289,7 +1288,7 @@ buffer.append("<input type=\"text\" autocomplete=\"false\"/>"); // add the submitting component - final Component submittingComponent = (Component)defaultSubmittingComponent; + final Component< ? > submittingComponent = (Component< ? >)defaultSubmittingComponent; buffer.append("<input type=\"submit\" name=\""); buffer.append(defaultSubmittingComponent.getInputName()); buffer.append("\" onclick=\" var b=Wicket.$('"); @@ -1335,7 +1334,7 @@ { // when the given submitting component is not null, it means that it was the // submitting component - Form formToProcess = this; + Form< ? > formToProcess = this; if (submittingComponent != null) { // use the form which the submittingComponent has submitted for further processing @@ -1347,11 +1346,11 @@ formToProcess.onSubmit(); // call onSubmit on nested forms - formToProcess.visitChildren(Form.class, new IVisitor() + formToProcess.visitChildren(Form.class, new IVisitor<Form< ? >>() { - public Object component(Component component) + public Object component(Form< ? > component) { - Form form = (Form)component; + Form< ? > form = component; if (form.isEnabled() && form.isEnableAllowed() && form.isVisibleInHierarchy()) { form.onSubmit(); @@ -1386,7 +1385,6 @@ return getMarkupId(); } - /** * Gets the HTTP submit method that will appear in form markup. If no method is specified in the * template, "post" is the default. Note that the markup-declared HTTP method may not correspond @@ -1403,6 +1401,10 @@ return (method != null) ? method : METHOD_POST; } + /** + * + * @see org.apache.wicket.Component#getStatelessHint() + */ @Override protected boolean getStatelessHint() { @@ -1448,7 +1450,7 @@ FileUploadException e = (FileUploadException)wre.getCause(); // Create model with exception and maximum size values - final Map model = new HashMap(); + final Map<String, Object> model = new HashMap<String, Object>(); model.put("exception", e); model.put("maxSize", getMaxSize()); @@ -1490,7 +1492,7 @@ visitFormComponentsPostOrder(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { // If form component is using form model if (formComponent.sameInnermostModel(Form.this)) @@ -1510,7 +1512,7 @@ visitFormComponentsPostOrder(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { if (formComponent.isVisibleInHierarchy()) { @@ -1529,17 +1531,16 @@ markNestedFormComponentsValid(); } - /** * Mark each form component on nested form valid. */ private void markNestedFormComponentsValid() { - visitChildren(Form.class, new IVisitor() + visitChildren(Form.class, new IVisitor<Form< ? >>() { - public Object component(Component component) + public Object component(Form< ? > component) { - Form form = (Form)component; + Form< ? > form = component; if (form.isEnableAllowed() && form.isEnabled() && form.isVisibleInHierarchy()) { form.internalMarkFormComponentsValid(); @@ -1559,7 +1560,7 @@ visitFormComponentsPostOrder(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(final FormComponent formComponent) + public void onFormComponent(final FormComponent< ? > formComponent) { if (formComponent.getForm() == Form.this && formComponent.isVisibleInHierarchy()) { @@ -1624,6 +1625,10 @@ } } + /** + * + * @return + */ protected boolean encodeUrlInHiddenFields() { String method = getMethod().toLowerCase(); @@ -1669,7 +1674,7 @@ // if a default submitting component was set, handle the rendering of that if (defaultSubmittingComponent instanceof Component) { - final Component submittingComponent = (Component)defaultSubmittingComponent; + final Component< ? > submittingComponent = (Component< ? >)defaultSubmittingComponent; if (submittingComponent.isVisibleInHierarchy() && submittingComponent.isEnabled()) { appendDefaultButtonField(markupStream, openTag); @@ -1681,14 +1686,22 @@ super.onComponentTagBody(markupStream, openTag); } + /** + * + * @param params + * @param buffer + */ protected void writeParamsAsHiddenFields(String[] params, AppendingStringBuffer buffer) { for (int j = 0; j < params.length; j++) { String[] pair = params[j].split("="); - buffer.append("<input type=\"hidden\" name=\"").append(pair[0]).append( - "\" value=\"").append(pair.length > 1 ? pair[1] : "").append("\" />"); + buffer.append("<input type=\"hidden\" name=\"") + .append(pair[0]) + .append("\" value=\"") + .append(pair.length > 1 ? pair[1] : "") + .append("\" />"); } } @@ -1722,7 +1735,7 @@ visitFormComponents(new FormComponent.AbstractVisitor() { @Override - public void onFormComponent(FormComponent formComponent) + public void onFormComponent(FormComponent< ? > formComponent) { if (formComponent.isVisible() && formComponent.isMultiPart()) { @@ -1764,11 +1777,10 @@ */ private final void updateNestedFormComponentModels() { - visitChildren(Form.class, new IVisitor() + visitChildren(Form.class, new IVisitor<Form< ? >>() { - public Object component(Component component) + public Object component(Form< ? > form) { - Form form = (Form)component; if (form.isEnabled() && form.isEnableAllowed() && form.isVisibleInHierarchy()) { form.internalUpdateFormComponentModels(); @@ -1789,9 +1801,9 @@ visitFormComponentsPostOrder(new ValidationVisitor() { @Override - public void validate(FormComponent formComponent) + public void validate(FormComponent< ? > formComponent) { - Form form = formComponent.getForm(); + Form< ? > form = formComponent.getForm(); if (form == Form.this) { // Potentially update the model @@ -1829,9 +1841,9 @@ visitFormComponentsPostOrder(new ValidationVisitor() { @Override - public void validate(final FormComponent formComponent) + public void validate(final FormComponent< ? > formComponent) { - final Form form = formComponent.getForm(); + final Form< ? > form = formComponent.getForm(); if (form == Form.this && form.isEnabled() && form.isEnableAllowed() && form.isVisibleInHierarchy()) { @@ -1850,7 +1862,7 @@ * @return true if the form component and all its parents are visible and there component is in * page's hierarchy */ - private boolean isFormComponentVisibleInPage(FormComponent fc) + private boolean isFormComponentVisibleInPage(FormComponent< ? > fc) { if (fc == null) { @@ -1872,7 +1884,7 @@ throw new IllegalArgumentException("Argument [[validator]] cannot be null"); } - final FormComponent[] dependents = validator.getDependentFormComponents(); + final FormComponent< ? >[] dependents = validator.getDependentFormComponents(); boolean validate = true; @@ -1880,7 +1892,7 @@ { for (int j = 0; j < dependents.length; j++) { - final FormComponent dependent = dependents[j]; + final FormComponent< ? > dependent = dependents[j]; // check if the dependent component is valid if (!dependent.isValid()) { @@ -1966,13 +1978,11 @@ this.removed = removed; } - @Override public void undo() { add(removed); } - } /** Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java Wed Apr 16 13:58:34 2008 @@ -108,12 +108,12 @@ { if (component instanceof FormComponent) { - onFormComponent((FormComponent)component); + onFormComponent((FormComponent< ? >)component); } return Component.IVisitor.CONTINUE_TRAVERSAL; } - protected abstract void onFormComponent(FormComponent formComponent); + protected abstract void onFormComponent(FormComponent< ? > formComponent); } /** Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java?rev=648844&r1=648843&r2=648844&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java Wed Apr 16 13:58:34 2008 @@ -24,12 +24,14 @@ * form component output an id attribute and link its for attribute with that value. * * @author Igor Vaynberg (ivaynberg) + * @param <T> + * The model object type */ -public class FormComponentLabel extends WebMarkupContainer +public class FormComponentLabel<T> extends WebMarkupContainer<T> { private static final long serialVersionUID = 1L; - private final LabeledWebMarkupContainer component; + private final LabeledWebMarkupContainer< ? > component; /** * Constructor @@ -39,7 +41,7 @@ * @param component * component that this label is linked to */ - public FormComponentLabel(String id, LabeledWebMarkupContainer component) + public FormComponentLabel(String id, LabeledWebMarkupContainer< ? > component) { super(id); if (component == null) @@ -50,6 +52,11 @@ component.setOutputMarkupId(true); } + /** + * + * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag) + */ + @Override protected void onComponentTag(ComponentTag tag) { super.onComponentTag(tag); @@ -57,14 +64,13 @@ tag.put("for", component.getMarkupId()); } - /** * Returns LabeledWebMarkupContainer bound to this label. This will be a FormComponent, a Radio * or a Check. * * @return form component */ - public LabeledWebMarkupContainer getFormComponent() + public LabeledWebMarkupContainer< ? > getFormComponent() { return component; }