Merge remote-tracking branch 'origin/wicket-4997' into wicket-6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/99631353 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/99631353 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/99631353 Branch: refs/heads/wicket-6.x Commit: 996313537f0c0d7efccc108d810d61f2626b099c Parents: 62fed8f 272c5d9 Author: Emond Papegaaij <[email protected]> Authored: Mon Nov 11 09:51:05 2013 +0100 Committer: Emond Papegaaij <[email protected]> Committed: Mon Nov 11 09:51:05 2013 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Component.java | 6 +- .../mapper/AbstractBookmarkableMapper.java | 13 +++- .../core/request/mapper/MountedMapper.java | 41 +++++------- .../wicket/DisabledComponentPage1a_result.html | 2 +- .../apache/wicket/TestDetachPageAjaxResult.html | 12 ++-- .../wicket/TestDetachPageExpectedResult.html | 2 +- .../ajax/AjaxBehaviorEnabled_expected.html | 2 +- .../wicket/ajax/AjaxCallbackFunctionTest.java | 14 ++-- ...axHeaderContributionPage2_ajax_expected.html | 12 ++-- .../AjaxHeaderContributionPage2_expected.html | 4 +- ...jaxHeaderContributionPage_ajax_expected.html | 8 +-- .../AjaxHeaderContributionPage_expected.html | 4 +- .../ajax/DomReadyOrderPage_ajax_expected.html | 12 ++-- .../wicket/ajax/DomReadyOrderPage_expected.html | 4 +- .../form/AjaxFormSubmitTestPage_expected.html | 4 +- .../OnChangeAjaxBehaviorTestPage_expected.html | 6 +- .../ajaxLink/AjaxLinkPageExpectedResult.html | 2 +- .../AjaxLinkWithBorderPageExpectedResult.html | 2 +- .../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +- .../SimpleTestPageExpectedResult-1.html | 12 ++-- .../SimpleTestPageExpectedResult.html | 2 +- .../request/mapper/BookmarkableMapperTest.java | 69 ++++++++++++-------- .../core/request/mapper/PackageMapperTest.java | 16 +++-- .../MarkupInheritanceExpectedResult_12.html | 2 +- .../MarkupInheritanceExpectedResult_4-1.html | 2 +- .../MarkupInheritanceExpectedResult_4.html | 2 +- .../MarkupInheritanceExpectedResult_5.html | 2 +- .../MarkupInheritanceExpectedResult_7.html | 2 +- .../html/basic/SimplePageExpectedResult_13.html | 2 +- .../BoxBorderTestPage_ExpectedResult_11.html | 2 +- .../BoxBorderTestPage_ExpectedResult_3.html | 2 +- .../HideableBorderPage_ExpectedResult.html | 2 +- .../CheckGroupDisabledTestPage_expected.html | 2 +- .../html/form/CheckGroupTestPage1_expected.html | 2 +- .../html/form/CheckGroupTestPage2_expected.html | 2 +- .../html/form/CheckGroupTestPage3_expected.html | 2 +- .../html/form/CheckGroupTestPage4_expected.html | 2 +- .../html/form/FormMethodTestPage_expected.html | 4 +- .../RadioGroupDisabledTestPage_expected.html | 2 +- .../html/form/RadioGroupTestPage1_expected.html | 2 +- .../html/form/RadioGroupTestPage3_expected.html | 2 +- .../form/feedback/FeedbackFormPage_result1.html | 2 +- .../form/feedback/FeedbackFormPage_result2.html | 2 +- .../FeedbackIndicatorFormPage_result1.html | 2 +- .../FeedbackIndicatorFormPage_result2.html | 2 +- .../html/form/pageWithParameters_expected.html | 4 +- .../validation/HomePage1_ExpectedResult.html | 2 +- .../testing3/TestPage_ExpectedResult-1.html | 2 +- .../testing3/TestPage_ExpectedResult-2.html | 2 +- .../internal/EnclosurePageExpectedResult_3.html | 2 +- .../markup/html/link/MountedPageLinkTest.java | 36 ++++++++-- ...lTableNavigationPage_ExpectedResult_1-1.html | 2 +- ...lTableNavigationPage_ExpectedResult_1-2.html | 2 +- ...talTableNavigationPage_ExpectedResult_1.html | 2 +- .../PagedTableNavigatorExpectedResult_1.html | 10 +-- .../PagedTableNavigatorExpectedResult_2.html | 14 ++-- .../PagedTableNavigatorExpectedResult_3.html | 10 +-- .../PagedTableNavigatorExpectedResult_4.html | 10 +-- .../PagedTableNavigatorExpectedResult_5.html | 10 +-- .../PagedTableNavigatorExpectedResult_6.html | 14 ++-- .../PagedTableNavigatorExpectedResult_7.html | 14 ++-- .../PagedTableNavigatorExpectedResult_8.html | 14 ++-- ...igatorWithLabelProviderExpectedResult_1.html | 16 ++--- ...igatorWithLabelProviderExpectedResult_2.html | 20 +++--- ...igatorWithLabelProviderExpectedResult_3.html | 16 ++--- ...igatorWithLabelProviderExpectedResult_4.html | 16 ++--- ...igatorWithLabelProviderExpectedResult_5.html | 16 ++--- ...igatorWithLabelProviderExpectedResult_6.html | 20 +++--- ...igatorWithLabelProviderExpectedResult_7.html | 20 +++--- ...ableNavigatorWithMarginExpectedResult_1.html | 12 ++-- ...ableNavigatorWithMarginExpectedResult_2.html | 16 ++--- ...ableNavigatorWithMarginExpectedResult_3.html | 12 ++-- ...ableNavigatorWithMarginExpectedResult_4.html | 12 ++-- ...ableNavigatorWithMarginExpectedResult_5.html | 12 ++-- ...ableNavigatorWithMarginExpectedResult_6.html | 16 ++--- ...ableNavigatorWithMarginExpectedResult_7.html | 16 ++--- .../html/list/PagedTablePageExpectedResult.html | 2 +- .../panel/InlinePanelPageExpectedResult_7.html | 2 +- .../panel/InlinePanelPageExpectedResult_8.html | 2 +- .../tags/InputTagNotVisibleWebPageResult.html | 2 +- .../html/tags/InputTagVisibleWebPageResult.html | 2 +- .../wicket/protocol/http/TestExpirePage.java | 5 ++ .../yui/calendar/DatesPage1_ExpectedResult.html | 8 +-- 83 files changed, 371 insertions(+), 319 deletions(-) ----------------------------------------------------------------------
