You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/09/03 07:25:02 UTC
svn commit: r992210 - in /wicket/trunk:
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/
wicket-util/src/main/java/org/apache/wicket/util/lang/
wicket/src/main/java/org/apache/wicket/
wicket/src/main/java/org/apache/wicket...
Author: ivaynberg
Date: Fri Sep 3 05:25:01 2010
New Revision: 992210
URL: http://svn.apache.org/viewvc?rev=992210&view=rev
Log:
cleanup
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/BehaviorsUtil.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.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/ListMultipleChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java Fri Sep 3 05:25:01 2010
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.apache.wicket.behavior.BehaviorsUtil;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.util.visit.IVisit;
@@ -58,16 +57,14 @@ public class AjaxLazyLoadPanelTester
{
// get the AbstractAjaxBehaviour which is responsible for
// getting the contents of the lazy panel
- List<IBehavior> behaviors = BehaviorsUtil.getBehaviors(component,
- AbstractAjaxBehavior.class);
+ List<AbstractAjaxBehavior> behaviors = component.getBehaviors(AbstractAjaxBehavior.class);
if (behaviors.size() == 0)
{
logger.warn("AjaxLazyLoadPanel child found, but no attached AbstractAjaxBehaviors found. A curious situation...");
}
for (IBehavior b : behaviors)
{
- if (b instanceof AbstractAjaxBehavior &&
- !(b instanceof AjaxSelfUpdatingTimerBehavior))
+ if (!(b instanceof AjaxSelfUpdatingTimerBehavior))
{
// tell wicket tester to execute it :)
logger.debug("Triggering lazy panel: " + component.getClassRelativePath());
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java Fri Sep 3 05:25:01 2010
@@ -23,19 +23,31 @@ public class Exceptions
});
}
- // TODO Component$IVisitor should utilize a similar object, much cleaner than magic return
- // values
+ /**
+ * Represents a visit
+ *
+ * @author igor
+ * @param <T>
+ */
public static class Visit<T>
{
private T result;
private boolean stopped;
+ /**
+ * Stops visit with specified resut
+ *
+ * @param result
+ */
public void stop(T result)
{
this.result = result;
stop();
}
+ /**
+ * Stops visit
+ */
public void stop()
{
stopped = true;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Fri Sep 3 05:25:01 2010
@@ -38,8 +38,6 @@ import org.apache.wicket.javascript.Defa
import org.apache.wicket.markup.MarkupFactory;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.html.EmptySrcAttributeCheckFilter;
-import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResourceFactory;
import org.apache.wicket.markup.parser.filter.EnclosureHandler;
import org.apache.wicket.markup.parser.filter.RelativePathPrefixHandler;
@@ -173,10 +171,6 @@ public abstract class Application implem
/** */
private List<IComponentOnAfterRenderListener> componentOnAfterRenderListeners;
- /** @deprecated will be removed in 1.5; see IHeaderRenderStrategy */
- @Deprecated
- private List<IHeaderContributor> renderHeadListeners;
-
/** root mapper */
private IRequestMapper rootRequestMapper;
@@ -1157,57 +1151,6 @@ public abstract class Application implem
}
/**
- * Adds a listener that will be invoked for every header response
- *
- * @param listener
- * @deprecated will be removed in 1.5; see IHeaderRenderStrategy
- */
- @Deprecated
- public final void addRenderHeadListener(final IHeaderContributor listener)
- {
- if (renderHeadListeners == null)
- {
- renderHeadListeners = new ArrayList<IHeaderContributor>();
- }
- renderHeadListeners.add(listener);
- }
-
- /**
- *
- * @param listener
- * @deprecated will be removed in 1.5; see IHeaderRenderStrategy
- */
- @Deprecated
- public void removeRenderHeadListener(final IHeaderContributor listener)
- {
- if (renderHeadListeners != null)
- {
- renderHeadListeners.remove(listener);
- if (renderHeadListeners.isEmpty())
- {
- renderHeadListeners = null;
- }
- }
- }
-
- /**
- * INTERNAL
- *
- * @param response
- */
- public void notifyRenderHeadListener(final IHeaderResponse response)
- {
- if (renderHeadListeners != null)
- {
- for (Iterator<IHeaderContributor> iter = renderHeadListeners.iterator(); iter.hasNext();)
- {
- IHeaderContributor listener = iter.next();
- listener.renderHead(response);
- }
- }
- }
-
- /**
* Converts the root mapper to a {@link ICompoundRequestMapper} if necessary and returns the
* converted instance.
*
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=992210&r1=992209&r2=992210&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 Fri Sep 3 05:25:01 2010
@@ -3583,9 +3583,9 @@ public abstract class Component
{
if (!tag.getName().equalsIgnoreCase(name))
{
- String msg = String.format("Component [%s] (path = [%s]) must be " +
- "applied to a tag of type [%s], not: %s",
- getId(), getPath(), name, tag.toUserDebugString());
+ String msg = String.format("Component [%s] (path = [%s]) must be "
+ + "applied to a tag of type [%s], not: %s", getId(), getPath(), name,
+ tag.toUserDebugString());
findMarkupStream().throwMarkupException(msg);
}
@@ -3611,9 +3611,9 @@ public abstract class Component
final String tagAttributeValue = tag.getAttributes().getString(key);
if (tagAttributeValue == null || !value.equalsIgnoreCase(tagAttributeValue))
{
- String msg = String.format("Component [%s] (path = [%s]) must be applied to a tag " +
- "with [%s] attribute matching [%s], not [%s]",
- getId(), getPath(), key, value, tagAttributeValue);
+ String msg = String.format("Component [%s] (path = [%s]) must be applied to a tag "
+ + "with [%s] attribute matching [%s], not [%s]", getId(), getPath(), key,
+ value, tagAttributeValue);
findMarkupStream().throwMarkupException(msg);
}
@@ -3704,7 +3704,7 @@ public abstract class Component
* A class derived from IBehavior
*/
@SuppressWarnings("unchecked")
- protected <M extends IBehavior> List<M> getBehaviors(Class<M> type)
+ public <M extends IBehavior> List<M> getBehaviors(Class<M> type)
{
List<? extends IBehavior> behaviors = getBehaviorsRawList();
if (behaviors == null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java Fri Sep 3 05:25:01 2010
@@ -99,13 +99,8 @@ public abstract class AjaxFallbackButton
*
* @param target
* @param form
- *
- * TODO 1.3: Make abstract to be consistent with onsubmit()
*/
- protected void onError(AjaxRequestTarget target, Form<?> form)
- {
- // created to override
- }
+ protected abstract void onError(AjaxRequestTarget target, Form<?> form);
/**
* @see org.apache.wicket.markup.html.form.IFormSubmittingComponent#onSubmit()
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=992210&r1=992209&r2=992210&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 Fri Sep 3 05:25:01 2010
@@ -447,10 +447,9 @@ public class Form<T> extends WebMarkupCo
public final void clearInput()
{
// Visit all the (visible) form components and clear the input on each.
- visitFormComponentsPostOrder(new FormComponent.AbstractVisitor<Void>()
+ visitFormComponentsPostOrder(new IVisitor<FormComponent<?>, Void>()
{
- @Override
- public void onFormComponent(final FormComponent<?> formComponent, IVisit<Void> visit)
+ public void component(final FormComponent<?> formComponent, IVisit<Void> visit)
{
if (formComponent.isVisibleInHierarchy())
{
@@ -993,10 +992,9 @@ public class Form<T> extends WebMarkupCo
super.setVersioned(isVersioned);
// Search for FormComponents like TextField etc.
- visitFormComponents(new FormComponent.AbstractVisitor<Void>()
+ visitFormComponents(new IVisitor<FormComponent<?>, Void>()
{
- @Override
- public void onFormComponent(final FormComponent<?> formComponent, IVisit<Void> visit)
+ public void component(final FormComponent<?> formComponent, IVisit<Void> visit)
{
formComponent.setVersioned(isVersioned);
}
@@ -1148,10 +1146,9 @@ public class Form<T> extends WebMarkupCo
*/
private void inputChanged()
{
- visitFormComponentsPostOrder(new FormComponent.AbstractVisitor<Void>()
+ visitFormComponentsPostOrder(new IVisitor<FormComponent<?>, Void>()
{
- @Override
- public void onFormComponent(final FormComponent<?> formComponent, IVisit<Void> visit)
+ public void component(final FormComponent<?> formComponent, IVisit<Void> visit)
{
if (formComponent.isVisibleInHierarchy())
{
@@ -1419,10 +1416,9 @@ public class Form<T> extends WebMarkupCo
protected void internalOnModelChanged()
{
// Visit all the form components and validate each
- visitFormComponentsPostOrder(new FormComponent.AbstractVisitor<Void>()
+ visitFormComponentsPostOrder(new IVisitor<FormComponent<?>, Void>()
{
- @Override
- public void onFormComponent(final FormComponent<?> formComponent, IVisit<Void> visit)
+ public void component(final FormComponent<?> formComponent, IVisit<Void> visit)
{
// If form component is using form model
if (formComponent.sameInnermostModel(Form.this))
@@ -1439,10 +1435,9 @@ public class Form<T> extends WebMarkupCo
protected final void markFormComponentsInvalid()
{
// call invalidate methods of all nested form components
- visitFormComponentsPostOrder(new FormComponent.AbstractVisitor<Void>()
+ visitFormComponentsPostOrder(new IVisitor<FormComponent<?>, Void>()
{
- @Override
- public void onFormComponent(final FormComponent<?> formComponent, IVisit<Void> visit)
+ public void component(final FormComponent<?> formComponent, IVisit<Void> visit)
{
if (formComponent.isVisibleInHierarchy())
{
@@ -1489,10 +1484,9 @@ public class Form<T> extends WebMarkupCo
private void internalMarkFormComponentsValid()
{
// call valid methods of all nested form components
- visitFormComponentsPostOrder(new FormComponent.AbstractVisitor<Void>()
+ visitFormComponentsPostOrder(new IVisitor<FormComponent<?>, Void>()
{
- @Override
- public void onFormComponent(final FormComponent<?> formComponent, IVisit<Void> visit)
+ public void component(final FormComponent<?> formComponent, IVisit<Void> visit)
{
if (formComponent.getForm() == Form.this && formComponent.isVisibleInHierarchy())
{
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=992210&r1=992209&r2=992210&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 Fri Sep 3 05:25:01 2010
@@ -102,22 +102,6 @@ public abstract class FormComponent<T> e
private static final Logger logger = LoggerFactory.getLogger(FormComponent.class);
/**
- * Visitor for traversing form components
- *
- * @deprecated no longer a need for this base class
- */
- @Deprecated
- public static abstract class AbstractVisitor<R> implements IVisitor<FormComponent<?>, R>
- {
- public void component(final FormComponent<?> component, final IVisit<R> visit)
- {
- onFormComponent(component, visit);
- }
-
- protected abstract void onFormComponent(FormComponent<?> formComponent, IVisit<R> visit);
- }
-
- /**
* {@link IErrorMessageSource} used for error messages against this form components.
*
* @author ivaynberg
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java Fri Sep 3 05:25:01 2010
@@ -267,7 +267,6 @@ public class ListMultipleChoice<T> exten
}
else
{
- // TODO 1.3: check if its safe to return Collections.EMPTY_LIST here
ArrayList<T> result = new ArrayList<T>();
addRetainedDisabled(result);
return result;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java Fri Sep 3 05:25:01 2010
@@ -21,7 +21,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.wicket.Application;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WicketEventReference;
import org.apache.wicket.request.IRequestHandler;
@@ -50,18 +49,6 @@ public abstract class HeaderResponse imp
private boolean closed;
/**
- * Creates a new header response instance.
- */
- public HeaderResponse()
- {
- if (Application.exists())
- {
- // TODO remove in 1.5; see IHeaderRenderStrategy
- Application.get().notifyRenderHeadListener(this);
- }
- }
-
- /**
* @see org.apache.wicket.markup.html.IHeaderResponse#markRendered(java.lang.Object)
*/
public final void markRendered(Object object)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java Fri Sep 3 05:25:01 2010
@@ -453,12 +453,13 @@ public abstract class ListView<T> extend
* Create a new ListItem for list item at index.
*
* @param index
+ * @param itemModel
+ * object in the list that the item represents
* @return ListItem
*/
- protected ListItem<T> newItem(final int index)
+ protected ListItem<T> newItem(final int index, IModel<T> itemModel)
{
- // FIXME 1.5: this method should already include item's model in its definition
- return new ListItem<T>(index, getListItemModel(getModel(), index));
+ return new ListItem<T>(index, itemModel);
}
/**
@@ -513,7 +514,7 @@ public abstract class ListView<T> extend
if (item == null)
{
// Create item for index
- item = newItem(index);
+ item = newItem(index, getListItemModel(getModel(), index));
// Add list item
add(item);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Fri Sep 3 05:25:01 2010
@@ -477,11 +477,6 @@ public abstract class WebApplication ext
// Ignore - we're not allowed to read system properties.
}
- /*
- * FIXME 1.4: roll in 'wicket.' into Application.CONFIGURATION, we should only support a
- * namespaced param. see WICKET-1317
- */
-
// If no system parameter check filter/servlet <init-param> and <context-param>
if (result == null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Fri Sep 3 05:25:01 2010
@@ -52,7 +52,6 @@ import org.apache.wicket.ajax.markup.htm
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.apache.wicket.behavior.BehaviorsUtil;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.feedback.FeedbackMessages;
@@ -1533,19 +1532,15 @@ public class BaseWicketTester
{
// get the AbstractAjaxBehaviour which is responsible for
// getting the contents of the lazy panel
- List<IBehavior> behaviors = BehaviorsUtil.getBehaviors(component,
- AbstractAjaxTimerBehavior.class);
+ List<AbstractAjaxTimerBehavior> behaviors = component.getBehaviors(AbstractAjaxTimerBehavior.class);
for (IBehavior b : behaviors)
{
- if (b instanceof AbstractAjaxTimerBehavior)
+ log.debug("Triggering AjaxSelfUpdatingTimerBehavior: " +
+ component.getClassRelativePath());
+ AbstractAjaxTimerBehavior timer = (AbstractAjaxTimerBehavior)b;
+ if (!timer.isStopped())
{
- log.debug("Triggering AjaxSelfUpdatingTimerBehavior: " +
- component.getClassRelativePath());
- AbstractAjaxTimerBehavior timer = (AbstractAjaxTimerBehavior)b;
- if (!timer.isStopped())
- {
- executeBehavior(timer);
- }
+ executeBehavior(timer);
}
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java Fri Sep 3 05:25:01 2010
@@ -373,15 +373,13 @@ public class FormTester
tester = wicketTester;
// fill blank String for Text Component.
- workingForm.visitFormComponents(new FormComponent.AbstractVisitor<Void>()
+ workingForm.visitFormComponents(new IVisitor<FormComponent<?>, Void>()
{
- @SuppressWarnings("unchecked")
- @Override
- public void onFormComponent(final FormComponent<?> formComponent, IVisit<Void> visit)
+ public void component(final FormComponent<?> formComponent, final IVisit<Void> visit)
{
// do nothing for invisible or disabled component -- the browser would not send any
// parameter
- // for a disabled component
+// for a disabled component
if (!(formComponent.isVisibleInHierarchy() && formComponent.isEnabledInHierarchy()))
{
return;
@@ -642,6 +640,10 @@ public class FormTester
}
}
+ /**
+ * @param checkBoxId
+ * @param value
+ */
public void setValue(String checkBoxId, boolean value)
{
setValue(checkBoxId, Boolean.toString(value));
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage.java Fri Sep 3 05:25:01 2010
@@ -103,6 +103,11 @@ public class HomePage extends WebPage
listView.removeAll();
target.addComponent(listViewContainer);
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form)
+ {
+ }
}.setDefaultFormProcessing(false));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java Fri Sep 3 05:25:01 2010
@@ -81,6 +81,11 @@ public class AjaxFormSubmitTestPage exte
formSubmitted = formSubmitted | BUTTON;
}
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form)
+ {
+ }
+
}.setDefaultFormProcessing(false));
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java Fri Sep 3 05:25:01 2010
@@ -32,9 +32,6 @@ public class DropDownChoiceTest extends
{
tester.startPage(DropDownChoiceTestPage.class);
- // FIXME should not be needed
- // tester.createRequestCycle();
-
FormTester formTester = tester.newFormTester("form");
formTester.submit();
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java?rev=992210&r1=992209&r2=992210&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java Fri Sep 3 05:25:01 2010
@@ -136,10 +136,11 @@ public class PanelTest extends WicketTes
*/
// TODO FIX the implementation. Fragment markup provider can not be a
// sibling of the panel.
-// public void testInlinePanel_6() throws Exception
-// {
-// executeTest(InlinePanelPage_6.class, "InlinePanelPageExpectedResult_6.html");
-// }
+ public void testInlinePanel_6() throws Exception
+ {
+ executeTest(InlinePanelPage_6.class, "InlinePanelPageExpectedResult_6.html");
+ }
+
/**
* @throws Exception
*/