Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java (original) +++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java Tue Jan 11 20:50:04 2011 @@ -70,11 +70,10 @@ public class StockQuoteLabel extends Web } /** - * @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream, - * org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override - protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) + public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) { String symbol = getDefaultModelObjectAsString(); StockQuote quote = new StockQuote(symbol);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Tue Jan 11 20:50:04 2011 @@ -158,10 +158,8 @@ public class AjaxEditableChoiceLabel<T> this(id, model, Model.ofList(choices), renderer); } - /** - * @see org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#newEditor(org.apache.wicket.MarkupContainer, - * java.lang.String, org.apache.wicket.model.IModel) + * {...@inheritdoc} */ @Override protected FormComponent<T> newEditor(MarkupContainer parent, String componentId, IModel<T> model) @@ -220,8 +218,7 @@ public class AjaxEditableChoiceLabel<T> } /** - * @see org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#newLabel(org.apache.wicket.MarkupContainer, - * java.lang.String, org.apache.wicket.model.IModel) + * {...@inheritdoc} */ @Override protected WebComponent newLabel(MarkupContainer parent, String componentId, IModel<T> model) @@ -230,6 +227,9 @@ public class AjaxEditableChoiceLabel<T> { private static final long serialVersionUID = 1L; + /** + * {...@inheritdoc} + */ @Override public <C> IConverter<C> getConverter(Class<C> type) { @@ -237,9 +237,12 @@ public class AjaxEditableChoiceLabel<T> return c != null ? c : super.getConverter(type); } + /** + * {...@inheritdoc} + */ @SuppressWarnings("unchecked") @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { String displayValue = getDefaultModelObjectAsString(); if (renderer != null) @@ -274,7 +277,7 @@ public class AjaxEditableChoiceLabel<T> } /** - * @see org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#onModelChanged() + * {...@inheritdoc} */ @Override protected void onModelChanged() @@ -283,7 +286,7 @@ public class AjaxEditableChoiceLabel<T> } /** - * @see org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#onModelChanging() + * {...@inheritdoc} */ @Override protected void onModelChanging() @@ -292,7 +295,7 @@ public class AjaxEditableChoiceLabel<T> } /** - * @see org.apache.wicket.Component#onDetach() + * {...@inheritdoc} */ @Override protected void onDetach() Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Tue Jan 11 20:50:04 2011 @@ -81,7 +81,6 @@ public class AjaxEditableLabel<T> extend protected class EditorAjaxBehavior extends AbstractDefaultAjaxBehavior { - private static final long serialVersionUID = 1L; /** @@ -91,6 +90,9 @@ public class AjaxEditableLabel<T> extend { } + /** + * {...@inheritdoc} + */ @Override protected void onComponentTag(ComponentTag tag) { @@ -99,7 +101,6 @@ public class AjaxEditableLabel<T> extend generateCallbackScript("wicketAjaxGet('" + getCallbackUrl() + "&save=true&'+this.name+'='+wicketEncode(this.value)") + "; return false;}"; - final String cancelCall = "{" + generateCallbackScript("wicketAjaxGet('" + getCallbackUrl() + "&save=false'") + "; return false;}"; @@ -111,17 +112,19 @@ public class AjaxEditableLabel<T> extend tag.put("onblur", saveCall); tag.put("onkeypress", "if (Wicket.Browser.isSafari()) { return; }; " + keypress); tag.put("onkeydown", "if (!Wicket.Browser.isSafari()) { return; }; " + keypress); - } + /** + * {...@inheritdoc} + */ @Override protected void respond(AjaxRequestTarget target) { RequestCycle requestCycle = RequestCycle.get(); boolean save = requestCycle.getRequest() - .getRequestParameters() - .getParameterValue("save") - .toBoolean(false); + .getRequestParameters() + .getParameterValue("save") + .toBoolean(false); if (save) { @@ -157,6 +160,9 @@ public class AjaxEditableLabel<T> extend super(event); } + /** + * {...@inheritdoc} + */ @Override protected void onEvent(AjaxRequestTarget target) { @@ -209,8 +215,6 @@ public class AjaxEditableLabel<T> extend * they should use a converter like they normally would (when this method returns null), or * whether they should use a custom converter (when this method is overridden and returns not * null). - * - * @see org.apache.wicket.Component#getConverter(java.lang.Class) */ @Override public <C> IConverter<C> getConverter(Class<C> type) @@ -232,7 +236,7 @@ public class AjaxEditableLabel<T> extend } /** - * @see org.apache.wicket.MarkupContainer#setDefaultModel(org.apache.wicket.model.IModel) + * {...@inheritdoc} */ @Override public final AjaxEditableLabel<T> setDefaultModel(IModel<?> model) @@ -336,8 +340,11 @@ public class AjaxEditableLabel<T> extend return c != null ? c : super.getConverter(type); } + /** + * {...@inheritdoc} + */ @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { Object modelObject = getDefaultModelObject(); if (modelObject == null || "".equals(modelObject)) @@ -396,7 +403,7 @@ public class AjaxEditableLabel<T> extend } /** - * @see org.apache.wicket.Component#onBeforeRender() + * {...@inheritdoc} */ @Override protected void onBeforeRender() @@ -538,8 +545,6 @@ public class AjaxEditableLabel<T> extend /** * Dummy override to fix WICKET-1239 - * - * @see org.apache.wicket.Component#onModelChanged() */ @Override protected void onModelChanged() @@ -549,8 +554,6 @@ public class AjaxEditableLabel<T> extend /** * Dummy override to fix WICKET-1239 - * - * @see org.apache.wicket.Component#onModelChanging() */ @Override protected void onModelChanging() Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Tue Jan 11 20:50:04 2011 @@ -70,8 +70,7 @@ public class AjaxEditableMultiLineLabel< } /** - * @see org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#newLabel(org.apache.wicket.MarkupContainer, - * java.lang.String, org.apache.wicket.model.IModel) + * {...@inheritdoc} */ @Override protected MultiLineLabel newLabel(MarkupContainer parent, String componentId, IModel<T> model) @@ -80,8 +79,11 @@ public class AjaxEditableMultiLineLabel< { private static final long serialVersionUID = 1L; + /** + * {...@inheritdoc} + */ @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { Object modelObject = getDefaultModelObject(); if (modelObject == null || "".equals(modelObject)) @@ -112,8 +114,7 @@ public class AjaxEditableMultiLineLabel< } /** - * @see org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#newEditor(org.apache.wicket.MarkupContainer, - * java.lang.String, org.apache.wicket.model.IModel) + * {...@inheritdoc} */ @Override protected FormComponent<T> newEditor(MarkupContainer parent, String componentId, IModel<T> model) @@ -122,12 +123,18 @@ public class AjaxEditableMultiLineLabel< { private static final long serialVersionUID = 1L; + /** + * {...@inheritdoc} + */ @Override protected void onModelChanged() { AjaxEditableMultiLineLabel.this.onModelChanged(); } + /** + * {...@inheritdoc} + */ @Override protected void onModelChanging() { @@ -161,7 +168,7 @@ public class AjaxEditableMultiLineLabel< private static final long serialVersionUID = 1L; /** - * @see org.apache.wicket.behavior.AbstractAjaxBehavior#onComponentTag(org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override protected void onComponentTag(ComponentTag tag) @@ -238,12 +245,18 @@ public class AjaxEditableMultiLineLabel< return "..."; } + /** + * {...@inheritdoc} + */ @Override protected void onModelChanged() { super.onModelChanged(); } + /** + * {...@inheritdoc} + */ @Override protected void onModelChanging() { Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java Tue Jan 11 20:50:04 2011 @@ -65,16 +65,19 @@ public class SmartLinkLabel extends Labe } /** - * @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream, - * org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override - protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) + public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) { replaceComponentTagBody(markupStream, openTag, getSmartLink(getDefaultModelObjectAsString())); } + /** + * + * @return link parser + */ protected ILinkParser getLinkParser() { return new DefaultLinkParser(); Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java Tue Jan 11 20:50:04 2011 @@ -62,11 +62,10 @@ public class SmartLinkMultiLineLabel ext } /** - * @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream, - * org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override - protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) + public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) { final CharSequence body = Strings.toMultilineMarkup(getDefaultModelObjectAsString()); replaceComponentTagBody(markupStream, openTag, getSmartLink(body)); Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java Tue Jan 11 20:50:04 2011 @@ -25,7 +25,6 @@ import org.apache.wicket.markup.MarkupSt import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.util.convert.IConverter; -import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.util.string.JavaScriptUtils; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.value.IValueMap; @@ -65,14 +64,12 @@ public abstract class AbstractOptions<T> protected abstract Iterator<T> getOptionsIterator(); /** - * - * @see org.apache.wicket.MarkupContainer#onComponentTagBody(org.apache.wicket.markup.MarkupStream, - * org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { - final AppendingStringBuffer buffer = new AppendingStringBuffer(128); + StringBuilder buffer = new StringBuilder(128); Iterator<T> options = getOptionsIterator(); IChoiceRenderer<T> renderer = getPalette().getChoiceRenderer(); @@ -80,7 +77,6 @@ public abstract class AbstractOptions<T> { final T choice = options.next(); - final CharSequence id; { String value = renderer.getIdValue(choice, 0); @@ -126,7 +122,6 @@ public abstract class AbstractOptions<T> } buffer.append(">").append(value).append("</option>"); - } buffer.append("\n"); @@ -144,7 +139,7 @@ public abstract class AbstractOptions<T> } /** - * @see org.apache.wicket.markup.html.form.FormComponent#onComponentTag(org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override protected void onComponentTag(ComponentTag tag) @@ -178,7 +173,7 @@ public abstract class AbstractOptions<T> } /** - * @see org.apache.wicket.markup.html.form.FormComponent#updateModel() + * {...@inheritdoc} */ @Override public void updateModel() Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java Tue Jan 11 20:50:04 2011 @@ -43,7 +43,9 @@ import org.apache.wicket.model.util.Wild public class SelectOptions<T> extends RepeatingView { private static final long serialVersionUID = 1L; + private boolean recreateChoices = false; + private final IOptionRenderer<T> renderer; /** @@ -86,7 +88,7 @@ public class SelectOptions<T> extends Re } /** - * @see org.apache.wicket.Component#onBeforeRender() + * {...@inheritdoc} */ @SuppressWarnings("unchecked") @Override @@ -130,6 +132,10 @@ public class SelectOptions<T> extends Re return new SimpleSelectOption<T>("option", model, text); } + /** + * + * @param <V> + */ private static class SimpleSelectOption<V> extends SelectOption<V> { private static final long serialVersionUID = 1L; @@ -147,8 +153,11 @@ public class SelectOptions<T> extends Re this.text = text; } + /** + * {...@inheritdoc} + */ @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { replaceComponentTagBody(markupStream, openTag, text); } Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Tue Jan 11 20:50:04 2011 @@ -59,9 +59,11 @@ public class FilterForm<T> extends Form< "');"); } - + /** + * {...@inheritdoc} + */ @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { super.onComponentTagBody(markupStream, openTag); String id = Strings.escapeMarkup(getFocusTrackerFieldCssId()).toString(); Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java Tue Jan 11 20:50:04 2011 @@ -25,14 +25,11 @@ import org.apache.wicket.model.IModel; * @see ITab * * @author Igor Vaynberg (ivaynberg) - * */ public abstract class AbstractTab implements ITab { - /** - * - */ private static final long serialVersionUID = 1L; + IModel<String> title; /** @@ -47,7 +44,7 @@ public abstract class AbstractTab implem } /** - * @see org.apache.wicket.extensions.markup.html.tabs.ITab#getTitle() + * {...@inheritdoc} */ public IModel<String> getTitle() { @@ -55,7 +52,7 @@ public abstract class AbstractTab implem } /** - * @see org.apache.wicket.extensions.markup.html.tabs.ITab#isVisible() + * {...@inheritdoc} */ public boolean isVisible() { @@ -63,7 +60,7 @@ public abstract class AbstractTab implem } /** - * @see org.apache.wicket.extensions.markup.html.tabs.ITab#getPanel(String) + * {...@inheritdoc} */ public abstract Panel getPanel(final String panelId); } \ No newline at end of file Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java Tue Jan 11 20:50:04 2011 @@ -17,7 +17,7 @@ package org.apache.wicket.extensions.markup.html.tabs; import org.apache.wicket.IClusterable; -import org.apache.wicket.markup.html.WebMarkupContainerWithAssociatedMarkup; +import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; /** @@ -27,7 +27,6 @@ import org.apache.wicket.model.IModel; * @see org.apache.wicket.extensions.markup.html.tabs.AbstractTab * * @author Igor Vaynberg (ivaynberg) - * */ public interface ITab extends IClusterable { @@ -41,7 +40,7 @@ public interface ITab extends IClusterab * returned panel MUST have this id * @return a container object that will be placed as the content of the tab */ - WebMarkupContainerWithAssociatedMarkup getPanel(final String containerId); + Panel getPanel(final String containerId); /** * Returns whether this tab should be visible Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java Tue Jan 11 20:50:04 2011 @@ -16,7 +16,7 @@ */ package org.apache.wicket.extensions.markup.html.tabs; -import org.apache.wicket.markup.html.WebMarkupContainerWithAssociatedMarkup; +import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; /** @@ -26,13 +26,13 @@ import org.apache.wicket.model.IModel; * @see org.apache.wicket.extensions.markup.html.tabs.TabbedPanel * * @author Igor Vaynberg (ivaynberg) - * */ public class PanelCachingTab implements ITab { private static final long serialVersionUID = 1L; - private WebMarkupContainerWithAssociatedMarkup panel; + private Panel panel; + private final ITab delegate; /** @@ -47,7 +47,7 @@ public class PanelCachingTab implements } /** - * @see org.apache.wicket.extensions.markup.html.tabs.ITab#getTitle() + * {...@inheritdoc} */ public IModel<String> getTitle() { @@ -55,9 +55,9 @@ public class PanelCachingTab implements } /** - * @see org.apache.wicket.extensions.markup.html.tabs.ITab#getPanel(java.lang.String) + * {...@inheritdoc} */ - public WebMarkupContainerWithAssociatedMarkup getPanel(final String panelId) + public Panel getPanel(final String panelId) { if (panel == null) { @@ -67,7 +67,7 @@ public class PanelCachingTab implements } /** - * @see org.apache.wicket.extensions.markup.html.tabs.ITab#isVisible() + * {...@inheritdoc} */ public boolean isVisible() { Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java Tue Jan 11 20:50:04 2011 @@ -74,7 +74,6 @@ public abstract class DefaultAbstractTre */ public static final class LinkType extends EnumeratedType { - /** partial updates with no fallback. */ public static final LinkType AJAX = new LinkType("AJAX"); @@ -292,11 +291,10 @@ public abstract class DefaultAbstractTre private static final long serialVersionUID = 1L; /** - * @see org.apache.wicket.MarkupContainer#onComponentTagBody(org.apache.wicket.markup.MarkupStream, - * org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { Response response = RequestCycle.get().getResponse(); TreeNode parent = node.getParent(); @@ -347,7 +345,7 @@ public abstract class DefaultAbstractTre private static final long serialVersionUID = 1L; /** - * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override protected void onComponentTag(ComponentTag tag) @@ -424,8 +422,7 @@ public abstract class DefaultAbstractTre private static final long serialVersionUID = 1L; /** - * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag - * ) + * {...@inheritdoc} */ @Override protected void onComponentTag(ComponentTag tag) @@ -434,7 +431,6 @@ public abstract class DefaultAbstractTre tag.put("onclick", "return false"); } }; - } if (imageId != null) @@ -467,7 +463,7 @@ public abstract class DefaultAbstractTre private static final long serialVersionUID = 1L; /** - * @see org.apache.wicket.markup.html.link.Link#onClick() + * {...@inheritdoc} */ @Override public void onClick() @@ -483,7 +479,7 @@ public abstract class DefaultAbstractTre private static final long serialVersionUID = 1L; /** - * @see org.apache.wicket.ajax.markup.html.AjaxLink#onClick(org.apache.wicket.ajax.AjaxRequestTarget) + * {...@inheritdoc} */ @Override public void onClick(AjaxRequestTarget target) @@ -499,7 +495,7 @@ public abstract class DefaultAbstractTre private static final long serialVersionUID = 1L; /** - * @see org.apache.wicket.ajax.markup.html.AjaxFallbackLink#onClick(org.apache.wicket.ajax.AjaxRequestTarget) + * {...@inheritdoc} */ @Override public void onClick(AjaxRequestTarget target) @@ -528,16 +524,18 @@ public abstract class DefaultAbstractTre { private static final long serialVersionUID = 1L; + /** + * {...@inheritdoc} + */ @Override protected void onComponentTag(ComponentTag tag) { super.onComponentTag(tag); IRequestHandler handler = new ResourceReferenceRequestHandler(getNodeIcon(node)); - tag.put("style", - "background-image: url('" + RequestCycle.get().urlFor(handler) + "')"); + tag.put("style", "background-image: url('" + RequestCycle.get().urlFor(handler) + + "')"); } }; - } /** @@ -572,7 +570,6 @@ public abstract class DefaultAbstractTre * * @param target * Request target - may be null on non-ajax call - * * @param node * Node for which this callback is relevant */ @@ -585,7 +582,6 @@ public abstract class DefaultAbstractTre * * @param target * Request target - may be null on non-ajax call - * * @param node * Node for which this this callback is fired. */ @@ -613,6 +609,9 @@ public abstract class DefaultAbstractTre } } + /** + * {...@inheritdoc} + */ @Override public void renderHead(IHeaderResponse response) { Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java?rev=1057859&r1=1057858&r2=1057859&view=diff ============================================================================== --- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java (original) +++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java Tue Jan 11 20:50:04 2011 @@ -53,11 +53,10 @@ import org.apache.wicket.util.string.Str * {...@link VelocityPanel }. * </p> */ -...@suppresswarnings("unchecked") public abstract class VelocityPanel extends Panel - implements - IMarkupResourceStreamProvider, - IMarkupCacheKeyProvider + implements + IMarkupResourceStreamProvider, + IMarkupCacheKeyProvider { private static final long serialVersionUID = 1L; @@ -73,8 +72,8 @@ public abstract class VelocityPanel exte * The template resource * @return an instance of {...@link VelocityPanel} */ - public static VelocityPanel forTemplateResource(String id, IModel< ? extends Map> model, - final IResourceStream templateResource) + public static VelocityPanel forTemplateResource(String id, IModel<? extends Map> model, + final IResourceStream templateResource) { if (templateResource == null) { @@ -94,6 +93,7 @@ public abstract class VelocityPanel exte } private transient String stackTraceAsString; + private transient String evaluatedTemplate; /** @@ -106,7 +106,7 @@ public abstract class VelocityPanel exte * @param model * Model with variables that can be substituted by Velocity. */ - public VelocityPanel(final String id, final IModel< ? extends Map> model) + public VelocityPanel(final String id, final IModel<? extends Map> model) { super(id, model); } @@ -134,18 +134,17 @@ public abstract class VelocityPanel exte } /** - * @see org.apache.wicket.markup.html.panel.Panel#onComponentTagBody(org.apache.wicket.markup. - * MarkupStream, org.apache.wicket.markup.ComponentTag) + * {...@inheritdoc} */ @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { if (!Strings.isEmpty(stackTraceAsString)) { // TODO: only display the velocity error/stacktrace in development // mode? - replaceComponentTagBody(markupStream, openTag, Strings - .toMultilineMarkup(stackTraceAsString)); + replaceComponentTagBody(markupStream, openTag, + Strings.toMultilineMarkup(stackTraceAsString)); } else if (!parseGeneratedMarkup()) { @@ -155,7 +154,7 @@ public abstract class VelocityPanel exte if (size() > 0) { throw new WicketRuntimeException( - "Components cannot be added if the generated markup should not be parsed."); + "Components cannot be added if the generated markup should not be parsed."); } if (evaluatedTemplate == null) @@ -292,7 +291,6 @@ public abstract class VelocityPanel exte * like applications, where 'normal' users are allowed to do basic scripting. On errors, you * want them to be able to have them correct them while the rest of the application keeps on * working. - * </p> * * @return Whether any velocity exceptions should be thrown or trapped. The default is false. */ @@ -302,11 +300,10 @@ public abstract class VelocityPanel exte } /** - * @see org.apache.wicket.markup.IMarkupResourceStreamProvider#getMarkupResourceStream(org.apache - * .wicket.MarkupContainer, java.lang.Class) + * {...@inheritdoc} */ public final IResourceStream getMarkupResourceStream(MarkupContainer container, - Class< ? > containerClass) + Class<?> containerClass) { Reader reader = getTemplateReader(); if (reader == null) @@ -315,7 +312,7 @@ public abstract class VelocityPanel exte } // evaluate the template and return a new StringResourceStream - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder(); sb.append("<wicket:panel>"); sb.append(evaluateVelocityTemplate(reader)); sb.append("</wicket:panel>"); @@ -323,17 +320,16 @@ public abstract class VelocityPanel exte } /** - * @see org.apache.wicket.markup.IMarkupCacheKeyProvider#getCacheKey(org.apache.wicket. - * MarkupContainer, java.lang.Class) + * {...@inheritdoc} */ - public final String getCacheKey(MarkupContainer container, Class< ? > containerClass) + public final String getCacheKey(MarkupContainer container, Class<?> containerClass) { // don't cache the evaluated template return null; } /** - * @see org.apache.wicket.Component#onDetach() + * {...@inheritdoc} */ @Override protected void onDetach()
