Author: ivaynberg
Date: Sat Oct 17 04:25:35 2009
New Revision: 826176
URL: http://svn.apache.org/viewvc?rev=826176&view=rev
Log:
wicket-ng: slowly removing pageversionmanager and change
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/NoopPageVersionManager.java
(with props)
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Add.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/package.html
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.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/AbstractSubmitLink.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/CheckBoxMultipleChoice.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/RadioChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
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=826176&r1=826175&r2=826176&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 Sat Oct
17 04:25:35 2009
@@ -52,7 +52,6 @@
import org.apache.wicket.util.string.PrependingStringBuffer;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.ValueMap;
-import org.apache.wicket.version.undo.Change;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -199,46 +198,6 @@
*/
public abstract class Component implements IClusterable, IConverterLocator
{
- /**
- * Change record of a model.
- */
- public class ComponentModelChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- /** Former model. */
- private final IModel<?> model;
-
- /**
- * Construct.
- *
- * @param model
- */
- public ComponentModelChange(IModel<?> model)
- {
- super();
- this.model = model;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return getClass().getSimpleName() + "[component: " +
getPath() + ",model:" + model +
- "]";
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setDefaultModel(model);
- }
- }
/**
* Generic component visitor interface for component traversals.
@@ -276,174 +235,6 @@
public Object component(T component);
}
- /**
- * Change object for undoing addition of behavior
- *
- * @author Igor Vaynberg (ivaynberg)
- */
- private final class AddedBehaviorChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final IBehavior behavior;
-
- /**
- * Construct.
- *
- * @param behavior
- */
- public AddedBehaviorChange(IBehavior behavior)
- {
- this.behavior = behavior;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "[" + getClass().getName() + " behavior=" +
behavior.toString() + "]";
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- removeBehavior(behavior);
- }
- }
-
- /**
- * Change object for undoing removal of behavior
- *
- * @author Igor Vaynberg (ivaynberg)
- */
- private final class RemovedBehaviorChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final IBehavior behavior;
-
- /**
- * Construct.
- *
- * @param behavior
- */
- public RemovedBehaviorChange(IBehavior behavior)
- {
- this.behavior = behavior;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "[" + getClass().getName() + " behavior=" +
behavior.toString() + "]";
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- addBehavior(behavior);
- }
- }
-
- /**
- * A enabled change operation.
- */
- protected final static class EnabledChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- /** Subject. */
- private final Component component;
-
- /** Former value. */
- private final boolean enabled;
-
- /**
- * Construct.
- *
- * @param component
- */
- EnabledChange(final Component component)
- {
- this.component = component;
- enabled = component.getFlag(FLAG_ENABLED);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return getClass().getSimpleName() + "[component: " +
component.getPath() +
- ",enabled: " + enabled + "]";
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- component.setEnabled(enabled);
- }
- }
-
- /**
- * A visibility change operation.
- */
- protected final static class VisibilityChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- /** Subject. */
- private final Component component;
-
- /** Former value. */
- private final boolean visible;
-
- /**
- * Construct.
- *
- * @param component
- */
- VisibilityChange(final Component component)
- {
- this.component = component;
- visible = component.getFlag(FLAG_VISIBLE);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return getClass().getSimpleName() + "[component: " +
component.getPath() +
- ",visible: " + visible + "]";
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- component.setVisible(visible);
- }
- }
-
/** Log. */
private static final Logger log =
LoggerFactory.getLogger(Component.class);
@@ -964,7 +755,7 @@
if (!behavior.isTemporary())
{
- addStateChange(new
AddedBehaviorChange(behavior));
+ addStateChange();
}
// Give handler the opportunity to bind this component
@@ -2267,7 +2058,7 @@
{
if (!behavior.isTemporary())
{
- addStateChange(new
RemovedBehaviorChange(behavior));
+ addStateChange();
}
}
else
@@ -2763,7 +2554,7 @@
final Page page = findPage();
if (page != null)
{
- addStateChange(new EnabledChange(this));
+ addStateChange();
}
}
@@ -2914,7 +2705,7 @@
{
if (wrappedModel != null)
{
- addStateChange(new
ComponentModelChange(wrappedModel));
+ addStateChange();
}
setModelImpl(wrap(model));
@@ -3146,7 +2937,7 @@
if (visible != getFlag(FLAG_VISIBLE))
{
// record component's visibility change
- addStateChange(new VisibilityChange(this));
+ addStateChange();
// Change visibility
setFlag(FLAG_VISIBLE, visible);
@@ -3389,18 +3180,18 @@
}
/**
- * Adds state change to page.
+ * TODO WICKET-NG rename to something more useful - like
componentChanged(), this method used to
+ * be called with a Change object
*
- * @param change
- * The change
+ * Adds state change to page.
*/
- protected final void addStateChange(final Change change)
+ protected final void addStateChange()
{
checkHierarchyChange(this);
final Page page = findPage();
if (page != null)
{
- page.componentStateChanging(this, change);
+ page.componentStateChanging(this);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
Sat Oct 17 04:25:35 2009
@@ -37,7 +37,6 @@
import org.apache.wicket.model.IWrapModel;
import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.version.undo.Change;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -674,32 +673,7 @@
{
if (children != null)
{
- addStateChange(new Change()
- {
- private static final long serialVersionUID = 1L;
-
- final Object removedChildren = children;
-
- @Override
- public String toString()
- {
- return "RemoveAllChange[component: " +
getPath() + ", removed Children: " +
- removedChildren + "]";
- }
-
- @Override
- public void undo()
- {
- children = removedChildren;
- int size = children_size();
- for (int i = 0; i < size; i++)
- {
- // Get next child
- final Component child =
children_get(i);
-
child.setParent(MarkupContainer.this);
- }
- }
- });
+ addStateChange();
// Loop through child components
int size = children_size();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java Sat Oct 17
04:25:35 2009
@@ -44,7 +44,6 @@
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.version.IPageVersionManager;
-import org.apache.wicket.version.undo.Change;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1522,13 +1521,9 @@
* @param component
* @param change
*/
- final void componentStateChanging(final Component component, Change
change)
+ final void componentStateChanging(final Component component)
{
dirty();
- if (mayTrackChangesFor(component, null))
- {
- versionManager.componentStateChanging(change);
- }
}
/**
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=826176&r1=826175&r2=826176&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
Sat Oct 17 04:25:35 2009
@@ -26,7 +26,6 @@
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.version.undo.Change;
/**
@@ -175,7 +174,8 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractChoice(final String id, IModel<T> model, final IModel<?
extends List<? extends E>> choices)
+ public AbstractChoice(final String id, IModel<T> model,
+ final IModel<? extends List<? extends E>> choices)
{
this(id, model, choices, new ChoiceRenderer<E>());
}
@@ -230,7 +230,7 @@
{
if (isVersioned())
{
- addStateChange(new ChoicesListChange());
+ addStateChange();
}
}
this.choices = wrap(choices);
@@ -250,7 +250,7 @@
{
if (isVersioned())
{
- addStateChange(new ChoicesListChange());
+ addStateChange();
}
}
this.choices = new WildcardListModel<E>(choices);
@@ -444,44 +444,5 @@
return false;
}
- /**
- * Change object to represent the change of the choices property
- *
- * @author ivaynberg
- */
- private class ChoicesListChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final IModel<? extends List<? extends E>> oldChoices;
- /**
- * Construct.
- */
- public ChoicesListChange()
- {
- oldChoices = choices;
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- choices = oldChoices;
- }
-
- /**
- * Make debugging easier
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "ChoiceListChange[component: " + getPath() + ",
old choices: " + oldChoices +
- "]";
- }
- }
}
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=826176&r1=826175&r2=826176&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
Sat Oct 17 04:25:35 2009
@@ -21,7 +21,6 @@
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.string.PrependingStringBuffer;
-import org.apache.wicket.version.undo.Change;
/**
* Abstract class for links that are capable of submitting a form.
@@ -109,25 +108,7 @@
{
if (this.defaultFormProcessing != defaultFormProcessing)
{
- addStateChange(new Change()
- {
- private static final long serialVersionUID = 1L;
-
- boolean formerValue =
AbstractSubmitLink.this.defaultFormProcessing;
-
- @Override
- public void undo()
- {
-
AbstractSubmitLink.this.defaultFormProcessing = formerValue;
- }
-
- @Override
- public String toString()
- {
- return
"DefaultFormProcessingChange[component: " + getPath() +
- ", default processing: " +
formerValue + "]";
- }
- });
+ addStateChange();
}
this.defaultFormProcessing = defaultFormProcessing;
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=826176&r1=826175&r2=826176&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
Sat Oct 17 04:25:35 2009
@@ -18,7 +18,6 @@
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.version.undo.Change;
/**
* A form button.
@@ -130,25 +129,7 @@
{
if (this.defaultFormProcessing != defaultFormProcessing)
{
- addStateChange(new Change()
- {
- private static final long serialVersionUID = 1L;
-
- boolean formerValue =
Button.this.defaultFormProcessing;
-
- @Override
- public void undo()
- {
- Button.this.defaultFormProcessing =
formerValue;
- }
-
- @Override
- public String toString()
- {
- return
"DefaultFormProcessingChange[component: " + getPath() +
- ", default processing: " +
formerValue + "]";
- }
- });
+ addStateChange();
}
this.defaultFormProcessing = defaultFormProcessing;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
Sat Oct 17 04:25:35 2009
@@ -26,7 +26,6 @@
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.version.undo.Change;
/**
@@ -65,75 +64,6 @@
{
private static final long serialVersionUID = 1L;
- /** suffix change record. */
- private class SuffixChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- final String prevSuffix;
-
- SuffixChange(String prevSuffix)
- {
- this.prevSuffix = prevSuffix;
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setSuffix(prevSuffix);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "SuffixChange[component: " + getPath() + ",
suffix: " + prevSuffix + "]";
- }
- }
-
- /**
- * Prefix change record.
- */
- private class PrefixChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final String prevPrefix;
-
- /**
- * Construct.
- *
- * @param prevSuffix
- */
- PrefixChange(String prevSuffix)
- {
- prevPrefix = prevSuffix;
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setPrefix(prevPrefix);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "PrefixChange[component: " + getPath() + ",
prefix: " + prevPrefix + "]";
- }
- }
-
private String prefix = "";
private String suffix = "<br/>\n";
@@ -317,7 +247,7 @@
final Page page = findPage();
if (page != null)
{
- addStateChange(new PrefixChange(this.prefix));
+ addStateChange();
}
this.prefix = prefix;
@@ -343,7 +273,7 @@
final Page page = findPage();
if (page != null)
{
- addStateChange(new SuffixChange(this.suffix));
+ addStateChange();
}
this.suffix = suffix;
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=826176&r1=826175&r2=826176&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
Sat Oct 17 04:25:35 2009
@@ -53,7 +53,6 @@
import org.apache.wicket.util.upload.FileUploadException;
import org.apache.wicket.util.upload.FileUploadBase.SizeLimitExceededException;
import org.apache.wicket.validation.IValidatorAddListener;
-import org.apache.wicket.version.undo.Change;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -454,7 +453,7 @@
"Tried to remove form validator that was not
previously added. "
+ "Make sure your validator's equals()
implementation is sufficient");
}
- addStateChange(new FormValidatorRemovedChange(removed));
+ addStateChange();
}
private final int formValidators_indexOf(IFormValidator validator)
@@ -2005,34 +2004,6 @@
});
}
- /**
- * Change object to keep track of form validator removals
- *
- * @author Igor Vaynberg (ivaynberg at apache dot org)
- */
- private class FormValidatorRemovedChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final IFormValidator removed;
-
- /**
- * Construct.
- *
- * @param removed
- */
- public FormValidatorRemovedChange(final IFormValidator removed)
- {
- super();
- this.removed = removed;
- }
-
- @Override
- public void undo()
- {
- add(removed);
- }
- }
/**
* Allows to customize input names of form components inside this form.
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=826176&r1=826175&r2=826176&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
Sat Oct 17 04:25:35 2009
@@ -52,7 +52,6 @@
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.IValidatorAddListener;
import org.apache.wicket.validation.ValidationError;
-import org.apache.wicket.version.undo.Change;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -301,26 +300,6 @@
}
}
- /**
- * Change object to capture the required flag change
- *
- * @author Igor Vaynberg (ivaynberg)
- */
- private final class RequiredStateChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final boolean required = isRequired();
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setRequired(required);
- }
- }
/**
* Adapter that makes this component appear as {...@link IValidatable}
@@ -1075,7 +1054,7 @@
}
if (required != isRequired())
{
- addStateChange(new RequiredStateChange());
+ addStateChange();
}
setFlag(FLAG_REQUIRED, required);
return this;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
Sat Oct 17 04:25:35 2009
@@ -26,7 +26,6 @@
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.version.undo.Change;
/**
@@ -67,76 +66,6 @@
{
private static final long serialVersionUID = 1L;
- /** suffix change record. */
- private class SuffixChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- final String prevSuffix;
-
- SuffixChange(String prevSuffix)
- {
- this.prevSuffix = prevSuffix;
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setSuffix(prevSuffix);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "SuffixChange[component: " + getPath() + ",
suffix: " + prevSuffix + "]";
- }
- }
-
- /**
- * Prefix change record.
- */
- private class PrefixChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final String prevPrefix;
-
- /**
- * Construct.
- *
- * @param prevSuffix
- */
- PrefixChange(String prevSuffix)
- {
- prevPrefix = prevSuffix;
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setPrefix(prevPrefix);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "PrefixChange[component: " + getPath() + ",
prefix: " + prevPrefix + "]";
- }
- }
-
-
private String prefix = "";
private String suffix = "<br />\n";
@@ -378,7 +307,7 @@
public final RadioChoice<T> setPrefix(String prefix)
{
// Tell the page that this component's prefix was changed
- addStateChange(new PrefixChange(this.prefix));
+ addStateChange();
this.prefix = prefix;
return this;
}
@@ -399,7 +328,7 @@
public final RadioChoice<T> setSuffix(String suffix)
{
// Tell the page that this component's suffix was changed
- addStateChange(new SuffixChange(this.suffix));
+ addStateChange();
this.suffix = suffix;
return this;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
Sat Oct 17 04:25:35 2009
@@ -24,7 +24,6 @@
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.version.undo.Change;
/**
* Implementation of a hyperlink component. A link can be used with an anchor
(<a href...)
@@ -77,31 +76,6 @@
*/
public abstract class Link<T> extends AbstractLink implements ILinkListener
{
- /** Change record for when an anchor is changed. */
- private final class AnchorChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- /** the old anchor. */
- private final Component anchor;
-
- /**
- * Construct.
- *
- * @param anchor
- */
- public AnchorChange(Component anchor)
- {
- this.anchor = anchor;
- }
-
- @Override
- public final void undo()
- {
- Link.this.anchor = anchor;
- }
- }
-
private static final long serialVersionUID = 1L;
/**
@@ -238,7 +212,7 @@
*/
public Link<T> setAnchor(Component anchor)
{
- addStateChange(new AnchorChange(this.anchor));
+ addStateChange();
this.anchor = anchor;
return this;
}
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=826176&r1=826175&r2=826176&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
Sat Oct 17 04:25:35 2009
@@ -27,7 +27,6 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.collections.ReadOnlyIterator;
-import org.apache.wicket.version.undo.Change;
/**
@@ -267,19 +266,7 @@
final int index =
getList().indexOf(item.getModelObject());
if (index != -1)
{
- addStateChange(new Change()
- {
- private static final long
serialVersionUID = 1L;
-
- final int oldIndex = index;
-
- @Override
- public void undo()
- {
-
Collections.swap(getList(), oldIndex + 1, oldIndex);
- }
-
- });
+ addStateChange();
// Swap list items and invalidate
listView
Collections.swap(getList(), index,
index + 1);
@@ -327,19 +314,7 @@
if (index != -1)
{
- addStateChange(new Change()
- {
- private static final long
serialVersionUID = 1L;
-
- final int oldIndex = index;
-
- @Override
- public void undo()
- {
-
Collections.swap(getList(), oldIndex - 1, oldIndex);
- }
-
- });
+ addStateChange();
// Swap items and invalidate listView
Collections.swap(getList(), index,
index - 1);
@@ -383,20 +358,7 @@
@Override
public void onClick()
{
- addStateChange(new Change()
- {
- private static final long
serialVersionUID = 1L;
-
- final int oldIndex =
getList().indexOf(item.getModelObject());
- final T removedObject =
item.getModelObject();
-
- @SuppressWarnings("unchecked")
- @Override
- public void undo()
- {
-
((List<T>)getList()).add(oldIndex, removedObject);
- }
- });
+ addStateChange();
item.modelChanging();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java
Sat Oct 17 04:25:35 2009
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.html.list;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.version.undo.Change;
/**
* A very simple Item. Usually it is used as based class for more advanced
Items.
@@ -110,23 +109,7 @@
{
if (isVersioned())
{
- addStateChange(new Change()
- {
- final int oldIndex =
LoopItem.this.index;
- private static final long
serialVersionUID = 1L;
-
- @Override
- public void undo()
- {
- LoopItem.this.index = oldIndex;
- }
-
- @Override
- public String toString()
- {
- return "IndexChange[component:
" + getPath() + ", index: " + oldIndex + "]";
- }
- });
+ addStateChange();
}
this.index = index;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
Sat Oct 17 04:25:35 2009
@@ -20,7 +20,6 @@
import org.apache.wicket.markup.html.navigation.paging.IPageable;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.version.undo.Change;
/**
@@ -52,7 +51,8 @@
* @param rowsPerPage
* Number of rows to show on a page
*/
- public PageableListView(final String id, final IModel<? extends List<?
extends T>> model, int rowsPerPage)
+ public PageableListView(final String id, final IModel<? extends List<?
extends T>> model,
+ int rowsPerPage)
{
super(id, model);
this.rowsPerPage = rowsPerPage;
@@ -125,7 +125,7 @@
rowsPerPage = 0;
}
- addStateChange(new RowsPerPageChange(this.rowsPerPage));
+ addStateChange();
this.rowsPerPage = rowsPerPage;
}
@@ -163,7 +163,7 @@
currentPage = pageCount - 1;
}
- addStateChange(new CurrentPageChange(this.currentPage));
+ addStateChange();
this.currentPage = currentPage;
}
@@ -199,84 +199,4 @@
"You must not use setViewSize() with PageableListView");
}
- /**
- * Records the changing of the current page.
- */
- private class CurrentPageChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- /** the former 'current' page. */
- private final int currentPage;
-
- /**
- * Construct.
- *
- * @param currentPage
- * the former 'current' page
- */
- CurrentPageChange(int currentPage)
- {
- this.currentPage = currentPage;
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setCurrentPage(currentPage);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "CurrentPageChange[currentPage: " + currentPage
+ "]";
- }
- }
-
- /**
- * Records the changing of the number of rows per page.
- */
- private class RowsPerPageChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- /** the former number of rows per page. */
- private final int rowsPerPage;
-
- /**
- * Construct.
- *
- * @param rowsPerPage
- * the former number of rows per page
- */
- RowsPerPageChange(int rowsPerPage)
- {
- this.rowsPerPage = rowsPerPage;
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setRowsPerPage(rowsPerPage);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "RowsPerPageChange[component: " + getPath() + ",
prefix: " + rowsPerPage + "]";
- }
- }
-
}
\ No newline at end of file
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
Sat Oct 17 04:25:35 2009
@@ -27,7 +27,6 @@
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.collections.MicroMap;
-import org.apache.wicket.version.undo.Change;
/**
* A navigation for a PageableListView that holds links to other pages of the
PageableListView.
@@ -116,45 +115,6 @@
{
private static final long serialVersionUID = 1L;
- /**
- * Undo change for navigation start index. Makes certain that back
button works with paging in
- * the navigator.
- */
- private final class StartIndexChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final int startIndex;
-
- /**
- * Constructor, remembers the startIndex.
- *
- * @param startIndex
- * the startIndex to remember.
- */
- private StartIndexChange(int startIndex)
- {
- this.startIndex = startIndex;
- }
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public final void undo()
- {
- PagingNavigation.this.startIndex = startIndex;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "StartIndexChange[component: " + getPath() + ",
prefix: " + startIndex + "]";
- }
- }
/** The PageableListView this navigation is navigating. */
protected IPageable pageable;
@@ -412,7 +372,7 @@
modelChanging();
// Tell the ListView what the new start index shall be
- addStateChange(new StartIndexChange(startIndex));
+ addStateChange();
startIndex = firstListItem;
setIterations(Math.min(viewSize,
pageable.getPageCount()));
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
Sat Oct 17 04:25:35 2009
@@ -27,7 +27,6 @@
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Objects;
-import org.apache.wicket.version.undo.Change;
/**
* Usually you either have a markup file or a xml tag with
wicket:id="myComponent" to associate
@@ -120,18 +119,7 @@
}
if (!Objects.equal(this.markupId, markupId))
{
- addStateChange(new Change()
- {
- private static final long serialVersionUID = 1L;
- private final String oldMarkupId =
Fragment.this.markupId;
-
- @Override
- public void undo()
- {
- Fragment.this.markupId = oldMarkupId;
- }
-
- });
+ addStateChange();
}
this.markupId = markupId;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
Sat Oct 17 04:25:35 2009
@@ -22,7 +22,6 @@
import org.apache.wicket.markup.html.navigation.paging.IPageable;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.version.undo.Change;
/**
@@ -183,25 +182,7 @@
{
if (isVersioned())
{
- addStateChange(new Change()
- {
- private static final long
serialVersionUID = 1L;
-
- final int old = itemsPerPage;
-
- @Override
- public void undo()
- {
- itemsPerPage = old;
- }
-
- @Override
- public String toString()
- {
- return
"ItemsPerPageChange[component: " + getPath() + ", itemsPerPage: " +
- old + "]";
- }
- });
+ addStateChange();
}
}
@@ -295,25 +276,7 @@
{
if (isVersioned())
{
- addStateChange(new Change()
- {
- private static final long
serialVersionUID = 1L;
-
- private final int old = currentPage;
-
- @Override
- public void undo()
- {
- currentPage = old;
- }
-
- @Override
- public String toString()
- {
- return
"CurrentPageChange[component: " + getPath() + ", currentPage: " +
- old + "]";
- }
- });
+ addStateChange();
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
Sat Oct 17 04:25:35 2009
@@ -21,7 +21,6 @@
import org.apache.wicket.markup.repeater.util.ModelIteratorAdapter;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Generics;
-import org.apache.wicket.version.undo.Change;
/**
@@ -232,25 +231,7 @@
{
if (isVersioned())
{
- addStateChange(new Change()
- {
- private static final long
serialVersionUID = 1L;
-
- private final IItemReuseStrategy old =
itemReuseStrategy;
-
- @Override
- public void undo()
- {
- itemReuseStrategy = old;
- }
-
- @Override
- public String toString()
- {
- return
"ItemsReuseStrategyChange[component: " + getPath() + ", reuse: " +
- old + "]";
- }
- });
+ addStateChange();
}
itemReuseStrategy = strategy;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
Sat Oct 17 04:25:35 2009
@@ -23,7 +23,6 @@
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.util.lang.Generics;
-import org.apache.wicket.version.undo.Change;
/**
@@ -101,25 +100,7 @@
{
if (isVersioned())
{
- addStateChange(new Change()
- {
- private static final long
serialVersionUID = 1L;
-
- final int old = columns;
-
- @Override
- public void undo()
- {
- columns = old;
- }
-
- @Override
- public String toString()
- {
- return
"GridViewColumnsChange[component: " + getPath() +
- ", removed columns: " +
old + "]";
- }
- });
+ addStateChange();
}
columns = cols;
}
@@ -153,25 +134,7 @@
{
if (isVersioned())
{
- addStateChange(new Change()
- {
- private static final long
serialVersionUID = 1L;
-
- final int old = GridView.this.rows;
-
- @Override
- public void undo()
- {
- GridView.this.rows = old;
- }
-
- @Override
- public String toString()
- {
- return
"GridViewRowsChange[component: " + getPath() + ", removed rows: " +
- old + "]";
- }
- });
+ addStateChange();
}
this.rows = rows;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
Sat Oct 17 04:25:35 2009
@@ -28,7 +28,7 @@
import org.apache.wicket.Session;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.version.IPageVersionManager;
-import org.apache.wicket.version.undo.UndoPageVersionManager;
+import org.apache.wicket.version.undo.NoopPageVersionManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -233,7 +233,7 @@
*/
public IPageVersionManager newVersionManager(Page page)
{
- return new UndoPageVersionManager(page, 20);
+ return new NoopPageVersionManager(page);
}
/**
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/NoopPageVersionManager.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/NoopPageVersionManager.java?rev=826176&view=auto
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/NoopPageVersionManager.java
(added)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/NoopPageVersionManager.java
Sat Oct 17 04:25:35 2009
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.version.undo;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import org.apache.wicket.version.IPageVersionManager;
+
+/**
+ * Intermediate noop impl for wicket-ng migration
+ *
+ * @author igor.vaynberg
+ */
+public class NoopPageVersionManager implements IPageVersionManager
+{
+ private final Page page;
+
+ public NoopPageVersionManager(Page page)
+ {
+ this.page = page;
+ }
+
+ public void beginVersion(boolean mergeVersion)
+ {
+ }
+
+ public void componentAdded(Component component)
+ {
+ }
+
+ public void componentModelChanging(Component component)
+ {
+ }
+
+ public void componentRemoved(Component component)
+ {
+ }
+
+ public void componentStateChanging(Change change)
+ {
+ }
+
+ public void endVersion(boolean mergeVersion)
+ {
+ }
+
+ public void expireOldestVersion()
+ {
+ }
+
+ public int getAjaxVersionNumber()
+ {
+ return 0;
+ }
+
+ public int getCurrentVersionNumber()
+ {
+ return 0;
+ }
+
+ public Page getVersion(int versionNumber)
+ {
+ return page;
+ }
+
+ public int getVersions()
+ {
+ return 0;
+ }
+
+ public void ignoreVersionMerge()
+ {
+ }
+
+ public Page rollbackPage(int numberOfVersions)
+ {
+ return page;
+ }
+
+}
Propchange:
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/NoopPageVersionManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
Sat Oct 17 04:25:35 2009
@@ -1,8 +1,8 @@
-<html>
-<body>
-<form action="?wicket:interface=:0:form:1:IFormSubmitListener::"
wicket:id="form" method="post" id="form1"><div style="display:none"><input
type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <input value="" type="text" wicket:id="input" name="input">
-<span wicket:id="feedback"><wicket:panel><span
style="color:red;">*</span></wicket:panel></span>
-</form>
-</body>
+<html>
+<body>
+<form wicket:id="form" id="form1" method="post"
action="?wicket:interface=:0:form::IFormSubmitListener::"><div
style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0"
/></div>
+ <input type="text" wicket:id="input" value="" name="input">
+<span wicket:id="feedback"><wicket:panel><span
style="color:red;">*</span></wicket:panel></span>
+</form>
+</body>
</html>
\ No newline at end of file
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
Sat Oct 17 04:25:35 2009
@@ -7,6 +7,6 @@
<span wicket:id="panel"><wicket:panel>
Panel 2
</wicket:panel></span>
- <a href="?wicket:interface=:0:link:1:ILinkListener::"
wicket:id="link">Replace the panel</a>
+ <a wicket:id="link"
href="?wicket:interface=:0:link::ILinkListener::">Replace the panel</a>
</body>
</html>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
Sat Oct 17 04:25:35 2009
@@ -3,6 +3,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li
wicket:id="table"><span wicket:id="txt">six</span></li></ul>
-<a href="?wicket:interface=:0:prev:1:ILinkListener::"
wicket:id="prev">Prev</a><a
href="?wicket:interface=:0:nextNext:1:ILinkListener::"
wicket:id="nextNext">NextNext</a>
+<a wicket:id="prev"
href="?wicket:interface=:0:prev::ILinkListener::">Prev</a><a
wicket:id="nextNext"
href="?wicket:interface=:0:nextNext::ILinkListener::">NextNext</a>
</body>
</html>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
Sat Oct 17 04:25:35 2009
@@ -3,6 +3,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li
wicket:id="table"><span wicket:id="txt">four</span></li></ul>
-<a href="?wicket:interface=:0:prev:2:ILinkListener::"
wicket:id="prev">Prev</a><a
href="?wicket:interface=:0:nextNext:2:ILinkListener::"
wicket:id="nextNext">NextNext</a>
+<a wicket:id="prev"
href="?wicket:interface=:0:prev::ILinkListener::">Prev</a><a
wicket:id="nextNext"
href="?wicket:interface=:0:nextNext::ILinkListener::">NextNext</a>
</body>
</html>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html?rev=826176&r1=826175&r2=826176&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
Sat Oct 17 04:25:35 2009
@@ -17,6 +17,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li></ul>
-<ul><li wicket:id="navigation"><a wicket:id="pageLink"
href="?wicket:interface=:0:navigation:0:pageLink:1:ILinkListener::" title="Go
to page 1"><span wicket:id="pageNumber">1</span></a></li><li
wicket:id="navigation"><span wicket:id="pageLink" title="Go to page
2"><em><span wicket:id="pageNumber">2</span></em></span></li></ul>
+<ul><li wicket:id="navigation"><a wicket:id="pageLink"
href="?wicket:interface=:0:navigation:0:pageLink::ILinkListener::" title="Go to
page 1"><span wicket:id="pageNumber">1</span></a></li><li
wicket:id="navigation"><span wicket:id="pageLink" title="Go to page
2"><em><span wicket:id="pageNumber">2</span></em></span></li></ul>
</body>
</html>
